[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/122: gnu: gdk-pixbuf: Add missing arguments.
From: |
guix-commits |
Subject: |
35/122: gnu: gdk-pixbuf: Add missing arguments. |
Date: |
Fri, 11 Jun 2021 12:11:59 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 4167de7dd31e1e353a79809f480366aca105da02
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Thu Mar 11 10:29:02 2021 -0500
gnu: gdk-pixbuf: Add missing arguments.
* gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:glib-or-gtk?>: New
argument.
[replacement]: Remove.
(gdk-pixbuf/fixed): Remove.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
gnu/local.mk | 1 -
gnu/packages/gtk.scm | 95 ++++++++++------------
.../patches/gdk-pixbuf-CVE-2020-29385.patch | 53 ------------
3 files changed, 41 insertions(+), 108 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 25ed583..f8af166 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1069,7 +1069,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gdb-hurd.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \
- %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \
%D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/geary-CVE-2020-24661.patch \
%D%/packages/patches/genimage-signedness.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3d7152b..6c1bc6d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -582,64 +582,51 @@ highlighting and other features typical of a source code
editor.")
(define-public gdk-pixbuf
(package
- (name "gdk-pixbuf")
- (version "2.40.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (patches (search-patches "gdk-pixbuf-CVE-2020-29385.patch"))
- (sha256
- (base32
- "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))
- (build-system meson-build-system)
- (arguments
- `(#:configure-flags '("-Dinstalled_tests=false")
- #:phases
- (modify-phases %standard-phases
- (add-after
- 'unpack 'disable-failing-tests
- (lambda _
- (substitute* "tests/meson.build"
- ;; XXX FIXME: This test fails on armhf machines with:
- ;; SKIP Not enough memory to load bitmap image
- ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2)
- ((".*'cve-2015-4491'.*") "")
- ;; XXX FIXME: This test fails with:
- ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
- ;; assertion failed (error == NULL): Data differ
- ;; (gdk-pixbuf-error-quark, 0)
- ((".*'pixbuf-jpeg'.*") ""))
- #t))
- ;; The slow tests take longer than the specified timeout.
- ,@(if (any (cute string=? <> (%current-system))
- '("armhf-linux" "aarch64-linux"))
- '((replace 'check
- (lambda _
- (invoke "meson" "test" "--timeout-multiplier" "5"))))
- '()))))
- (propagated-inputs
- `(;; Required by gdk-pixbuf-2.0.pc
- ("glib" ,glib)
- ("libpng" ,libpng)
- ;; Used for testing and required at runtime.
- ("shared-mime-info" ,shared-mime-info)))
- (inputs
- `(("libjpeg" ,libjpeg-turbo)
- ("libtiff" ,libtiff)
- ("libx11" ,libx11)))
- (native-inputs
+ (name "gdk-pixbuf")
+ (version "2.42.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:meson ,meson-0.55
+ #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags '("-Dinstalled_tests=false")
+ #:phases
+ (modify-phases %standard-phases
+ ;; The slow tests take longer than the specified timeout.
+ ,@(if (any (cute string=? <> (%current-system))
+ '("armhf-linux" "aarch64-linux"))
+ '((replace 'check
+ (lambda _
+ (invoke "meson" "test" "--timeout-multiplier" "5"))))
+ '()))))
+ (propagated-inputs
+ `( ;; Required by gdk-pixbuf-2.0.pc
+ ("glib" ,glib)
+ ("libpng" ,libpng)
+ ;; Used for testing and required at runtime.
+ ("shared-mime-info" ,shared-mime-info)))
+ (inputs
+ `(("libjpeg" ,libjpeg-turbo)
+ ("libtiff" ,libtiff)
+ ("libx11" ,libx11)))
+ (native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
- ("glib" ,glib "bin") ; glib-mkenums, etc.
+ ("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
- (synopsis "GNOME image loading and manipulation library")
- (description
- "GdkPixbuf is a library for image loading and manipulation developed
+ (synopsis "GNOME image loading and manipulation library")
+ (description
+ "GdkPixbuf is a library for image loading and manipulation developed
in the GNOME project.")
- (license license:lgpl2.0+)
- (home-page "https://developer.gnome.org/gdk-pixbuf/")))
+ (license license:lgpl2.0+)
+ (home-page "https://developer.gnome.org/gdk-pixbuf/")))
;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the
diff --git a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch
b/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch
deleted file mode 100644
index e6ac4de..0000000
--- a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix CVE-2020-29385. Note that we omit the binary test file
-tests/test-images/fail/hang_114.gif from the following commit, to avoid
-requiring 'git' to apply the patch.
-
-
-From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@canonical.com>
-Date: Mon, 30 Nov 2020 12:26:12 +1300
-Subject: [PATCH] gif: Fix LZW decoder accepting invalid LZW code.
-
-The code value after a reset wasn't being validated, which means we would
-accept invalid codes. This could cause an infinite loop in the decoder.
-
-Fixes CVE-2020-29385
-
-Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164
----
- gdk-pixbuf/lzw.c | 13 +++++++------
- tests/test-images/fail/hang_114.gif | Bin 0 -> 5561 bytes
- 2 files changed, 7 insertions(+), 6 deletions(-)
- create mode 100644 tests/test-images/fail/hang_114.gif
-
-diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c
-index 9e052a6f7..105daf2b1 100644
---- a/gdk-pixbuf/lzw.c
-+++ b/gdk-pixbuf/lzw.c
-@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self,
- if (self->last_code != self->clear_code &&
self->code_table_size < MAX_CODES) {
- if (self->code <
self->code_table_size)
- add_code (self, self->code);
-- else if (self->code ==
self->code_table_size)
-+ else
- add_code (self,
self->last_code);
-- else {
-- /* Invalid code received -
just stop here */
-- self->last_code =
self->eoi_code;
-- return output_length;
-- }
-
- /* When table is full increase code
size */
- if (self->code_table_size == (1 <<
self->code_size) && self->code_size < LZW_CODE_MAX)
- self->code_size++;
- }
-
-+ /* Invalid code received - just stop here */
-+ if (self->code >= self->code_table_size) {
-+ self->last_code = self->eoi_code;
-+ return output_length;
-+ }
-+
- /* Convert codeword into indexes */
- n_written += write_indexes (self, output +
n_written, output_length - n_written);
- }
- 07/122: gnu: Temporarily use glib without documentation., (continued)
- 07/122: gnu: Temporarily use glib without documentation., guix-commits, 2021/06/11
- 10/122: gnu: glibmm: Update to 2.68.0., guix-commits, 2021/06/11
- 05/122: gnu: glib-with-documentation: Make some cosmetic changes., guix-commits, 2021/06/11
- 06/122: gnu: glib-with-documentation: Fix documentation build., guix-commits, 2021/06/11
- 17/122: gnu: gtk-doc: Enable help., guix-commits, 2021/06/11
- 19/122: gnu: gobject-introspection: Propagate glib., guix-commits, 2021/06/11
- 18/122: gnu: gtk-doc: Update synopsis, description, home-page and license., guix-commits, 2021/06/11
- 21/122: gnu: cairo: Change build-system., guix-commits, 2021/06/11
- 41/122: gnu: gdk-pixbuf: Disable failing tests., guix-commits, 2021/06/11
- 38/122: gnu: gdk-pixbuf: Fix documentation., guix-commits, 2021/06/11
- 35/122: gnu: gdk-pixbuf: Add missing arguments.,
guix-commits <=
- 32/122: gnu: pangomm: Update to 2.48.0., guix-commits, 2021/06/11
- 34/122: gnu: pangomm-2.42: Update to 2.42.2., guix-commits, 2021/06/11
- 42/122: gnu: gdk-pixbuf+svg: Correct package definition to include changes from gdk-pixbuf., guix-commits, 2021/06/11
- 43/122: gnu: vala: Change build-system., guix-commits, 2021/06/11
- 48/122: gnu: libgsf: Change build-system., guix-commits, 2021/06/11
- 49/122: gnu: libgsf: Make separate output for binaries., guix-commits, 2021/06/11
- 51/122: gnu: libgsf: Enable missing features., guix-commits, 2021/06/11
- 53/122: gnu: libgsf: Enable documentation., guix-commits, 2021/06/11
- 58/122: gnu: atkmm: Update to 2.36.0., guix-commits, 2021/06/11
- 57/122: gnu: atk: Update home-page and license., guix-commits, 2021/06/11