diff --git a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.34.0.recipe b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.4.recipe similarity index 71% rename from x11-libs/gdk-pixbuf/gdk_pixbuf-2.34.0.recipe rename to x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.4.recipe index 7588be506..28fc5ff3a 100644 --- a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.34.0.recipe +++ b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.4.recipe @@ -6,16 +6,16 @@ DESCRIPTION="The GdkPixBuf library provides a number of features: GdkRGB buffers. * Fast scaling and compositing of pixbufs. * Simple animation loading (ie. animated GIFs)" -HOMEPAGE="https://launchpad.net/gdk-pixbuf" -COPYRIGHT="1999-2015 Gnome Project" +HOMEPAGE="https://wiki.gnome.org/Projects/GdkPixbuf" +COPYRIGHT="1999-2017 Gnome Project" LICENSE="GNU LGPL v2.1" REVISION="1" -SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/2.34/gdk-pixbuf-$portVersion.tar.xz" -CHECKSUM_SHA256="d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879" +SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-$portVersion.tar.xz" +CHECKSUM_SHA256="0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463" SOURCE_DIR="gdk-pixbuf-$portVersion" PATCHES="gdk_pixbuf-$portVersion.patchset" -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -23,7 +23,8 @@ PROVIDES=" cmd:gdk_pixbuf_csource$secondaryArchSuffix cmd:gdk_pixbuf_pixdata$secondaryArchSuffix cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix - lib:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3400.0 compat = 0 + cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix + lib:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3600.4 compat = 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -40,7 +41,7 @@ REQUIRES=" PROVIDES_devel=" gdk_pixbuf${secondaryArchSuffix}_devel = $portVersion - devel:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3400.0 compat = 0 + devel:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3600.4 compat = 0 " REQUIRES_devel=" gdk_pixbuf$secondaryArchSuffix == $portVersion base @@ -50,12 +51,14 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libpng$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf + cmd:autoheader + cmd:automake cmd:awk cmd:make cmd:gcc$secondaryArchSuffix @@ -64,8 +67,6 @@ BUILD_PREREQUIRES=" BUILD() { - aclocal - autoconf runConfigure ./configure make $jobArgs } @@ -74,10 +75,22 @@ INSTALL() { make install + rm $libDir/libgdk_pixbuf-2.0.la + rm $libDir/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la + prepareInstalledDevelLibs \ libgdk_pixbuf-2.0 - rm $developLibDir/*.la fixPkgconfig + + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $dataDir/gtk-doc $manDir + fi + packageEntries devel \ $developDir } + +TEST() +{ + make check +} diff --git a/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.34.0.patchset b/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.34.0.patchset deleted file mode 100644 index 5b3336308..000000000 --- a/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.34.0.patchset +++ /dev/null @@ -1,60 +0,0 @@ -From 88f76cb678ded50df15c3381e7e464151facdbcc Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Thu, 13 Aug 2015 21:26:06 +0200 -Subject: Fix hardcoded -lm. - - -diff --git a/configure.ac b/configure.ac -index 88a5d47..6083c0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,6 +106,10 @@ AC_MSG_CHECKING([for native Win32]) - LIB_EXE_MACHINE_FLAG=X86 - EXE_MANIFEST_ARCHITECTURE=X86 - case "$host" in -+ *-*-haiku*) -+ os_win32=no -+ MATH_LIB= -+ ;; - *-*-mingw*) - os_win32=yes - gio_can_sniff=no -@@ -352,7 +356,7 @@ dnl -std1 is given to the native cc. - AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) - - gtk_save_LIBS=$LIBS --LIBS="$LIBS -lm" -+LIBS="$LIBS $MATH_LIB" - AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(none needed), -@@ -539,7 +543,7 @@ if test x$os_win32 = xno || test x$with_gdiplus = xno; then - [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) -+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz $MATH_LIB)], -ljpeg -lz $MATH_LIB)], $MATH_LIB) - fi - - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -@@ -608,7 +612,7 @@ dnl Test for libpng - [AC_CHECK_HEADER(png.h, - png_ok=yes, - png_ok=no)], -- AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) -+ AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz $MATH_LIB) - if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([#include ], -@@ -637,7 +641,7 @@ dnl Test for libpng - - dnl Test for libjasper - if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then -- AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm) -+ AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg $MATH_LIB) - fi - - if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then --- -2.2.2 - diff --git a/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.4.patchset b/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.4.patchset new file mode 100644 index 000000000..3dfc49d0c --- /dev/null +++ b/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.4.patchset @@ -0,0 +1,59 @@ +From 5628b90320680644f2de33e4ff0fc79456a70a0f Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Mon, 16 Jan 2017 19:00:33 +0000 +Subject: gcc2 patch + + +diff --git a/tests/pixbuf-short-gif-write.c b/tests/pixbuf-short-gif-write.c +index 21bffbb..7430fa7 100644 +--- a/tests/pixbuf-short-gif-write.c ++++ b/tests/pixbuf-short-gif-write.c +@@ -39,6 +39,7 @@ test_short_gif_write (void) + g_assert (channel != NULL); + g_io_channel_set_encoding (channel, NULL, NULL); + ++ { + GdkPixbufLoader *loader = gdk_pixbuf_loader_new_with_type ("gif", NULL); + g_assert (loader != NULL); + +@@ -49,6 +50,7 @@ test_short_gif_write (void) + + gdk_pixbuf_loader_close (loader, NULL); + g_object_unref (loader); ++ } + } + + static void +@@ -63,11 +65,13 @@ test_load_first_frame (void) + g_assert (channel != NULL); + g_io_channel_set_encoding (channel, NULL, NULL); + ++ { + GdkPixbufLoader *loader = gdk_pixbuf_loader_new_with_type ("gif", NULL); + g_assert (loader != NULL); + + while (!has_frame) { + loader_write_from_channel (loader, channel, 4096); ++ { + GdkPixbufAnimation *animation = gdk_pixbuf_loader_get_animation (loader); + if (animation) { + GdkPixbufAnimationIter *iter = gdk_pixbuf_animation_get_iter (animation, NULL); +@@ -75,6 +79,7 @@ test_load_first_frame (void) + has_frame = TRUE; + g_object_unref (iter); + } ++ } + } + + g_io_channel_unref (channel); +@@ -87,6 +92,7 @@ test_load_first_frame (void) + g_assert_cmpint (gdk_pixbuf_get_width (pixbuf), ==, 660); + g_assert_cmpint (gdk_pixbuf_get_height (pixbuf), ==, 666); + g_object_unref (loader); ++ } + } + + int main (int argc, char *argv[]) +-- +2.11.0 +