diff --git a/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch b/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch deleted file mode 100644 index f8248a1..0000000 --- a/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 238893d8cd6f9c2616a05ab521a29651a17a38c2 Mon Sep 17 00:00:00 2001 -From: Christian Heusel -Date: Sat, 20 Apr 2024 11:07:32 +0200 -Subject: [PATCH] fix build failure due to typo in the build script - -The fixed commit had a typo where it would try to call a nonexistant -function instead of the .contains method of the relevant array. -This was only made visible when the "other" loaders were enabled so it -is triggered all the time. - -This was made visible when working on -https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/merge_requests/1 - -Fixes: 81a77399a ("Update the testsuite") -Signed-off-by: Christian Heusel ---- - tests/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 78d0ad92e..78ae43af1 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -71,7 +71,7 @@ installed_tests = { - 'pixbuf-construction': { 'suites': ['conform'], }, - 'animation': { - 'suites': ['format'], -- 'skip': not (enabled_loaders.contains('ani') and enabled_loaders_contains('gif')), -+ 'skip': not (enabled_loaders.contains('ani') and enabled_loaders.contains('gif')), - }, - 'cve-2015-4491': { - 'suites': ['security'], --- -GitLab - diff --git a/_service b/_service index 8e6e01e..773bb4f 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https download.gnome.org - sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.11.tar.xz + sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.tar.xz diff --git a/gdk-pixbuf-2.42.11.zip b/gdk-pixbuf-2.42.11.zip deleted file mode 100644 index 602b69c..0000000 --- a/gdk-pixbuf-2.42.11.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84d17b8a6d348466caae27831a6d0a2314ec9326f0050e3d48a49ccf7b8972a2 -size 7790409 diff --git a/gdk-pixbuf-2.42.12.zip b/gdk-pixbuf-2.42.12.zip new file mode 100644 index 0000000..eda63db --- /dev/null +++ b/gdk-pixbuf-2.42.12.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83504138e2302916a0f5627e28b7f7505e0559a6dcf7c5bd320a68e27ab20e69 +size 7798780 diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 467c27c..f368030 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed May 15 11:49:20 UTC 2024 - Dominique Leuenberger + +- Update to version 2.42.12: + + Fix a build failure, + + Fix occasional build failures, + + ani: Reject files with multiple INA or IART chunks, + + ani: Reject files with multiple anih chunks (CVE-2022-48622), + + ani: validate chunk size, + + Updated translations. +- Drop 238893d8cd6f9c2616a05ab521a29651a17a38c2.patch: fixed + upstream. + ------------------------------------------------------------------- Mon May 6 07:03:01 UTC 2024 - Dominique Leuenberger diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 0a9cfdc..df790b8 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -20,7 +20,7 @@ %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.42.11 +Version: 2.42.12 Release: 0 Summary: An image loading library License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source1: macros.gdk-pixbuf Source2: README.SUSE Source3: gdk-pixbuf-rpmlintrc Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: docutils