diff --git a/0001-Revert-build-Check-for-libtiff-using-pkg-config.patch b/0001-Revert-build-Check-for-libtiff-using-pkg-config.patch new file mode 100644 index 0000000..2685aa9 --- /dev/null +++ b/0001-Revert-build-Check-for-libtiff-using-pkg-config.patch @@ -0,0 +1,47 @@ +From aaabc15214c3668a43cde1e6efe5760993ce176f Mon Sep 17 00:00:00 2001 +From: Kalev Lember +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 + diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec index 74131c9..583a3de 100644 --- a/gdk-pixbuf2.spec +++ b/gdk-pixbuf2.spec @@ -2,7 +2,7 @@ Name: gdk-pixbuf2 Version: 2.36.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An image loading library License: LGPLv2+ @@ -10,6 +10,9 @@ 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 @@ -90,14 +93,13 @@ the functionality of the installed %{name} package. %autosetup -n gdk-pixbuf-%{version} -p1 %build -(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; - %configure $CONFIGFLAGS \ +autoreconf -fi +%configure \ --with-x11 \ --with-libjasper \ --with-included-loaders=png \ --enable-installed-tests \ --disable-silent-rules -) make %{?_smp_mflags} @@ -174,6 +176,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %changelog +* Wed Aug 16 2017 Kalev Lember - 2.36.8-2 +- Fix tiff loader to build again + * Tue Aug 08 2017 Kalev Lember - 2.36.8-1 - Update to 2.36.8