added icons installation fixing patch, marked 2.2.2 x86

6 files changed, 79 insertions, 13 deletions

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 33e8934a556f..6d94136aec9a 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,14 +1,12 @@
-MD5 8df995809f517181e4283416a466ab8a control-center-2.2.2.ebuild 1129
+MD5 7f2854429f4028a215968bc388a0553f control-center-2.2.2.ebuild 1128
 MD5 1ff5c8a157cdb575e5d0c8cd280b75e2 control-center-2.2.1.ebuild 1128
-MD5 972fa184915c450d46fff3e4a73f2d89 control-center-2.2.0.1.ebuild 912
 MD5 4734b63853c5414c31033d455487345d control-center-1.4.0.5-r1.ebuild 1258
 MD5 d3aaafe94dfd3c22fa095fd71f84eb21 control-center-2.2.0.1-r1.ebuild 1135
-MD5 337efe187c699a8be1bb114cf63b367c control-center-2.2.2-r1.ebuild 1258
-MD5 d3f233a3886b08fe0e474a2751f92aa7 ChangeLog 5307
+MD5 21d3315fcee6c71b97f8f3dc0048f834 control-center-2.2.2-r1.ebuild 1243
+MD5 502b50b1f85c487ac2a255f9cd79155c ChangeLog 5492
 MD5 d505cf9f64f1562a777380d903306088 files/digest-control-center-2.2.1 74
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2 74
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 3a350ea03e5e1ae9da23581ab4a4aa47 files/digest-control-center-2.2.0.1 76
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2-r1 74
 MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
diff --git a/gnome-base/control-center/control-center-2.2.0.1.ebuild b/gnome-base/control-center/control-center-2.2.2-r1.ebuild
index d36d92c1260b..26000073ae39 100644
--- a/gnome-base/control-center/control-center-2.2.0.1.ebuild
+++ b/gnome-base/control-center/control-center-2.2.2-r1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.0.1.ebuild,v 1.4 2003/02/13 12:04:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.2-r1.ebuild,v 1.1 2003/06/25 16:08:13 foser Exp $
 
 inherit gnome2 eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="the gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/gconf-1.2
+	>=gnome-base/gconf-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonobo-2
@@ -31,3 +30,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0" 
 
 DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	
+	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
+	# what this is about.
+	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
+
+	# temporary fix for icon installation adapted by <link@sub_pop.net> (#16928)
+	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
+}
diff --git a/gnome-base/control-center/control-center-2.2.2.ebuild b/gnome-base/control-center/control-center-2.2.2.ebuild
index bcca47f856cf..985f5358cb3f 100644
--- a/gnome-base/control-center/control-center-2.2.2.ebuild
+++ b/gnome-base/control-center/control-center-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.2.ebuild,v 1.1 2003/06/03 10:38:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.2.ebuild,v 1.2 2003/06/25 16:08:13 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="the gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
diff --git a/gnome-base/control-center/files/control-center-2.2-icons_install.patch b/gnome-base/control-center/files/control-center-2.2-icons_install.patch
new file mode 100644
index 000000000000..996480de13ff
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.2-icons_install.patch
@@ -0,0 +1,57 @@
+diff -ur control-center-2.2.2.orig/capplets/theme-switcher/gnome-theme-details.c control-center-2.2.2/capplets/theme-switcher/gnome-theme-details.c
+--- control-center-2.2.2.orig/capplets/theme-switcher/gnome-theme-details.c	2003-03-12 08:37:58.000000000 -0800
++++ control-center-2.2.2/capplets/theme-switcher/gnome-theme-details.c	2003-06-15 16:02:17.000000000 -0700
+@@ -318,13 +318,13 @@
+ 
+   /* window manager themes */
+   widget = WID ("window_install_button");
+-  g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_icon_theme_installer_run_cb), parent);
++  g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_theme_installer_run_cb), parent);
+   widget = WID ("window_manage_button");
+   g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_theme_manager_window_show_manage_themes), dialog);
+ 
+   /* icon themes */
+   widget = WID ("icon_install_button");
+-  g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_theme_installer_run_cb), parent);
++  g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_icon_theme_installer_run_cb), parent);
+   widget = WID ("icon_manage_button");
+   g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_theme_manager_icon_show_manage_themes), dialog);
+ 
+diff -ur control-center-2.2.2.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.2.2/capplets/theme-switcher/gnome-theme-installer.c
+--- control-center-2.2.2.orig/capplets/theme-switcher/gnome-theme-installer.c	2003-01-15 23:40:29.000000000 -0800
++++ control-center-2.2.2/capplets/theme-switcher/gnome-theme-installer.c	2003-06-15 16:38:39.000000000 -0700
+@@ -45,8 +45,15 @@
+ 	gchar *path = data;
+ 
+ 	/* this should be something more clever and nonblocking */
+-	command = g_strdup_printf ("sh -c 'gzip -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
++	if (strstr (path, ".icons") != NULL) {
++		command = g_strdup_printf ("sh -c 'gzip -d -c < \"%s\" | tar xf - -C \"%s/.icons\"'",
+ 				   path, g_get_home_dir ());
++	}
++	else {
++		command = g_strdup_printf ("sh -c 'gzip -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
++				   path, g_get_home_dir ());
++	}
++
+ 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+ 		gnome_vfs_unlink (path);
+ 	g_free (command);
+@@ -74,8 +81,15 @@
+ 	gchar *path = data;
+ 
+ 	/* this should be something more clever and nonblocking */
+-	command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
+-				   path, g_get_home_dir ());
++	if (strstr (path, ".icons") != NULL) {
++		command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.icons\"'",
++			path, g_get_home_dir ());
++	}
++	else {
++		command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
++			path, g_get_home_dir ());
++	}
++
+ 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+ 		gnome_vfs_unlink (path);
+ 	g_free (command);
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.0.1 b/gnome-base/control-center/files/digest-control-center-2.2.0.1
deleted file mode 100644
index 40b565c1c467..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b17bc2ecf9a38614310c54c5f88ffc55 control-center-2.2.0.1.tar.bz2 1462388
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.2-r1 b/gnome-base/control-center/files/digest-control-center-2.2.2-r1
new file mode 100644
index 000000000000..4d5a3972ed84
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.2.2-r1
@@ -0,0 +1 @@
+MD5 d5288d0e4249a5afdef494d5c59cb1bc control-center-2.2.2.tar.bz2 1543005