diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2004-04-05 20:42:59 +0000 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2004-04-05 20:42:59 +0000 |
commit | 70bafe6c6f2045dd3e51f1f9e6896c2582193188 (patch) | |
tree | 1412b78a159e73928123fd4b8a5985521f130a84 /gnome-base/control-center | |
parent | add s390 to keywords (Manifest recommit) (diff) | |
download | gentoo-2-70bafe6c6f2045dd3e51f1f9e6896c2582193188.tar.gz gentoo-2-70bafe6c6f2045dd3e51f1f9e6896c2582193188.tar.bz2 gentoo-2-70bafe6c6f2045dd3e51f1f9e6896c2582193188.zip |
workaround for ppc
Diffstat (limited to 'gnome-base/control-center')
-rw-r--r-- | gnome-base/control-center/ChangeLog | 6 | ||||
-rw-r--r-- | gnome-base/control-center/control-center-2.6.0.3.ebuild | 4 | ||||
-rw-r--r-- | gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch | 24 |
3 files changed, 32 insertions, 2 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 5d1caa72b6d2..7b785c38079b 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.60 2004/04/02 16:33:10 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.61 2004/04/05 20:42:57 lu_zero Exp $ + + 05 Apr 2004; Luca Barbato <lu_zero@gentoo.org> + files/control-center-2.6.0-remove-pmu.patch: + Added ppc related fix, removed bogus pmu control from acme as workaround. *control-center-2.6.0.3 (02 Apr 2004) diff --git a/gnome-base/control-center/control-center-2.6.0.3.ebuild b/gnome-base/control-center/control-center-2.6.0.3.ebuild index a9502757c213..f4227b9989fc 100644 --- a/gnome-base/control-center/control-center-2.6.0.3.ebuild +++ b/gnome-base/control-center/control-center-2.6.0.3.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/gnome-base/control-center/control-center-2.6.0.3.ebuild,v 1.1 2004/04/02 16:33:10 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.6.0.3.ebuild,v 1.2 2004/04/05 20:42:58 lu_zero Exp $ # FIXME : double check all the acme stuff inherit gnome2 eutils @@ -62,6 +62,8 @@ src_unpack() { # what this is about. use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch + # Temporary workaround for a problematic behaviour with acme. + epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch # temporary fix for icon installation adapted by <link@sub_pop.net> (#16928) # FIXME : this broke again # epatch ${FILESDIR}/${PN}-2.2-icons_install.patch diff --git a/gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch b/gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch new file mode 100644 index 000000000000..6a349ba00801 --- /dev/null +++ b/gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch @@ -0,0 +1,24 @@ +diff -ruN control-center-2.6.0.3.orig/capplets/keybindings/gnome-keybinding-properties.c control-center-2.6.0.3/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.6.0.3.orig/capplets/keybindings/gnome-keybinding-properties.c 2004-04-05 18:33:34.595212248 +0200 ++++ control-center-2.6.0.3/capplets/keybindings/gnome-keybinding-properties.c 2004-04-05 18:34:18.521534432 +0200 +@@ -21,7 +21,7 @@ + #define KEY_THEME_KEY "/desktop/gnome/interface/gtk_key_theme" + #define MAX_ELEMENTS_BEFORE_SCROLLING 10 + +-#if defined(__powerpc__) && defined (__linux__) ++#if 0 + #define USE_FBLEVEL + #else + #undef USE_FBLEVEL +diff -ruN control-center-2.6.0.3.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.6.0.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.6.0.3.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-04-05 18:33:34.877169384 +0200 ++++ control-center-2.6.0.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-04-05 18:34:40.630173408 +0200 +@@ -32,7 +32,7 @@ + + #include "eggaccelerators.h" + +-#if defined(__powerpc__) && defined (__linux__) ++#if 0 + #define USE_FBLEVEL + #include "actions/acme-fb-level.h" + #else |