diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-12-25 14:50:19 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-12-25 14:50:51 +0100 |
| commit | ddc31b54f70d11a55c604d18a3861de78e709f3b (patch) | |
| tree | 5abd6b8091f9945de80331247b619ea2270ab951 | |
| parent | e226747c054e4269a26e0f103aef4c5739e1e92c (diff) | |
| download | kde-ddc31b54f70d11a55c604d18a3861de78e709f3b.tar.gz kde-ddc31b54f70d11a55c604d18a3861de78e709f3b.tar.bz2 kde-ddc31b54f70d11a55c604d18a3861de78e709f3b.zip | |
[kde-base/systemsettings] Fix kdeenablefinal build, bug 395979
(Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
5 files changed, 46 insertions, 4 deletions
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 00000000000..c57f1978e10 --- /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.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild index cb2424b405d..ea4c9dd77b8 100644 --- a/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild @@ -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 diff --git a/kde-base/systemsettings/systemsettings-4.7.95.ebuild b/kde-base/systemsettings/systemsettings-4.7.95.ebuild index caf0cc7dd8f..09c8822d1e7 100644 --- a/kde-base/systemsettings/systemsettings-4.7.95.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.95.ebuild @@ -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 diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild index cb2424b405d..ea4c9dd77b8 100644 --- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild +++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild @@ -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 diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild index cb2424b405d..ea4c9dd77b8 100644 --- a/kde-base/systemsettings/systemsettings-9999.ebuild +++ b/kde-base/systemsettings/systemsettings-9999.ebuild @@ -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 |