summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2003-02-02 00:02:21 +0000
committerMarinus Schraal <foser@gentoo.org>2003-02-02 00:02:21 +0000
commit250c25b5c227b8be495eefbaf7e5731b591633bf (patch)
treecf79ac347cb111914bff482e021a2253616262e8 /gnome-base
parentdep addition (diff)
downloadhistorical-250c25b5c227b8be495eefbaf7e5731b591633bf.tar.gz
historical-250c25b5c227b8be495eefbaf7e5731b591633bf.tar.bz2
historical-250c25b5c227b8be495eefbaf7e5731b591633bf.zip
gcc2 patch
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/control-center/ChangeLog5
-rw-r--r--gnome-base/control-center/control-center-2.2.0.ebuild10
-rw-r--r--gnome-base/control-center/files/control-center-2.2.0-gcc2.patch18
3 files changed, 30 insertions, 3 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index c3bb73a6cc4c..6b9586b07d4d 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,9 +1,12 @@
# ChangeLog for gnome-base/control-center
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.27 2003/01/31 19:49:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.28 2003/02/02 00:02:21 foser Exp $
*control-center-2.2.0 (30 Jan 2003)
+ 01 Feb 2003; foser <foser@gentoo.org> control-center-2.2.0.ebuild :
+ Added gcc2 compile problem fixing patch
+
31 Jan 2003; Spider <spider@gentoo.org> control-center-2.2.0.ebuild :
modded the gnome-desktop dep
diff --git a/gnome-base/control-center/control-center-2.2.0.ebuild b/gnome-base/control-center/control-center-2.2.0.ebuild
index 2e1b8ccf472d..a93895ea5f46 100644
--- a/gnome-base/control-center/control-center-2.2.0.ebuild
+++ b/gnome-base/control-center/control-center-2.2.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2002 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.ebuild,v 1.4 2003/01/31 19:49:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.0.ebuild,v 1.5 2003/02/02 00:02:21 foser Exp $
-inherit gnome2
+inherit gnome2 eutils
S=${WORKDIR}/${P}
DESCRIPTION="the gnome2 Desktop configuration tool"
@@ -31,3 +31,9 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0"
DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
+
+src_unpack() {
+ unpack ${A}
+
+ epatch ${FILESDIR}/${P}-gcc2.patch
+}
diff --git a/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch b/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch
new file mode 100644
index 000000000000..e26fe8491397
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch
@@ -0,0 +1,18 @@
+diff -ur control-center-2.2.0/capplets/common/gnome-theme-test.c control-center-2.2.0.patched/capplets/common/gnome-theme-test.c
+--- control-center-2.2.0/capplets/common/gnome-theme-test.c 2003-01-19 08:14:34.000000000 +0100
++++ control-center-2.2.0.patched/capplets/common/gnome-theme-test.c 2003-02-02 00:32:33.000000000 +0100
+@@ -10,11 +10,12 @@
+ int
+ main (int argc, char *argv[])
+ {
+- gtk_init (&argc, &argv);
+- gnome_vfs_init ();
+ gboolean monitor_not_added = FALSE;
+ GList *themes, *list;
+
++ gtk_init (&argc, &argv);
++ gnome_vfs_init ();
++
+ gnome_theme_init (&monitor_not_added);
+
+ themes = gnome_theme_meta_info_find_all ();