rpms/gdk-pixbuf2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.36.11

Browse Source
This commit is contained in:
Kalev Lember 2017-10-06 22:25:29 +02:00
parent 5629ccddf6
commit 4bdeeb2b6f
4 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -62,3 +62,4 @@ gdk-pixbuf-2.21.6.tar.bz2
/gdk-pixbuf-2.36.8.tar.xz
/gdk-pixbuf-2.36.9.tar.xz
/gdk-pixbuf-2.36.10.tar.xz
/gdk-pixbuf-2.36.11.tar.xz

47
0001-Revert-build-Check-for-libtiff-using-pkg-config.patch
View File

@ -1,47 +0,0 @@
From aaabc15214c3668a43cde1e6efe5760993ce176f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 16 Aug 2017 13:39:18 +0200
Subject: [PATCH] Revert "build: Check for libtiff using pkg-config"
This reverts commit 0927eb3e278e998248f3022c096b4f93685c6a9d.
---
configure.ac | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 76c8adb63..a19cc0f51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,14 +453,24 @@ AC_ARG_WITH(gdiplus,
AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
dnl Test for libtiff
-libtiff_found=no
if test x$os_win32 = xno || test x$with_gdiplus = xno; then
- if test x$with_libtiff != xno; then
- PKG_CHECK_MODULES(TIFF, libtiff-4)
- libtiff_found=yes
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+ AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ [AC_CHECK_LIB(tiff34, TIFFFlushData,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
- if test x$with_libtiff != xno && test x$libtiff_found = xno; then
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_MSG_ERROR([
*** Checks for TIFF loader failed. You can build without it by passing
*** --without-libtiff to configure but some programs using GTK+ may
--
2.13.0

12
gdk-pixbuf2.spec
View File

@ -1,7 +1,7 @@
%global glib2_version 2.48.0
Name: gdk-pixbuf2
Version: 2.36.10
Version: 2.36.11
Release: 1%{?dist}
Summary: An image loading library
@ -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
# https://bugzilla.gnome.org/show_bug.cgi?id=786342
Patch0: 0001-Revert-build-Check-for-libtiff-using-pkg-config.patch
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
@ -23,9 +20,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.3
# gdk-pixbuf does a configure time check which uses the GIO mime
# layer; we need to actually have the mime type database.
BuildRequires: shared-mime-info
# Bootstrap requirements
BuildRequires: autoconf automake libtool gtk-doc
BuildRequires: gettext-autopoint
Requires: glib2%{?_isa} >= %{glib2_version}
@ -93,7 +87,6 @@ the functionality of the installed %{name} package.
%autosetup -n gdk-pixbuf-%{version} -p1
%build
autoreconf -fi
%configure \
--with-x11 \
--with-libjasper \
@ -176,6 +169,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
%changelog
* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 2.36.11-1
- Update to 2.36.11
* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 2.36.10-1
- Update to 2.36.10

2
sources
View File

@ -1 +1 @@
SHA512 (gdk-pixbuf-2.36.10.tar.xz) = d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
SHA512 (gdk-pixbuf-2.36.11.tar.xz) = 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3