Add fileselect dialog patch from Ximian/Suse.

5 files changed, 119 insertions, 14 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f093fd3bf29a..b371dbc1f73c 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.102 2004/07/02 21:44:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.103 2004/07/06 20:36:48 azarah Exp $
+
+*gtk+-2.4.3-r1 (06 Jul 2004)
+
+  06 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/gtk+-2.4.x-filesel-navbuttons.patch.bz2, +gtk+-2.4.3-r1.ebuild:
+  Add fileselect dialog patch from Ximian/Suse.
 
   02 Jul 2004; Tom Gall <tgall@gentoo.org> gtk+-1.2.10-r11.ebuild:
   fix repoman dep (imlib)
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2003859217ad..13cdc1279d08 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,23 +1,26 @@
-MD5 04633a2a3bf4ce49180251fb4175ee84 ChangeLog 16168
-MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
+MD5 fd0de3057143189f110720009410f9ac gtk+-2.4.3-r1.ebuild 2356
 MD5 b77c3295c327cfa247ae46c28c78edf4 gtk+-1.2.10-r11.ebuild 1738
 MD5 c11d7af6bd3c90b412c77d1868d07750 gtk+-2.2.4-r1.ebuild 2414
-MD5 7572f07f74e9cf6573ce75cd9fbfaef0 gtk+-2.4.0-r1.ebuild 2400
+MD5 04633a2a3bf4ce49180251fb4175ee84 ChangeLog 16168
 MD5 3d3a6c233ddd13d6df0573131c047a05 gtk+-2.4.1.ebuild 2239
+MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 7572f07f74e9cf6573ce75cd9fbfaef0 gtk+-2.4.0-r1.ebuild 2400
 MD5 408bfe64dce99ca0abfdcb6da7596116 gtk+-2.4.3.ebuild 2257
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 aebd5e92c0aec62bee7c49e0b24b2add files/gtk+-2.4.0-uimanager-zero-becomes-null.patch 1116
 MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0-r1 64
+MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
 MD5 18620b7ba0f3cf18b663d7e314669aa7 files/digest-gtk+-2.4.1 64
-MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3-r1 64
+MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3 64
 MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
+MD5 4b1c2661ed134450ff6357781e7ab262 files/gtk+-2.4.x-filesel-navbuttons.patch.bz2 12267
+MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 aebd5e92c0aec62bee7c49e0b24b2add files/gtk+-2.4.0-uimanager-zero-becomes-null.patch 1116
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 c036eedc28ac4fb298c20ef606d53935 files/gtk+-2.4.1-define_sensible_icon_theme.patch 582
-MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 9b79edfc3c0ad59155dc0dff5fd6d4a5 files/digest-gtk+-2.4.3 64
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1
new file mode 100644
index 000000000000..83cae04e6bb8
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1
@@ -0,0 +1 @@
+MD5 debfd0fcef08683c0761f13e1ba2dced gtk+-2.4.3.tar.bz2 9256514
diff --git a/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2 b/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2
new file mode 100644
index 000000000000..5a0f37327d48
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2
diff --git a/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..97522f29a0e9
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild,v 1.1 2004/07/06 20:36:48 azarah Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="doc tiff jpeg"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.4
+	>=media-libs/libpng-1.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	x11-misc/shared-mime-info
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/autoconf
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Turn of --export-symbols-regex for now, since it removes
+	# the wrong symbols
+	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
+	# beautifying patch for disabled icons
+	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+	# define a sensible default icon theme
+	epatch ${FILESDIR}/${PN}-2.4.1-define_sensible_icon_theme.patch
+	# Fileselect dialog from Ximian/Suse
+	epatch ${FILESDIR}/${PN}-2.4.x-filesel-navbuttons.patch.bz2
+
+	autoconf || die
+
+}
+
+src_compile() {
+
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		--with-png \
+		--with-gdktarget=x11 \
+		--with-xinput \
+		|| die
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die
+
+}
+
+src_install() {
+
+	dodir /etc/gtk-2.0
+
+	make DESTDIR=${D} install || die
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING INSTALL NEWS* README*
+
+}
+
+pkg_postinst() {
+
+	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
+	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
+
+	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
+	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"
+	einfo "you upgrade from gtk+-2.2 to 2.4 (requires gentoolkit)."
+
+}