diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-11 01:41:58 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-11 01:41:58 +0000 |
| commit | f3488e8c5cd11ef5f75254b35c4ec07c03f1b99a (patch) | |
| tree | b2ca179f1069f7b86ecd2a74a5f6df662948543c /kde-base/kdebase | |
| parent | Marked ppc stable for bug #114828. (diff) | |
| download | gentoo-2-f3488e8c5cd11ef5f75254b35c4ec07c03f1b99a.tar.gz gentoo-2-f3488e8c5cd11ef5f75254b35c4ec07c03f1b99a.tar.bz2 gentoo-2-f3488e8c5cd11ef5f75254b35c4ec07c03f1b99a.zip | |
Add extra patch to make modular X happy.
(Portage version: 2.0.53)
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kxkb-3.5.0-modularxkb.patch | 20 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.0-r1.ebuild | 5 |
3 files changed, 29 insertions, 2 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index b3671f31def9..cc63434dee7c 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.241 2005/12/10 18:09:44 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.242 2005/12/11 01:41:58 flameeyes Exp $ + + 11 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/kxkb-3.5.0-modularxkb.patch, kdebase-3.5.0-r1.ebuild: + Add extra patch to make modular X happy. 10 Dec 2005; Bryan Østergaard <kloeri@gentoo.org kdebase-3.4.3-r1.ebuild: Stable on alpha, bug 112842. diff --git a/kde-base/kdebase/files/kxkb-3.5.0-modularxkb.patch b/kde-base/kdebase/files/kxkb-3.5.0-modularxkb.patch new file mode 100644 index 000000000000..f19bfd25f825 --- /dev/null +++ b/kde-base/kdebase/files/kxkb-3.5.0-modularxkb.patch @@ -0,0 +1,20 @@ +Index: kxkb/rules.cpp +=================================================================== +--- kxkb/rules.cpp (revision 487566) ++++ kxkb/rules.cpp (working copy) +@@ -17,13 +17,13 @@ + + #include "rules.h" + +-const char* X11DirList[3] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/share/X11/"}; ++const char* X11DirList[6] = {"/usr/share/X11/", "/usr/local/share/X11/", "/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/lib/X11/", "/usr/local/lib/X11/"}; + const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"}; + + KeyRules::KeyRules(): + m_layouts(90) + { +- for(int ii=0; ii<3; ii++) ++ for(int ii=0; ii<6; ii++) + if( QDir(X11DirList[ii]).exists() ) { + X11_DIR = X11DirList[ii]; + break; diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild index 627715c9d25d..4daf2351b0d0 100644 --- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild +++ b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.2 2005/12/09 09:42:54 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.3 2005/12/11 01:41:58 flameeyes Exp $ inherit kde-dist eutils flag-o-matic @@ -51,6 +51,9 @@ src_unpack() { epatch "${FILESDIR}/kdesu-3.5.0-bindnow.patch" epatch "${FILESDIR}/kcheckpass-3.5.0-bindnow.patch" + # Fix (again) modular support, when /usr/X11R6 is present this time + epatch "${FILESDIR}/kxkb-3.5.0-modularxkb.patch" + # For the noimake patch. make -f admin/Makefile.common || die } |