x11-libs/gdk-pixbuf: bump to 2.21.6

3 files changed, 5 insertions, 185 deletions

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index f785b1b9..9af614bc 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,3 @@
 AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 756 RMD160 ebc646871ecceb6a490d87c7860c9b27faba3bb3 SHA1 0cf0621e1af255d5426d7ea8e352c4f68f5cbe69 SHA256 f10878653d8ab799c96715bb5d7278912b6201093b93dcf83111e5c9073493c4
-AUX gdk-pixbuf-2.21.4-readd-deprecated-apis.patch 5194 RMD160 07e34b12005949c4715bb82fe4f40b909b66ed83 SHA1 ca6ea387dd1ee642c3fc61bec01d1e678d8d0977 SHA256 37ba104a107ab74aa61af34117ef6f2ed47cb0a3f730d266581b5093406acec8
-DIST gdk-pixbuf-2.21.4.tar.bz2 1522140 RMD160 55e8c79c0e3b7f032e20caf47a38e698a0accefb SHA1 1790bb2442a75047d804511915f6b8a8851007af SHA256 f28efdbcca1f9ad144cf7987c4afec268baa5c6c793383f05b26dc49ecdbca15
-EBUILD gdk-pixbuf-2.21.4.ebuild 2797 RMD160 d675ca10b190d7f1efcc2c2d8a0e240c8a620861 SHA1 881cb14f5378769e8a879c20d69d48f14e4d71b6 SHA256 40910527aef02e6f28f05fee30266949202fa65fe492eafcbe65b83fc7115261
+DIST gdk-pixbuf-2.21.6.tar.bz2 1521950 RMD160 fda67dbf5974de1017b2ebfc776d393d0e7adba7 SHA1 4a4a75b08f8a01f27fbd1aee06324d4502f7b8a2 SHA256 de625133161c651c0f32c1f742826ba8700637c883691664a9152faed0e24d8c
+EBUILD gdk-pixbuf-2.21.6.ebuild 2691 RMD160 38b9870acf69c75ea7c3bd093597f42c860e12f9 SHA1 87c05366b703d1671310af85c4e361758ce83658 SHA256 897e5df0101d5d8c212249cce8709f1497bdb3e4f92c92bde01bb47bbf173af2
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-readd-deprecated-apis.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-readd-deprecated-apis.patch
deleted file mode 100644
index 3710791c..00000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-readd-deprecated-apis.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 0969a103e7c143545cbde7e458967b42a9415307 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 27 Jun 2010 23:12:06 +0000
-Subject: Bring back deprecated api
-
-Grudgingly, in the name of api stability.
----
-diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
-index 8e70fa3..58ea4ab 100644
---- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
-+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
-@@ -54,6 +54,8 @@ gdk_pixbuf_error_get_type
- 
- <SECTION>
- <FILE>refcounting</FILE>
-+gdk_pixbuf_ref
-+gdk_pixbuf_unref
- GdkPixbufDestroyNotify
- </SECTION>
- 
-@@ -118,6 +120,8 @@ gdk_pixbuf_fill
- GdkPixbufAnimation
- GdkPixbufAnimationIter
- gdk_pixbuf_animation_new_from_file
-+gdk_pixbuf_animation_ref
-+gdk_pixbuf_animation_unref
- gdk_pixbuf_animation_get_width
- gdk_pixbuf_animation_get_height
- gdk_pixbuf_animation_get_iter
-diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c
-index 907e0e7..5b500f6 100644
---- a/gdk-pixbuf/gdk-pixbuf-animation.c
-+++ b/gdk-pixbuf/gdk-pixbuf-animation.c
-@@ -256,6 +256,36 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
- #endif
- 
- /**
-+ * gdk_pixbuf_animation_ref:
-+ * @animation: An animation.
-+ *
-+ * Adds a reference to an animation.
-+ *
-+ * Return value: The same as the @animation argument.
-+ *
-+ * Deprecated: 2.0: Use g_object_ref().
-+ **/
-+GdkPixbufAnimation *
-+gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation)
-+{
-+        return (GdkPixbufAnimation*) g_object_ref (animation);
-+}
-+
-+/**
-+ * gdk_pixbuf_animation_unref:
-+ * @animation: An animation.
-+ *
-+ * Removes a reference from an animation.
-+ *
-+ * Deprecated: 2.0: Use g_object_unref().
-+ **/
-+void
-+gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation)
-+{
-+        g_object_unref (animation);
-+}
-+
-+/**
-  * gdk_pixbuf_animation_is_static_image:
-  * @animation: a #GdkPixbufAnimation
-  * 
-diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h
-index a67e3c9..3143c70 100644
---- a/gdk-pixbuf/gdk-pixbuf-animation.h
-+++ b/gdk-pixbuf/gdk-pixbuf-animation.h
-@@ -58,6 +58,11 @@ GType               gdk_pixbuf_animation_get_type        (void) G_GNUC_CONST;
- GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file   (const char         *filename,
-                                                           GError            **error);
- 
-+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-+GdkPixbufAnimation *gdk_pixbuf_animation_ref             (GdkPixbufAnimation *animation);
-+void                gdk_pixbuf_animation_unref           (GdkPixbufAnimation *animation);
-+#endif
-+
- int                 gdk_pixbuf_animation_get_width       (GdkPixbufAnimation *animation);
- int                 gdk_pixbuf_animation_get_height      (GdkPixbufAnimation *animation);
- gboolean            gdk_pixbuf_animation_is_static_image  (GdkPixbufAnimation *animation);
-diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h
-index 4ea1693..079a3a7 100644
---- a/gdk-pixbuf/gdk-pixbuf-core.h
-+++ b/gdk-pixbuf/gdk-pixbuf-core.h
-@@ -84,6 +84,13 @@ GQuark gdk_pixbuf_error_quark (void);
- 
- GType gdk_pixbuf_get_type (void) G_GNUC_CONST;
- 
-+/* Reference counting */
-+
-+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-+GdkPixbuf *gdk_pixbuf_ref      (GdkPixbuf *pixbuf);
-+void       gdk_pixbuf_unref    (GdkPixbuf *pixbuf);
-+#endif
-+
- /* GdkPixbuf accessors */
- 
- GdkColorspace gdk_pixbuf_get_colorspace      (const GdkPixbuf *pixbuf);
-diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
-index 1b2728b..c38b782 100644
---- a/gdk-pixbuf/gdk-pixbuf.c
-+++ b/gdk-pixbuf/gdk-pixbuf.c
-@@ -186,6 +186,39 @@ gdk_pixbuf_finalize (GObject *object)
-         G_OBJECT_CLASS (gdk_pixbuf_parent_class)->finalize (object);
- }
- 
-+
-+/**
-+ * gdk_pixbuf_ref:
-+ * @pixbuf: A pixbuf.
-+ *
-+ * Adds a reference to a pixbuf.
-+ *
-+ * Return value: The same as the @pixbuf argument.
-+ *
-+ * Deprecated: 2.0: Use g_object_ref().
-+ **/
-+GdkPixbuf *
-+gdk_pixbuf_ref (GdkPixbuf *pixbuf)
-+{
-+        return (GdkPixbuf *) g_object_ref (pixbuf);
-+}
-+
-+/**
-+ * gdk_pixbuf_unref:
-+ * @pixbuf: A pixbuf.
-+ *
-+ * Removes a reference from a pixbuf.
-+ *
-+ * Deprecated: 2.0: Use g_object_unref().
-+ **/
-+void
-+gdk_pixbuf_unref (GdkPixbuf *pixbuf)
-+{
-+        g_object_unref (pixbuf);
-+}
-+
-+
-+
- /* Used as the destroy notification function for gdk_pixbuf_new() */
- static void
- free_buffer (guchar *pixels, gpointer data)
-diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols
-index b1c7e17..03bd08a 100644
---- a/gdk-pixbuf/gdk-pixbuf.symbols
-+++ b/gdk-pixbuf/gdk-pixbuf.symbols
-@@ -15,6 +15,10 @@
- #if IN_FILE(__GDK_PIXBUF_C__)
- gdk_pixbuf_error_quark
- gdk_pixbuf_get_type G_GNUC_CONST
-+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-+gdk_pixbuf_ref
-+gdk_pixbuf_unref
-+#endif
- gdk_pixbuf_new
- gdk_pixbuf_get_bits_per_sample
- gdk_pixbuf_get_colorspace
-@@ -120,6 +124,10 @@ gdk_pixbuf_animation_new_from_file PRIVATE
- #ifdef G_OS_WIN32
- gdk_pixbuf_animation_new_from_file_utf8
- #endif
-+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-+gdk_pixbuf_animation_ref
-+gdk_pixbuf_animation_unref
-+#endif
- gdk_pixbuf_non_anim_new
- gdk_pixbuf_non_anim_get_type G_GNUC_CONST
- #endif
---
-cgit v0.8.3.1
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.6.ebuild
index 55c05de5..596f2e7b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.6.ebuild
@@ -17,6 +17,7 @@ IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
 RDEPEND="
 	>=dev-libs/glib-2.25.9
 	>=media-libs/libpng-1.2.43-r2:0
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 	jpeg? ( >=media-libs/jpeg-6b-r9:0 )
 	jpeg2k? ( media-libs/jasper )
 	tiff? ( >=media-libs/tiff-3.9.2 )
@@ -33,15 +34,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.11
 	doc? (
 		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+		~app-text/docbook-xml-dtd-4.1.2 )"
 
 src_prepare() {
-	# From upstream, adds some APIs used by "older" programs
-	epatch "${FILESDIR}"/${P}-readd-deprecated-apis.patch
-
 	# Only build against libX11 if the user wants to do so
-	epatch "${FILESDIR}"/${P}-fix-automagic-x11.patch
+	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
 
 	elibtoolize
 	eautoreconf