diff options
Diffstat (limited to 'x11-libs/gdk-pixbuf/files')
| -rw-r--r-- | x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch | 66 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch | 34 |
2 files changed, 100 insertions, 0 deletions
diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch new file mode 100644 index 000000000000..80ed32f83f3c --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch @@ -0,0 +1,66 @@ +From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 11 Sep 2017 19:11:50 +0200 +Subject: build: Fix TIFF loader compilation with autotools + +https://bugzilla.gnome.org/show_bug.cgi?id=786342 +--- + configure.ac | 7 +++---- + gdk-pixbuf/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0abe5ce..c07bd6f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -564,7 +564,6 @@ dnl Test for libjasper + *** --without-libjasper to configure]) + fi + +-AC_SUBST(LIBTIFF) + AC_SUBST(LIBJPEG) + AC_SUBST(LIBPNG) + AC_SUBST(LIBJASPER) +@@ -676,7 +675,7 @@ if test x$gio_can_sniff = x; then + AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data]) + fi + +-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x) ++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno) + AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x) + AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x) + AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) +@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) + if $dynworks ; then + STATIC_LIB_DEPS= + if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then +- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS" + fi + if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" +@@ -698,7 +697,7 @@ if $dynworks ; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" + fi + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" ++ STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER" + fi + + # Checks to see whether we should include mediaLib +diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am +index 01b693c..720a058 100644 +--- a/gdk-pixbuf/Makefile.am ++++ b/gdk-pixbuf/Makefile.am +@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs) + libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c + libpixbufloader_tiff_la_SOURCES = io-tiff.c + libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) ++libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs) + + # + # The XPM loader +-- +cgit v0.12 + diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch new file mode 100644 index 000000000000..77ea7e75521e --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch @@ -0,0 +1,34 @@ +From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <blueness@gentoo.org> +Date: Wed, 14 Oct 2015 16:18:19 -0400 +Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on + uClibc + +pixbuf-lowmem.c depends on GNU libc internals and does not build +on musl or uClibc. Commit e1fd25a fixes this issue for musl by +testing if __GLIBC__ is set. However, uClibc sets __GLIBC__ and +so this check is insufficient there. We expand the check so that +we run pixbuf-lowmem on glibc, while avoiding it on both musl and +uClibc. + +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> +--- + tests/pixbuf-lowmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c +index 9e9571f..ec7504f 100644 +--- a/tests/pixbuf-lowmem.c ++++ b/tests/pixbuf-lowmem.c +@@ -24,7 +24,7 @@ + #include <time.h> + #include <string.h> + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + #define PRETEND_MEM_SIZE (16 * 1024 * 1024) + #define REMAINING_MEM_SIZE 100000 + +-- +2.4.9 + |