diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-07-03 00:10:47 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-07-03 02:03:10 -0400 |
| commit | aa8b272f067cda9ec97bb86039e865de9328dd64 (patch) | |
| tree | 2e21441ac6a17e3b5daf5694d3f09f53a296e7e3 /x11-libs/gdk-pixbuf | |
| parent | x11-libs/gdk-pixbuf: Add patch from upstream to readd deprecated apis (still ... (diff) | |
| download | gnome-aa8b272f067cda9ec97bb86039e865de9328dd64.tar.gz gnome-aa8b272f067cda9ec97bb86039e865de9328dd64.tar.bz2 gnome-aa8b272f067cda9ec97bb86039e865de9328dd64.zip | |
x11-libs/gdk-pixbuf,gtk+: remove automagic dependancy on libX11, force X for gtk+[-aqua]
Diffstat (limited to 'x11-libs/gdk-pixbuf')
| -rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild | 11 |
3 files changed, 35 insertions, 3 deletions
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 770cd567..f785b1b9 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,3 +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 2561 RMD160 466818751908309865d6d45e675975c86034d4e0 SHA1 383a45075af6a00c1ecd39def9d16f624c0c038f SHA256 2d83a4a778a9b8707488cc1c6045913853376a3fd6763e1a8b096d604b663e0b +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 00000000..36380d99 --- /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/gdk-pixbuf-2.21.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild index c5ad29b8..55c05de5 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.21.4.ebuild @@ -4,7 +4,7 @@ EAPI="3" -inherit gnome.org flag-o-matic multilib libtool virtualx +inherit gnome.org flag-o-matic multilib libtool autotools virtualx DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" @@ -12,7 +12,7 @@ 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="debug doc +introspection jpeg jpeg2k tiff test" +IUSE="+X debug doc +introspection jpeg jpeg2k tiff test" RDEPEND=" >=dev-libs/glib-2.25.9 @@ -20,6 +20,7 @@ RDEPEND=" jpeg? ( >=media-libs/jpeg-6b-r9:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2 ) + X? ( x11-libs/libX11 ) !<gnome-base/gail-1000 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3" @@ -36,9 +37,14 @@ DEPEND="${RDEPEND} introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" 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 + elibtoolize + eautoreconf } src_configure() { @@ -61,6 +67,7 @@ src_configure() { $(use_with jpeg2k libjasper) $(use_with tiff libtiff) $(use_enable introspection) + $(use_with X x11) --with-libpng" # Passing --disable-debug is not recommended for production use |