diff options
Diffstat (limited to 'x11-libs/gtk+')
| -rw-r--r-- | x11-libs/gtk+/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch | 17 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.9999.ebuild | 149 |
3 files changed, 89 insertions, 80 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 2340bd3..0516fa8 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,4 @@ AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 +AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd -EBUILD gtk+-2.9999.ebuild 4018 RMD160 9b62fc80a32a7ce0020413cb58d360c9a16f3509 SHA1 9397140c731abf404327a67870b4d41c1cd9a76c SHA256 3cb8a00a88824e097530a77319e9649da562bb11433d6375f634a13d7b35cd65 +EBUILD gtk+-2.9999.ebuild 4239 RMD160 7b146e266d5ff610c2c7bc6cf2c4d8924bf7c976 SHA1 c5124e35b9688f0063a23f2965f8e3da9b891f6b SHA256 e8b2f175f29965d0b781e3e8f40755df835045f0c1e2ada8c23194ec9743293c diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch new file mode 100644 index 0000000..3fe8cff --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch @@ -0,0 +1,17 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=536767 + +Makes inkscape and claws-mail buildable again. Basically all packages still using +GtkCList and single included headers. +--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 ++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 +@@ -29,7 +29,9 @@ + #ifndef __GTK_SIGNAL_H__ + #define __GTK_SIGNAL_H__ + +-#include <gtk/gtk.h> ++#include <gtk/gtkenums.h> ++#include <gtk/gtktypeutils.h> ++#include <gtk/gtkobject.h> + #include <gtk/gtkmarshal.h> + + G_BEGIN_DECLS diff --git a/x11-libs/gtk+/gtk+-2.9999.ebuild b/x11-libs/gtk+/gtk+-2.9999.ebuild index e3fcc33..72c43e6 100644 --- a/x11-libs/gtk+/gtk+-2.9999.ebuild +++ b/x11-libs/gtk+/gtk+-2.9999.ebuild @@ -1,111 +1,99 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.1.ebuild,v 1.1 2009/05/04 22:28:22 eva Exp $ -inherit gnome2-live flag-o-matic virtualx +EAPI="2" + +inherit gnome2-live flag-o-matic eutils libtool virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2" SLOT="2" -KEYWORDS="~amd64 ~x86" -IUSE="X cups debug doc jpeg jpeg2k tiff vim-syntax xinerama" - -RDEPEND=">=dev-libs/glib-2.17.6 - >=x11-libs/pango-1.20 - >=dev-libs/atk-1.13 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - X? ( - x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - >=x11-libs/libXrandr-1.2 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - >=x11-libs/cairo-1.6[X] - xinerama? ( x11-libs/libXinerama ) - ) - !X? ( - dev-libs/DirectFB - >=x11-libs/cairo-1.6[directfb] - ) - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.7 ) - !<gnome-base/gail-1000" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama" + +# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken +RDEPEND="x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + >=x11-libs/libXrandr-1.2 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.19.7 + >=x11-libs/pango-1.20 + >=dev-libs/atk-1.13 + >=x11-libs/cairo-1.6[X] + media-libs/fontconfig + x11-misc/shared-mime-info + >=media-libs/libpng-1.2.1 + cups? ( net-print/cups ) + jpeg? ( >=media-libs/jpeg-6b-r2 ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.5.7 ) + !<gnome-base/gail-1000" DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - X? ( - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - xinerama? ( x11-proto/xineramaproto ) - ) - doc? ( - >=dev-util/gtk-doc-1.8 - ~app-text/docbook-xml-dtd-4.1.2 - )" + >=dev-util/pkgconfig-0.9 + x11-proto/xextproto + x11-proto/xproto + x11-proto/inputproto + x11-proto/damageproto + xinerama? ( x11-proto/xineramaproto ) + >=dev-util/gtk-doc-am-1.11 + doc? ( + >=dev-util/gtk-doc-1.11 + ~app-text/docbook-xml-dtd-4.1.2 )" PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" -PATCHES="${PN}-2.12.0-flash-workaround.patch" +PATCHES="${FILESDIR}/${PN}-2.12.0-flash-workaround.patch +${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch" -pkg_setup() { - if has_multilib_profile ; then - # use an arch-specific config directory so that 32bit and 64bit versions - # dont clash on multilib systems - PATCHES="${PATCHES} - ${PN}-2.8.0-multilib.patch" - fi +set_gtk2_confdir() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} +} + +src_prepare() { + # use an arch-specific config directory so that 32bit and 64bit versions + # dont clash on multilib systems + has_multilib_profile && PATCHES="${PATCHES} ${FILESDIR}/${PN}-2.8.0-multilib.patch" # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 strip-flags use ppc64 && append-flags -mminimal-toc -} -set_gtk2_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} + elibtoolize } src_configure() { - local myconf= gdk_target= - - if use X ; then - gdk_target=x11 - else - gdk_target=directfb - fi - # png always on to display icons (foser) - myconf="$(use_enable doc gtk-doc) - $(use_with jpeg libjpeg) - $(use_with jpeg2k libjasper) - $(use_with tiff libtiff) - $(use_enable xinerama) - --with-libpng - --with-gdktarget=${gdk_target} - --with-xinput" + local myconf="$(use_enable doc gtk-doc) \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg2k libjasper) \ + $(use_with tiff libtiff) \ + $(use_enable xinerama) \ + $(use_enable cups cups auto) \ + --with-libpng \ + --with-gdktarget=x11 \ + --with-xinput" # Passing --disable-debug is not recommended for production use use debug && myconf="${myconf} --enable-debug=yes" - econf ${myconf} || die "configure failed" + econf ${myconf} } src_test() { + unset DBUS_SESSION_BUS_ADDRESS Xemake check || die "tests failed" } @@ -151,7 +139,10 @@ pkg_postinst() { elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" fi - elog "Please install app-text/evince for print preview functionality" + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your gtkrc." + echo gnome2-live_pkg_postinst } |