diff --git a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.7.recipe b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.9.recipe similarity index 90% rename from x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.7.recipe rename to x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.9.recipe index b5d366b3b..7cf0854c4 100644 --- a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.7.recipe +++ b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.9.recipe @@ -11,9 +11,8 @@ COPYRIGHT="1999-2017 Gnome Project" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-$portVersion.tar.xz" -CHECKSUM_SHA256="1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8" +CHECKSUM_SHA256="8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a" SOURCE_DIR="gdk-pixbuf-$portVersion" -PATCHES="gdk_pixbuf-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -24,7 +23,7 @@ PROVIDES=" cmd:gdk_pixbuf_pixdata$secondaryArchSuffix cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix - lib:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3600.7 compat >= 0 + lib:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3609.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -43,7 +42,7 @@ REQUIRES=" PROVIDES_devel=" gdk_pixbuf${secondaryArchSuffix}_devel = $portVersion - devel:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3600.7 compat >= 0 + devel:libgdk_pixbuf_2.0$secondaryArchSuffix = 0.3609.0 compat >= 0 " REQUIRES_devel=" gdk_pixbuf$secondaryArchSuffix == $portVersion base @@ -55,6 +54,7 @@ BUILD_REQUIRES=" devel:libglib_2.0$secondaryArchSuffix >= 0.4800 devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + shared_mime_info$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.7.patchset b/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.7.patchset deleted file mode 100644 index 3dfc49d0c..000000000 --- a/x11-libs/gdk-pixbuf/patches/gdk_pixbuf-2.36.7.patchset +++ /dev/null @@ -1,59 +0,0 @@ -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 -