diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-01-17 11:07:38 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-01-17 11:10:07 +0100 |
| commit | 066dd9d0a838980a38b2f973a0ce92ebf4586f6b (patch) | |
| tree | 4dddb45dc5d176758ee3efdd68b532f6d2e7bc9c | |
| parent | d20312aede98247c4472ce128e20e6c2c422c348 (diff) | |
| download | kde-066dd9d0a838980a38b2f973a0ce92ebf4586f6b.tar.gz kde-066dd9d0a838980a38b2f973a0ce92ebf4586f6b.tar.bz2 kde-066dd9d0a838980a38b2f973a0ce92ebf4586f6b.zip | |
[kde-base/systemsettings] Remove kdeenablefinal patch.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
4 files changed, 0 insertions, 33 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 deleted file mode 100644 index c57f1978e10..00000000000 --- a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.97.ebuild b/kde-base/systemsettings/systemsettings-4.7.97.ebuild index c1ff4ca799d..db878e44dbd 100644 --- a/kde-base/systemsettings/systemsettings-4.7.97.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.97.ebuild @@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" ) src_unpack() { diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild index 0244da93fc8..4371d1eea61 100644 --- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild +++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild @@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" ) src_unpack() { diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild index 0244da93fc8..4371d1eea61 100644 --- a/kde-base/systemsettings/systemsettings-9999.ebuild +++ b/kde-base/systemsettings/systemsettings-9999.ebuild @@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" ) src_unpack() { |