diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 13:44:59 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 13:44:59 +0000 |
| commit | 379a90dc467b401623949789ea48c9e0c9993b11 (patch) | |
| tree | c361ef01690a777c4e56358eee249a7c96e3c953 /kde-base | |
| parent | Version bump, thanks to Johan Bergström in bug #394985. Also shorten src_tes... (diff) | |
| download | gentoo-2-379a90dc467b401623949789ea48c9e0c9993b11.tar.gz gentoo-2-379a90dc467b401623949789ea48c9e0c9993b11.tar.bz2 gentoo-2-379a90dc467b401623949789ea48c9e0c9993b11.zip | |
Fix kdeenablefinal build, bug 395979
(Portage version: 2.1.10.41/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base')
4 files changed, 43 insertions, 4 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index cc9a39c123de..0f13809d0c98 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.127 2011/12/18 19:46:27 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.128 2011/12/25 13:44:59 dilfridge Exp $ + + 25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + systemsettings-4.7.3-r1.ebuild, + +files/systemsettings-4.7.3-enablefinal.patch, systemsettings-4.7.4.ebuild: + Fix kdeenablefinal build, bug 395979 18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -systemsettings-4.6.5.ebuild: diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch new file mode 100644 index 000000000000..c57f1978e10d --- /dev/null +++ b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch @@ -0,0 +1,30 @@ +diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp +--- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp 2011-05-20 22:32:06.000000000 +0200 ++++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp 2011-12-25 12:46:50.529622540 +0100 +@@ -25,5 +25,5 @@ + + static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL }; +-static const char* LIST_SEPARATOR = ","; ++#define LIST_SEPARATOR "," + //static const char* DEFAULT_LAYOUT = "us"; + static const char* DEFAULT_MODEL = "pc104"; +@@ -183,2 +183,4 @@ + return layouts.mid(layoutLoopCount, layouts.size()); + } ++ ++#undef LIST_SEPARATOR +diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp +--- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp 2011-05-20 22:32:06.000000000 +0200 ++++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp 2011-12-25 12:46:05.173189572 +0100 +@@ -42,5 +42,5 @@ + static const char* LAYOUTS_ATTRIBUTE = "layouts"; + +-static const char* LIST_SEPARATOR = ","; ++#define LIST_SEPARATOR "," + + static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml"; +@@ -259,2 +259,4 @@ + return !windowMode; + } ++ ++#undef LIST_SEPARATOR diff --git a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild index 2ed530b0a8e0..f655fbefec5b 100644 --- a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.2 2011/12/13 19:26:46 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.3 2011/12/25 13:44:59 dilfridge Exp $ EAPI=4 @@ -60,6 +60,7 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" "${FILESDIR}/${P}-fix-keyboard-layout-switch.patch" + "${FILESDIR}/${P}-enablefinal.patch" ) src_unpack() { diff --git a/kde-base/systemsettings/systemsettings-4.7.4.ebuild b/kde-base/systemsettings/systemsettings-4.7.4.ebuild index 0eb4472cbb41..139f86b49253 100644 --- a/kde-base/systemsettings/systemsettings-4.7.4.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.1 2011/12/11 18:52:33 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.2 2011/12/25 13:44:59 dilfridge Exp $ EAPI=4 @@ -57,7 +57,10 @@ KMEXTRACTONLY=" add_blocker kdeaccessibility-colorschemes '<4.6.50' -PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" + "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" +) src_unpack() { if use handbook; then |