[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Michael Palimaka]

commit:     b89d72e69460a641b8f92a11fb1717c68cd02323
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed May  2 16:41:24 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May  2 16:41:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b89d72e6

[kde-base/systemsettings] Remove unused xinerama use flag and patch.

(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)

---
 ...emsettings-4.4.2-xinerama_cmake_automagic.patch |   18 ------------------
 .../systemsettings/systemsettings-4.8.3.ebuild     |    9 +--------
 .../systemsettings-4.8.49.9999.ebuild              |    9 +--------
 kde-base/systemsettings/systemsettings-9999.ebuild |    9 +--------
 4 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
deleted file mode 100644
index 5596f41..0000000
--- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake	2009-11-21 10:44:36.000000000 +0100
-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake	2010-04-02 00:04:32.000000000 +0200
-@@ -71,7 +71,14 @@
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
-+
-+if(NOT WITH_X11_Xinerama)
-+  set(X11_Xinerama_FOUND FALSE)
-+  MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
-+endif(NOT WITH_X11_Xinerama)
-+
- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
-+
- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock

diff --git a/kde-base/systemsettings/systemsettings-4.8.3.ebuild b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
index 9ebd70a..6548761 100644
--- a/kde-base/systemsettings/systemsettings-4.8.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	kde4-meta_src_configure

diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
index d7c9582..9400782 100644
--- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS=""
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	kde4-meta_src_configure

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index d7c9582..9400782 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS=""
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	kde4-meta_src_configure

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Johannes Huber]

commit:     5e2e6baf7633ca70081b63d8b36519c91c854f68
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 22:45:17 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 22:45:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5e2e6baf

[kde-base/systemsettings] Re-enable plasma lock

Package-Manager: portage-2.2.10

---
 .../files/systemsettings-4.10.1-noplasmalock.patch         | 14 --------------
 kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch b/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch
deleted file mode 100644
index c292944..0000000
--- a/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/kcontrol/screensaver/screensaver.ui b/kcontrol/screensaver/screensaver.ui
-index 6524e27..abf294a 100644
---- a/kcontrol/screensaver/screensaver.ui
-+++ b/kcontrol/screensaver/screensaver.ui
-@@ -108,6 +108,9 @@
-           <property name="text">
-            <string>&amp;Desktop Widgets</string>
-           </property>
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-          </widget>
-         </item>
-         <item>

diff --git a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
index dcca70f..0a4f4c8 100644
--- a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
@@ -59,9 +59,6 @@ KMEXTRACTONLY="
 	libs/
 	plasma/
 "
-
-PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
-
 # fails to connect to a kded instance
 RESTRICT="test"
 

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Michael Palimaka]

commit:     86a9c84652f866041291701466483f4d50033146
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 14:30:48 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 14:30:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=86a9c846

[kde-base/systemsettings] Backport patch from upstream to remove unneeded dependency.

Package-Manager: portage-2.2.1

---
 .../files/systemsettings-4.11.1-deps.patch         | 49 ++++++++++++++++++++++
 .../systemsettings/systemsettings-4.11.1.ebuild    |  5 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch b/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch
