pool/gdk-pixbuf
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 847339 from GNOME:Next

Browse Source 
Update to 2.42.0

OBS-URL: https://build.opensuse.org/request/show/847339
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=172
This commit is contained in:
Dominique Leuenberger
2020-11-10 08:31:15 +00:00
committed by Git OBS Bridge
parent 43c94636bf
commit 266284bc0b
6 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@@ -2,7 +2,7 @@
<service name="download_url" mode="disabled">
<param name="protocol">https</param>
<param name="host">download.gnome.org</param>
<param name="path">sources/gdk-pixbuf/2.40/gdk-pixbuf-2.40.0.tar.xz</param>
<param name="path">sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.0.tar.xz</param>
</service>
<service name="set_version" mode="disabled" />
</services>

3
gdk-pixbuf-2.40.0.zip
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d30b7ded0d8da5cb9026d97a718b122f497e91b9aadb7c5cda57185b26b4b618
size 6780781

3
gdk-pixbuf-2.42.0.zip Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dac6f6e05d9376c1e9157e61086b9f7c0524300a477ce902711a064b8f6ab31c
size 7772180

36
gdk-pixbuf-boo1174307-io-gif-overflow.patch
View File

@@ -1,36 +0,0 @@
From 43ec8f286e3d499d82735c16bbca83d7a1c03efa Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 1 Apr 2020 18:11:55 +0100
Subject: [PATCH] Check the memset length argument
Avoid overflows by using the checked multiplication macro for gsize.
Fixes: #132
---
gdk-pixbuf/io-gif-animation.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
index a3155e065..d74296337 100644
--- a/gdk-pixbuf/io-gif-animation.c
+++ b/gdk-pixbuf/io-gif-animation.c
@@ -411,11 +411,15 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter)
/* If no rendered frame, render the first frame */
if (anim->last_frame == NULL) {
+ gsize len = 0;
if (anim->last_frame_data == NULL)
anim->last_frame_data = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, anim->width, anim->height);
if (anim->last_frame_data == NULL)
return NULL;
- memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, gdk_pixbuf_get_rowstride (anim->last_frame_data) * anim->height);
+ if (g_size_checked_mul (&len, gdk_pixbuf_get_rowstride (anim->last_frame_data), anim->height))
+ memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, len);
+ else
+ return NULL;
composite_frame (anim, g_list_nth_data (anim->frames, 0));
}
--
GitLab

25
gdk-pixbuf.changes
View File

@@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Nov 9 15:52:50 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Udpate to version 2.42.0:
+ Remove the libjasper JPEG2000 loader.
+ Split the gdk-pixbuf-xlib library to a separate repository.
+ Fix cppcheck 'shifting signed 32-bit value warning',
+ Fix memory leaks in pixops error paths,
+ Improve internal consistency of loaders,
+ Skip bytes during JPEG incremental load.
+ Check for overflows.
+ Let the test suite cope with missing loaders.
+ Check for mmap failure.
+ Fix UB in the XPM loader.
+ Speed up alpha scaling pixop.
+ Add the `gtk_doc` configuration option, and deprecate `docs`.
+ Add the `introspection` configuration option, and remove `gir`.
+ Handle truncated PNMs more gracefully.
+ Clean up GIF loader code.
+ Fix colormap handling in GIF.
- Drop gdk-pixbuf-boo1174307-io-gif-overflow.patch: fixed upstream.
- Replace meson parameters, following upstream changes:
+ -Ddocs=true => -Dgtk_doc=true.
+ -Dgir=true => -Dintrospection=enabled.
-------------------------------------------------------------------
Mon Jul 27 06:56:15 UTC 2020 - Jia Zhaocong <zcjia@suse.com>

10
gdk-pixbuf.spec
View File

@@ -20,7 +20,7 @@
%define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf
Version: 2.40.0
Version: 2.42.0
Release: 0
Summary: An image loading library
License: LGPL-2.1-or-later
@@ -37,9 +37,6 @@ Source2: README.SUSE
Source3: gdk-pixbuf-rpmlintrc
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gdk-pixbuf-boo1174307-io-gif-overflow.patch boo#1174307 glgo#GNOME/gdk-pixbuf#132 zcjia@suse.com -- Avoid overflows by checking the memset length argument
Patch0: gdk-pixbuf-boo1174307-io-gif-overflow.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gtk-doc
BuildRequires: libjpeg-devel
@@ -137,7 +134,6 @@ This package contains the development files for gdk-pixbuf.
%setup -c -T -q
unzip -P gecko %{SOURCE0}
translation-update-upstream
%patch0 -p1
%if "%{_lib}" == "lib64"
cp -a %{SOURCE2} .
%endif
@@ -150,8 +146,8 @@ cp -a %{SOURCE2} .
-Djasper=false \
-Dx11=false \
-Dbuiltin_loaders=none \
-Ddocs=true \
-Dgir=true \
-Dgtk_doc=true \
-Dintrospection=enabled \
-Dman=true \
-Drelocatable=false \
-Dnative_windows_loaders=false \