Update to 2.36.8

This commit is contained in:
Kalev Lember 2017-08-08 11:42:52 +02:00
parent 74ac7f1db7
commit 7246ffdb9f
4 changed files with 7 additions and 38 deletions

1
.gitignore vendored
View File

@ -59,3 +59,4 @@ gdk-pixbuf-2.21.6.tar.bz2
/gdk-pixbuf-2.36.5.tar.xz
/gdk-pixbuf-2.36.6.tar.xz
/gdk-pixbuf-2.36.7.tar.xz
/gdk-pixbuf-2.36.8.tar.xz

View File

@ -1,32 +0,0 @@
From d6a0233a331a957615ba0dd7fa569fb496e3caf2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 26 Jul 2017 15:57:10 +0200
Subject: [PATCH] ico: Fix icon quality sorting
Despite the inherited comment, commit 99508c7 sorted the icons by
increasing instead of decreasing quality.
https://bugzilla.gnome.org/show_bug.cgi?id=785447
---
gdk-pixbuf/io-ico.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index 12f0a58802..5b3646cb3d 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -203,9 +203,9 @@ compare_direntry_scores (gconstpointer a,
const struct ico_direntry_data *ib = b;
/* Backwards, so largest first */
- if (ib->ImageScore > ia->ImageScore)
+ if (ib->ImageScore < ia->ImageScore)
return -1;
- else if (ib->ImageScore < ia->ImageScore)
+ else if (ib->ImageScore > ia->ImageScore)
return 1;
return 0;
}
--
2.13.0

View File

@ -1,8 +1,8 @@
%global glib2_version 2.48.0
Name: gdk-pixbuf2
Version: 2.36.7
Release: 6%{?dist}
Version: 2.36.8
Release: 1%{?dist}
Summary: An image loading library
License: LGPLv2+
@ -10,9 +10,6 @@ URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/gdk-pixbuf
Source0: http://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-ico-Fix-icon-quality-sorting.patch
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
@ -177,6 +174,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
%changelog
* Tue Aug 08 2017 Kalev Lember <klember@redhat.com> - 2.36.8-1
- Update to 2.36.8
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.36.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (gdk-pixbuf-2.36.7.tar.xz) = 8d94b1b85dbb03a1a0eccd6f142486e671f66a63e89caf90caccedbc0011ad92ad285ade49190aa4a6baba7553288cc25f7680727d79696952223b4861d4d9c6
SHA512 (gdk-pixbuf-2.36.8.tar.xz) = db92770098eff80706aad6fcd4ad6709aa6e4643d8740fc49dc0bb0620f94ff1b3df5d9ff65e7b27b060f36119ae654a0358fd40118f75b205f751a870bae052