new file mode 100644
index 0000000..63ff37a
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch
@@ -0,0 +1,49 @@
+From 9dba719eb2c8d563eb512bb05451f8939d5d0b4b Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Mon, 2 Sep 2013 00:21:24 +1000
+Subject: [PATCH] Remove unused CMake qimageblitz includes and links.
+
+REVIEW: 112200
+---
+ kcontrol/desktoptheme/CMakeLists.txt | 2 +-
+ kcontrol/style/CMakeLists.txt        | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/kcontrol/desktoptheme/CMakeLists.txt b/kcontrol/desktoptheme/CMakeLists.txt
+index cc8fd99..a93fb41 100644
+--- a/kcontrol/desktoptheme/CMakeLists.txt
++++ b/kcontrol/desktoptheme/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(kcmdesktoptheme_SRCS kcmdesktoptheme.cpp desktopthemedetails.cpp thememodel.
+ kde4_add_ui_files(kcmdesktoptheme_SRCS DesktopTheme.ui DesktopThemeDetails.ui)
+ 
+ kde4_add_plugin(kcm_desktoptheme ${kcmdesktoptheme_SRCS})
+-target_link_libraries(kcm_desktoptheme ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES}
++target_link_libraries(kcm_desktoptheme ${X11_LIBRARIES}
+     ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
+     ${KDE4_KCMUTILS_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+ 
+diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt
+index 6e93bed..d832b20 100644
+--- a/kcontrol/style/CMakeLists.txt
++++ b/kcontrol/style/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ KDE4_NO_ENABLE_FINAL(styles)
+ 
+-include_directories( ${QIMAGEBLITZ_INCLUDES} )
+ # needed for including kdecoration.h
+ include_directories (
+     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects
+@@ -17,8 +16,8 @@ kde4_add_ui_files(kcm_style_PART_SRCS stylepreview.ui finetuning.ui)
+ 
+ kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
+ 
+-target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${QIMAGEBLITZ_LIBRARIES}
+-    ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
++target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
++    ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
+ if(NOT WIN32)
+     target_link_libraries(kcm_style kdecorations)
+ endif(NOT WIN32)
+-- 
+1.8.3.2
+

diff --git a/kde-base/systemsettings/systemsettings-4.11.1.ebuild b/kde-base/systemsettings/systemsettings-4.11.1.ebuild
index 1be4e88..627fb4c 100644
--- a/kde-base/systemsettings/systemsettings-4.11.1.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.1.ebuild
@@ -60,7 +60,10 @@ KMEXTRACTONLY="
 	plasma/
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.1-noplasmalock.patch"
+	"${FILESDIR}/${P}-deps.patch"
+)
 
 src_unpack() {
 	if use handbook; then

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Andreas Hüttel]

commit:     4014524b2c04bed67349817cceb0d85fcb9fc15f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 22:14:09 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 22:14:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4014524b

[kde-base/systemsettings] Disable the widget lock option in the systemsettings gui, as it poses a security risk, bug 462152

Package-Manager: portage-2.2.0_alpha169

---
 .../files/systemsettings-4.10.1-noplasmalock.patch |   14 ++++++++++++++
 .../systemsettings-4.10.49.9999.ebuild             |    2 ++
 kde-base/systemsettings/systemsettings-9999.ebuild |    2 ++
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch b/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch
new file mode 100644
index 0000000..c292944
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.10.1-noplasmalock.patch
@@ -0,0 +1,14 @@
+diff --git a/kcontrol/screensaver/screensaver.ui b/kcontrol/screensaver/screensaver.ui
+index 6524e27..abf294a 100644
+--- a/kcontrol/screensaver/screensaver.ui
++++ b/kcontrol/screensaver/screensaver.ui
+@@ -108,6 +108,9 @@
+           <property name="text">
+            <string>&amp;Desktop Widgets</string>
+           </property>
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
+          </widget>
+         </item>
+         <item>

diff --git a/kde-base/systemsettings/systemsettings-4.10.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.10.49.9999.ebuild
index fd73d61..7e97b51 100644
--- a/kde-base/systemsettings/systemsettings-4.10.49.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.10.49.9999.ebuild
@@ -58,6 +58,8 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
+PATCHES=( "${FILESDIR}/${P}-noplasmalock.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index fd73d61..7e97b51 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -58,6 +58,8 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
+PATCHES=( "${FILESDIR}/${P}-noplasmalock.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Johannes Huber]

commit:     066dd9d0a838980a38b2f973a0ce92ebf4586f6b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 10:07:38 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 10:10:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=066dd9d0

[kde-base/systemsettings] Remove kdeenablefinal patch.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/systemsettings-4.7.3-enablefinal.patch   |   30 --------------------
 .../systemsettings/systemsettings-4.7.97.ebuild    |    1 -
 .../systemsettings-4.8.49.9999.ebuild              |    1 -
 kde-base/systemsettings/systemsettings-9999.ebuild |    1 -
 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 c57f197..0000000
--- 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 c1ff4ca..db878e4 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 0244da9..4371d1e 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 0244da9..4371d1e 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() {

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Andreas Hüttel]

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

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Andreas K. Huettel]

commit:     3a74dcc7e4dcc99eefbd397fbb773b20e8343bf4
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Apr  4 21:50:10 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 21:50:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a74dcc7

[kde-base/systemsettings] Patch now in tarball

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/systemsettings-4.6.2-flagcrash.patch     |   34 --------------------
 .../systemsettings/systemsettings-4.6.2.ebuild     |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch b/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
deleted file mode 100644
index 3e9fb7a..0000000
--- a/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 937c7245f0f4058d2b335d160617c1cdb2398cb7
-Author: Andriy Rysin <arysin@gmail.com>
-Date:   Sat Apr 2 22:27:37 2011 -0400
-
-    Fix null pointer crash when no rules found; add unit test
-    BUG: 269961
-
-diff --git a/kcontrol/keyboard/flags.cpp b/kcontrol/keyboard/flags.cpp
-index 24cd457..be70b1c 100644
---- a/kcontrol/keyboard/flags.cpp
-+++ b/kcontrol/keyboard/flags.cpp
-@@ -116,7 +116,7 @@ static QString getDisplayText(const QString& layout, const QString& variant, con
- {
- 	if( variant.isEmpty() )
- 		return layout;
--	if( rules->version == "1.0" )
-+	if( rules == NULL || rules->version == "1.0" )
- 		return i18nc("layout - variant", "%1 - %2", layout, variant);
- 	return variant;
- }
-diff --git a/kcontrol/keyboard/tests/flags_test.cpp b/kcontrol/keyboard/tests/flags_test.cpp
-index 0f84ce5..f4cec94 100644
---- a/kcontrol/keyboard/tests/flags_test.cpp
-+++ b/kcontrol/keyboard/tests/flags_test.cpp
-@@ -64,6 +64,9 @@ private Q_SLOTS:
-         QVERIFY( flags->getLongText(layoutUnit1, rules).startsWith("USA - International") );
-         QCOMPARE( flags->getLongText(layoutUnit2, rules), QString("USA - other") );
- 
-+        rules = NULL; // when no rules found
-+        QCOMPARE( flags->getLongText(layoutUnit1, rules), QString("us - intl") );
-+
-         flags->clearCache();
-     }
- 

diff --git a/kde-base/systemsettings/systemsettings-4.6.2.ebuild b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
index 911a23c..9c0aed9 100644
--- a/kde-base/systemsettings/systemsettings-4.6.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
@@ -56,7 +56,6 @@ add_blocker konqueror '<4.4.70'
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.6.2-flagcrash.patch"
 )
 
 src_unpack() {

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

[Andreas K. Huettel]

commit:     bf71cfc5c11670191d06eb63f2f1ad89756afe34
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr  3 08:12:58 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 08:12:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf71cfc5

[kde-base/systemsettings] Add upstream patch for flag widget crash

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/systemsettings-4.6.2-flagcrash.patch     |   34 ++++++++++++++++++++
 .../systemsettings/systemsettings-4.6.2.ebuild     |    5 ++-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch b/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
new file mode 100644
index 0000000..3e9fb7a
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
@@ -0,0 +1,34 @@
+commit 937c7245f0f4058d2b335d160617c1cdb2398cb7
+Author: Andriy Rysin <arysin@gmail.com>
+Date:   Sat Apr 2 22:27:37 2011 -0400
+
+    Fix null pointer crash when no rules found; add unit test
+    BUG: 269961
+
+diff --git a/kcontrol/keyboard/flags.cpp b/kcontrol/keyboard/flags.cpp
+index 24cd457..be70b1c 100644
+--- a/kcontrol/keyboard/flags.cpp
++++ b/kcontrol/keyboard/flags.cpp
+@@ -116,7 +116,7 @@ static QString getDisplayText(const QString& layout, const QString& variant, con
+ {
+ 	if( variant.isEmpty() )
+ 		return layout;
+-	if( rules->version == "1.0" )
++	if( rules == NULL || rules->version == "1.0" )
+ 		return i18nc("layout - variant", "%1 - %2", layout, variant);
+ 	return variant;
+ }
+diff --git a/kcontrol/keyboard/tests/flags_test.cpp b/kcontrol/keyboard/tests/flags_test.cpp
+index 0f84ce5..f4cec94 100644
+--- a/kcontrol/keyboard/tests/flags_test.cpp
++++ b/kcontrol/keyboard/tests/flags_test.cpp
+@@ -64,6 +64,9 @@ private Q_SLOTS:
+         QVERIFY( flags->getLongText(layoutUnit1, rules).startsWith("USA - International") );
+         QCOMPARE( flags->getLongText(layoutUnit2, rules), QString("USA - other") );
+ 
++        rules = NULL; // when no rules found
++        QCOMPARE( flags->getLongText(layoutUnit1, rules), QString("us - intl") );
++
+         flags->clearCache();
+     }
+ 

diff --git a/kde-base/systemsettings/systemsettings-4.6.2.ebuild b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
index a6c2456..911a23c 100644
--- a/kde-base/systemsettings/systemsettings-4.6.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
@@ -54,7 +54,10 @@ KMEXTRACTONLY="
 add_blocker kcontrol '<4.3.98'
 add_blocker konqueror '<4.4.70'
 
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.2-flagcrash.patch"
+)
 
 src_unpack() {
 	if use handbook; then