From 9874fbf7cce178dbd2d95c9af912acccf89d4c5f6c6b9e29bd504045aaf60a48 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 5 Oct 2017 12:24:29 +0000 Subject: [PATCH] Accepting request 531553 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/531553 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=142 --- gdk-pixbuf-2.36.10.tar.xz | 3 - gdk-pixbuf-2.36.11.tar.xz | 3 + gdk-pixbuf-rpmlintrc | 1 + gdk-pixbuf.changes | 16 +++++ gdk-pixbuf.spec | 14 ++-- ...ntrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch | 68 ------------------- 6 files changed, 26 insertions(+), 79 deletions(-) delete mode 100644 gdk-pixbuf-2.36.10.tar.xz create mode 100644 gdk-pixbuf-2.36.11.tar.xz create mode 100644 gdk-pixbuf-rpmlintrc delete mode 100644 u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch diff --git a/gdk-pixbuf-2.36.10.tar.xz b/gdk-pixbuf-2.36.10.tar.xz deleted file mode 100644 index cde1abf..0000000 --- a/gdk-pixbuf-2.36.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace -size 5772196 diff --git a/gdk-pixbuf-2.36.11.tar.xz b/gdk-pixbuf-2.36.11.tar.xz new file mode 100644 index 0000000..300d117 --- /dev/null +++ b/gdk-pixbuf-2.36.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae62ab87250413156ed72ef756347b10208c00e76b222d82d9ed361ed9dde2f3 +size 5675908 diff --git a/gdk-pixbuf-rpmlintrc b/gdk-pixbuf-rpmlintrc new file mode 100644 index 0000000..391cc35 --- /dev/null +++ b/gdk-pixbuf-rpmlintrc @@ -0,0 +1 @@ +addFilter("gdk-pixbuf.* non-conffile-in-etc") diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index aa24145..a223b7c 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 3 21:36:15 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 2.36.11: + + Build: + - Fix tiff loader build (bgo#786342). + - Prefer newer libpng (bgo#786035). + + Use a free reference images for tests (bgo#787050). + + gif: fail quickly if image dimensions are too big (bgo#785973). + + xlib: Avoid an out-of-bounds error on bigendian (bgo#775896). + + Updated translations. +- Drop u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch: fixed + upstream. +- Add gdk-pixbuf-rpmlintrc: filter gdk-pixbuf-devel.*: W: + non-conffile-in-etc /etc/rpm/macros.gdk-pixbuf. + ------------------------------------------------------------------- Mon Sep 11 15:55:29 UTC 2017 - zaitor@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index c11f8f6..39d8471 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -19,18 +19,17 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.36.10 +Version: 2.36.11 Release: 0 Summary: An image loading library License: LGPL-2.1+ Group: Development/Libraries/GNOME -Url: http://www.gnome.org/ +Url: https://www.gnome.org/ Source: https://download.gnome.org/sources/gdk-pixbuf/2.36/%{name}-%{version}.tar.xz Source1: macros.gdk-pixbuf Source2: README.SUSE +Source3: gdk-pixbuf-rpmlintrc Source99: baselibs.conf -# PATCH-FIX-UPSTREAM u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch boo#929462 bsc#1010497 bgo#775896 mstaudt@suse.com -- Fix RGBA conversion for big endian X11 environments -Patch0: u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gtk-doc BuildRequires: libjpeg-devel @@ -120,7 +119,6 @@ This package contains the development files for gdk-pixbuf. %if !0%{?is_opensuse} translation-update-upstream %endif -%patch0 -p1 %if "%_lib" == "lib64" cp -a %{SOURCE2} . %endif @@ -142,9 +140,9 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm -########################################################################### -# Note: when updating scriptlets, don't forget to also update baselibs.conf -########################################################################### +############################################################################# +# Note: when updating scriptlets, don't forget to also update baselibs.conf # +############################################################################# # Convenient %%define for the scriplets %if "%_lib" == "lib64" diff --git a/u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch b/u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch deleted file mode 100644 index ac40f4a..0000000 --- a/u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Max Staudt -Date: Fri Dec 9 14:26:34 2016 +0100 -Subject: [PATCH]contrib/gdk-pixbuf-xlib: Fix rgb888amsb() -Patch-mainline: to be upstreamed -Git-repo: git://git.gnome.org/gdk-pixbuf -References: boo#929462 bsc#1010497 -Signed-off-by: Max Staudt - -On Little Endian, it wrote memory out of bounds (i.e. when running -inside a little endian client, connecting to a big endian X server). - -On Big Endian, it only processed the first 1/4 of the icon. - -The effects can be seen when running IceWM. Running native on Big Endian -ppc64 with a Big Endian X11 server, the icon background was 3/4 random: - - https://bugzilla.suse.com/show_bug.cgi?id=929462 - -This match makes rgb888amsb() behave analogously to rgb888msb(). - -Signed-off-by: Max Staudt ---- - contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c -index 972c2be..422fdc8 100644 ---- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c -+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c -@@ -915,13 +915,8 @@ rgb888amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma - int bpl; - - guint8 *srow = (guint8 *)image->data, *orow = pixels; --#ifdef LITTLE -- guint32 *o; -- guint32 *s; --#else - guint8 *s; /* for byte order swapping */ - guint8 *o; --#endif - - d (printf ("32 bit, msb, with alpha\n")); - -@@ -931,24 +926,14 @@ rgb888amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma - - /* msb data */ - for (yy = 0; yy < height; yy++) { --#ifdef LITTLE -- s = (guint32 *) srow; -- o = (guint32 *) orow; --#else - s = srow; - o = orow; --#endif - for (xx = 0; xx < width; xx++) { --#ifdef LITTLE - *o++ = s[1]; - *o++ = s[2]; - *o++ = s[3]; - *o++ = 0xff; - s += 4; --#else -- *o++ = (*s << 8) | 0xff; /* untested */ -- s++; --#endif - } - srow += bpl; - orow += rowstride;