From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/
Date: Sun, 25 Dec 2011 13:49:26 +0000 (UTC) [thread overview]
Message-ID: <ddc31b54f70d11a55c604d18a3861de78e709f3b.dilfridge@gentoo> (raw)
commit: ddc31b54f70d11a55c604d18a3861de78e709f3b
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 13:50:19 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 13:50:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ddc31b54
[kde-base/systemsettings] Fix kdeenablefinal build, bug 395979
(Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
.../files/systemsettings-4.7.3-enablefinal.patch | 30 ++++++++++++++++++++
.../systemsettings-4.7.49.9999.ebuild | 5 ++-
.../systemsettings/systemsettings-4.7.95.ebuild | 5 ++-
.../systemsettings-4.8.49.9999.ebuild | 5 ++-
kde-base/systemsettings/systemsettings-9999.ebuild | 5 ++-
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 0000000..c57f197
--- /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 cb2424b..ea4c9dd 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 caf0cc7..09c8822 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 cb2424b..ea4c9dd 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 cb2424b..ea4c9dd 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
next reply other threads:[~2011-12-25 13:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-25 13:49 Andreas Hüttel [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-24 22:45 [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/ Johannes Huber
2013-09-01 14:33 Michael Palimaka
2013-03-25 22:13 Andreas Hüttel
2012-05-02 16:42 Michael Palimaka
2012-01-17 10:11 Johannes Huber
2011-04-04 21:47 Andreas K. Huettel
2011-04-03 8:09 Andreas K. Huettel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ddc31b54f70d11a55c604d18a3861de78e709f3b.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox