Remove stale files in FILESDIR, add patch to enable compile with <gcc-4.1.2 (bug #256827)

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 19 insertions, 80 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index ce664f405f87..71098ca0808e 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.28 2009/04/13 22:56:02 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.29 2009/04/14 15:55:43 gengor Exp $
+
+  14 Apr 2009; Gordon Malm <gengor@gentoo.org>
+  -files/systemsettings-4.0.2-opengl.patch,
+  -files/systemsettings-enable-admin-mode.patch,
+  systemsettings-4.2.2.ebuild:
+  Remove stale files in FILESDIR, add patch to enable compile with <gcc-4.1.2
+  (bug #256827)
 
   13 Apr 2009; Gordon Malm <gengor@gentoo.org>
   +files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch,
diff --git a/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch b/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch
deleted file mode 100644
index 1a933ec23b11..000000000000
--- a/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- workspace/kcontrol/screensaver/CMakeLists.txt
-+++ workspace/kcontrol/screensaver/CMakeLists.txt
-@@ -1,5 +1,7 @@
- 
-+if(OPENGL_FOUND)
- check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
-+endif(OPENGL_FOUND)
- configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
- 
- add_definitions (-DQT3_SUPPORT)
diff --git a/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch b/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch
deleted file mode 100644
index 0f41b4dddd6d..000000000000
--- a/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- systemsettings-4.1.0/systemsettings/mainwindow.cpp.orig	2008-06-10 15:41:03.000000000 +0400
-+++ systemsettings-4.1.0/systemsettings/mainwindow.cpp	2008-07-25 15:43:14.000000000 +0400
-@@ -27,6 +27,7 @@
- 
- #include <QLayout>
- #include <QStackedWidget>
-+#include <QProcess>
- 
- #include <KAction>
- #include <KActionCollection>
-@@ -42,6 +43,7 @@
- #include <KStandardAction>
- #include <KTabWidget>
- #include <kcategorizedsortfilterproxymodel.h>
-+#include <KStandardDirs>
- #include <kcategorizedview.h>
- #include <kcategorydrawer.h>
- #include <kiconloader.h>
-@@ -299,9 +301,13 @@
-         return;
- 
-     MenuItem * mItem = selected.data( Qt::UserRole ).value<MenuItem*>();
-+    bool needsRootPrivs = false;
-     if ( mItem ) {
-         kDebug() << "Selected item: " << mItem->service->name();
-         kDebug() << "Comment:       " << mItem->service->comment();
-+
-+        needsRootPrivs = mItem->service->property( "X-KDE-RootOnly", QVariant::Bool ).toBool();
-+        kDebug() << "Needs root privs:" << needsRootPrivs;
-     } else {
-         kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString();
-         Q_ASSERT(mItem); // Would core dump below. Do it now
-@@ -313,6 +319,35 @@
-     if ( groupWidget )
-         return;
- 
-+    if ( needsRootPrivs )
-+    {
-+        QString kdesu = KStandardDirs::findExe( "kdesu" );
-+        //kDebug() << "kdesu path:" << kdesu;
-+
-+        QString cmd = mItem->service->exec().trimmed();
-+
-+        /* Prepare the process to run the kcmshell */
-+        if ( cmd.left(5) == "kdesu" )
-+        {
-+            cmd = cmd.remove(0,5).trimmed();
-+
-+            /* Remove all kdesu switches */
-+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
-+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
-+        }
-+
-+        if ( cmd.left(9) == "kcmshell4" )
-+            cmd = cmd.remove(0,9).trimmed();
-+
-+        QStringList args;
-+        args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
-+
-+        kDebug() << "Starting root module: " << args;
-+        QProcess::execute( kdesu, args );
-+
-+        return;
-+    }
-+
-     groupWidget = moduleItemToWidgetDict[mItem->service];
- 
-     if( !groupWidget ) {
diff --git a/kde-base/systemsettings/systemsettings-4.2.2.ebuild b/kde-base/systemsettings/systemsettings-4.2.2.ebuild
index 237020b8fb42..7a34d4105f74 100644
--- a/kde-base/systemsettings/systemsettings-4.2.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.2.ebuild,v 1.1 2009/04/12 06:47:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.2.ebuild,v 1.2 2009/04/14 15:55:43 gengor Exp $
 
 EAPI="2"
 
@@ -69,6 +69,16 @@ src_prepare() {
 		systemsettings/CMakeLists.txt \
 		|| die "Failed to fix systemsettingsrc install location"
 
+	if ! version_is_at_least 4.1.2 "$(gcc-fullversion)" ; then
+		ewarn
+		ewarn "The kxkb module will be built without keyboard hot-plugging"
+		ewarn "support.  GCC version 4.1.2 or greater is required to build"
+		ewarn "kxkb's keyboard hot-plugging code."
+		ewarn
+		ebeep 5
+		epatch "$FILESDIR/${PN}-4.2.1-kxkb-strip-hot_plugging-support.patch"
+	fi
+
 	kde4-meta_src_prepare
 }