new release

6 files changed, 31 insertions, 7 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index ba4a56f6e38d..5e1a59e8a6b2 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.92 2004/04/26 22:28:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.93 2004/05/04 22:35:52 foser Exp $
+
+*gtk+-2.4.1 (04 May 2004)
+
+  04 May 2004; foser <foser@gentoo.org> gtk+-2.4.1.ebuild :
+  New release, add patch & dep to have a default icon theme available to the chooser
 
   26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-2.2.4-r1.ebuild:
   Marked stable on mips.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index df545a18169c..d26f0aa459fc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,11 +1,11 @@
 MD5 6d9390443c7c5a50daee4c917667a42b gtk+-1.2.10-r11.ebuild 1757
-MD5 e0372e397064eee34fa4a99ec18080fd gtk+-2.4.0.ebuild 2065
 MD5 974907635b3a52f3133f0a8597c4fea2 gtk+-2.2.4-r1.ebuild 2421
 MD5 bedc4ffb7e7d63d0be536f019a42c604 gtk+-1.2.10-r10.ebuild 1732
 MD5 68028b0bd0138370d8cd1acd5003e8c0 gtk+-2.4.0-r1.ebuild 2407
-MD5 a33dee003d47e612874dfdd2795db310 ChangeLog 15259
+MD5 cb4f9a0900e4db7c0cd06a98bc1ae76f gtk+-2.4.1.ebuild 2220
+MD5 b90a59c2bca0f82044e46b0a502e4193 ChangeLog 15431
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0 64
+MD5 18620b7ba0f3cf18b663d7e314669aa7 files/digest-gtk+-2.4.1 64
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
@@ -17,4 +17,5 @@ MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
 MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
 MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0-r1 64
 MD5 aebd5e92c0aec62bee7c49e0b24b2add files/gtk+-2.4.0-uimanager-zero-becomes-null.patch 1116
+MD5 c036eedc28ac4fb298c20ef606d53935 files/gtk+-2.4.1-define_sensible_icon_theme.patch 582
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.0 b/x11-libs/gtk+/files/digest-gtk+-2.4.0
deleted file mode 100644
index 927736ca506c..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd16157de447c7f0a86495ad0dc67a1b gtk+-2.4.0.tar.bz2 8476610
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.1 b/x11-libs/gtk+/files/digest-gtk+-2.4.1
new file mode 100644
index 000000000000..ee78b8382060
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.1
@@ -0,0 +1 @@
+MD5 b71fc8b24ffd9399f98fc2a41cfe0c0c gtk+-2.4.1.tar.bz2 8853839
diff --git a/x11-libs/gtk+/files/gtk+-2.4.1-define_sensible_icon_theme.patch b/x11-libs/gtk+/files/gtk+-2.4.1-define_sensible_icon_theme.patch
new file mode 100644
index 000000000000..87c6717edfd9
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.4.1-define_sensible_icon_theme.patch
@@ -0,0 +1,12 @@
+diff -uNr gtk+-2.4.1/gtk/gtksettings.c gtk+-2.4.1.patched/gtk/gtksettings.c
+--- gtk+-2.4.1/gtk/gtksettings.c	2004-03-11 18:54:19.000000000 +0100
++++ gtk+-2.4.1.patched/gtk/gtksettings.c	2004-05-04 23:03:19.423768352 +0200
+@@ -309,7 +309,7 @@
+                                              g_param_spec_string ("gtk-icon-theme-name",
+ 								  P_("Icon Theme Name"),
+ 								  P_("Name of icon theme to use"),
+-								  "hicolor",
++								  "gnome",
+ 								  G_PARAM_READWRITE),
+                                              NULL);
+   g_assert (result == PROP_ICON_THEME_NAME);
diff --git a/x11-libs/gtk+/gtk+-2.4.0.ebuild b/x11-libs/gtk+/gtk+-2.4.1.ebuild
index 289f82c20d36..c243037f9dbe 100644
--- a/x11-libs/gtk+/gtk+-2.4.0.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.0.ebuild,v 1.3 2004/04/05 21:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.1.ebuild,v 1.1 2004/05/04 22:35:52 foser Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
 IUSE="doc tiff jpeg"
 
 RDEPEND="virtual/x11
@@ -18,12 +18,16 @@ RDEPEND="virtual/x11
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.4
 	>=media-libs/libpng-1.2.1
+	>=x11-themes/gnome-icon-theme-1.2
 	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}
@@ -34,6 +38,8 @@ src_unpack() {
 	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}/${P}-define_sensible_icon_theme.patch
 
 	autoconf || die