| 1 |
commit: 066dd9d0a838980a38b2f973a0ce92ebf4586f6b |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 17 10:07:38 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 17 10:10:07 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=066dd9d0 |
| 7 |
|
| 8 |
[kde-base/systemsettings] Remove kdeenablefinal patch. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/systemsettings-4.7.3-enablefinal.patch | 30 -------------------- |
| 14 |
.../systemsettings/systemsettings-4.7.97.ebuild | 1 - |
| 15 |
.../systemsettings-4.8.49.9999.ebuild | 1 - |
| 16 |
kde-base/systemsettings/systemsettings-9999.ebuild | 1 - |
| 17 |
4 files changed, 0 insertions(+), 33 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index c57f197..0000000 |
| 22 |
--- a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,30 +0,0 @@ |
| 25 |
-diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp |
| 26 |
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp 2011-05-20 22:32:06.000000000 +0200 |
| 27 |
-+++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp 2011-12-25 12:46:50.529622540 +0100 |
| 28 |
-@@ -25,5 +25,5 @@ |
| 29 |
- |
| 30 |
- static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL }; |
| 31 |
--static const char* LIST_SEPARATOR = ","; |
| 32 |
-+#define LIST_SEPARATOR "," |
| 33 |
- //static const char* DEFAULT_LAYOUT = "us"; |
| 34 |
- static const char* DEFAULT_MODEL = "pc104"; |
| 35 |
-@@ -183,2 +183,4 @@ |
| 36 |
- return layouts.mid(layoutLoopCount, layouts.size()); |
| 37 |
- } |
| 38 |
-+ |
| 39 |
-+#undef LIST_SEPARATOR |
| 40 |
-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 |
| 41 |
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp 2011-05-20 22:32:06.000000000 +0200 |
| 42 |
-+++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp 2011-12-25 12:46:05.173189572 +0100 |
| 43 |
-@@ -42,5 +42,5 @@ |
| 44 |
- static const char* LAYOUTS_ATTRIBUTE = "layouts"; |
| 45 |
- |
| 46 |
--static const char* LIST_SEPARATOR = ","; |
| 47 |
-+#define LIST_SEPARATOR "," |
| 48 |
- |
| 49 |
- static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml"; |
| 50 |
-@@ -259,2 +259,4 @@ |
| 51 |
- return !windowMode; |
| 52 |
- } |
| 53 |
-+ |
| 54 |
-+#undef LIST_SEPARATOR |
| 55 |
|
| 56 |
diff --git a/kde-base/systemsettings/systemsettings-4.7.97.ebuild b/kde-base/systemsettings/systemsettings-4.7.97.ebuild |
| 57 |
index c1ff4ca..db878e4 100644 |
| 58 |
--- a/kde-base/systemsettings/systemsettings-4.7.97.ebuild |
| 59 |
+++ b/kde-base/systemsettings/systemsettings-4.7.97.ebuild |
| 60 |
@@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 64 |
- "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" |
| 65 |
) |
| 66 |
|
| 67 |
src_unpack() { |
| 68 |
|
| 69 |
diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild |
| 70 |
index 0244da9..4371d1e 100644 |
| 71 |
--- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild |
| 72 |
+++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild |
| 73 |
@@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' |
| 74 |
|
| 75 |
PATCHES=( |
| 76 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 77 |
- "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" |
| 78 |
) |
| 79 |
|
| 80 |
src_unpack() { |
| 81 |
|
| 82 |
diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild |
| 83 |
index 0244da9..4371d1e 100644 |
| 84 |
--- a/kde-base/systemsettings/systemsettings-9999.ebuild |
| 85 |
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild |
| 86 |
@@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' |
| 87 |
|
| 88 |
PATCHES=( |
| 89 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 90 |
- "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" |
| 91 |
) |
| 92 |
|
| 93 |
src_unpack() { |
Archives