diff options
| -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 | ||||
| -rw-r--r-- | x11-libs/gtk+/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.21.4.ebuild | 3 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.90.4.ebuild | 3 |
6 files changed, 41 insertions, 7 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 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 1e5ef07c..ba66ac47 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -10,6 +10,6 @@ DIST gtk+-2.21.4.tar.bz2 18058932 RMD160 eec88b7a8afc5d26f36066b5463c480e8ab0efd DIST gtk+-2.90.3.tar.bz2 18529705 RMD160 96646424d58a0233acb351288f8391bce01e27ee SHA1 6a17942d607e22b08eeba831271de42bfeceaaeb SHA256 c5a556355342446eee5394680aae92e286509db04bf3230c625151d6f6530ee0 DIST gtk+-2.90.4.tar.bz2 16939155 RMD160 81d15ecfc2241e52e6a36cc6dda47c9e82318612 SHA1 c5689cc5ee580e52721fa28cd487789693ba7557 SHA256 73c1f474c9fc5c442097a1a8f2fa1ba4be514f182163ed2112085c46a1f57bb2 EBUILD gtk+-2.21.2.ebuild 5832 RMD160 5bca2500ca3e22476da3b73c3db6451630dcc62b SHA1 cd8c3be370f58f6271b98a72fd2cd569ded76708 SHA256 15686539cc7d0bb3d7ac562f86c980f9fb9640bca373300e5c04129431a1775a -EBUILD gtk+-2.21.4.ebuild 5474 RMD160 35aae997176ff2b003badb3c9309ab3ecb6ca867 SHA1 26f4c1b8df2873d4dd4dd57467a99f323515120f SHA256 cc24bc5199e8f3cc40e3c9d78d0900341342c5fc5552f7bad9e78a4a16742de9 +EBUILD gtk+-2.21.4.ebuild 5535 RMD160 143704f595c524282cab9659f04ba8548a8c9fed SHA1 3beed523d23862228886b8ae8f8bbc6f5a09ef19 SHA256 078d423fdc72a710a5998fc5ea152f7729a8d5925a4898c8ad84abd2056c28ae EBUILD gtk+-2.90.3.ebuild 4954 RMD160 9596ec15d29bbd3b886cabad82772ec4fa923b57 SHA1 439f8258a872a0ac47c158e30cce96de6fbe71e4 SHA256 84b96c278f7a610427cc2c55348dbf5e2b464dc187708352976e096d3930522d -EBUILD gtk+-2.90.4.ebuild 4779 RMD160 c427a47af6453efc63847e3c0d4ff6d032892515 SHA1 5b7a8d8a2cabce6e2aaf30ed963f19768b5de502 SHA256 2c80b03df8b80c2901d013ab0e4f6b4eb1ceb8a7f120b29e19eabcd7efd1fb26 +EBUILD gtk+-2.90.4.ebuild 4840 RMD160 51f253510b4624c7f51379bed8a710d28e97989f SHA1 c2169a5002334076f2cbff34354d52dcf7b072e8 SHA256 c899c144334889f1b54195f6452a9387f3aecb7f5f6bc0c0343a8c2f3d5a9fc5 diff --git a/x11-libs/gtk+/gtk+-2.21.4.ebuild b/x11-libs/gtk+/gtk+-2.21.4.ebuild index 787aa5a4..145831df 100644 --- a/x11-libs/gtk+/gtk+-2.21.4.ebuild +++ b/x11-libs/gtk+/gtk+-2.21.4.ebuild @@ -27,9 +27,11 @@ RDEPEND="!aqua? ( x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] + x11-libs/gdk-pixbuf[X,introspection?,jpeg?,jpeg2k?,tiff?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] + x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.25.8 @@ -37,7 +39,6 @@ RDEPEND="!aqua? ( >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info - x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?] cups? ( net-print/cups ) !<gnome-base/gail-1000" DEPEND="${RDEPEND} diff --git a/x11-libs/gtk+/gtk+-2.90.4.ebuild b/x11-libs/gtk+/gtk+-2.90.4.ebuild index d6da063a..5fd91813 100644 --- a/x11-libs/gtk+/gtk+-2.90.4.ebuild +++ b/x11-libs/gtk+/gtk+-2.90.4.ebuild @@ -27,9 +27,11 @@ RDEPEND="!aqua? ( x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] + x11-libs/gdk-pixbuf[X,introspection?,jpeg?,jpeg2k?,tiff?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] + x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.25.9 @@ -37,7 +39,6 @@ RDEPEND="!aqua? ( >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info - x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?] cups? ( net-print/cups ) !<gnome-base/gail-1000" DEPEND="${RDEPEND} |