From 0b12722fc574e915e9b96391c077fcc87da7ec90 Mon Sep 17 00:00:00 2001 From: Ruben Bressler Date: Mon, 19 Jul 2010 16:08:39 -0400 Subject: adicionando gdk-pixbuf-2.21.4 --- x11-libs/gdk-pixbuf/Manifest | 4 + .../gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 +++ .../gdk-pixbuf-2.21.4-readd-deprecated-apis.patch | 176 +++++++++++++++++++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild | 98 ++++++++++++ 4 files changed, 302 insertions(+) create mode 100644 x11-libs/gdk-pixbuf/Manifest create mode 100644 x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch create mode 100644 x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-readd-deprecated-apis.patch create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest new file mode 100644 index 0000000..f785b1b --- /dev/null +++ b/x11-libs/gdk-pixbuf/Manifest @@ -0,0 +1,4 @@ +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 diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch new file mode 100644 index 0000000..36380d9 --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch @@ -0,0 +1,24 @@ +Adds a new configure option to remove the automagic dependency on libX11. + +--- gdk-pixbuf-2.21.4.orig/configure.ac ++++ gdk-pixbuf-2.21.4/configure.ac +@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES= + GDK_PIXBUF_XLIB_EXTRA_CFLAGS= + GDK_PIXBUF_XLIB_EXTRA_LIBS= + +-if $PKG_CONFIG --exists x11; then ++AC_ARG_WITH(x11, ++ AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@], ++ [build X11 support @<:@default=auto@:>@]),, ++ [ ++ if $PKG_CONFIG --exists x11; then ++ with_x11=yes ++ else ++ with_x11=no ++ fi ++ ]) ++ ++if test x$with_x11 = xyes; then + AM_CONDITIONAL(USE_X11, true) + PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0) + else 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 new file mode 100644 index 0000000..3710791 --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-readd-deprecated-apis.patch @@ -0,0 +1,176 @@ +From 0969a103e7c143545cbde7e458967b42a9415307 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +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 + +
+ refcounting ++gdk_pixbuf_ref ++gdk_pixbuf_unref + GdkPixbufDestroyNotify +
+ +@@ -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.4.ebuild new file mode 100644 index 0000000..55c05de --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.2 2010/06/20 11:15:18 nirbheek Exp $ + +EAPI="3" + +inherit gnome.org flag-o-matic multilib libtool autotools virtualx + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" + +RDEPEND=" + >=dev-libs/glib-2.25.9 + >=media-libs/libpng-1.2.43-r2:0 + jpeg? ( >=media-libs/jpeg-6b-r9:0 ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.9.2 ) + X? ( x11-libs/libX11 ) + ! "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" + + if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" + fi +} -- cgit v1.2.3-65-gdbad