rpms/kdebase-workspace/devel kdebase-workspace-4.0.72-ck-shutdown.patch, NONE, 1.1 kdebase-workspace-4.0.72-plasma-default-wallpaper.patch, NONE, 1.1 kdebase-workspace-4.0.72-plasma-konsole.patch, NONE, 1.1 kdebase-workspace-4.0.72-rootprivs.patch, NONE, 1.1 kdebase-workspace-4.0.72-show-systemsettings.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 kdebase-workspace.spec, 1.76, 1.77 sources, 1.10, 1.11 kdebase-workspace-4.0.2-onlyshowkde.patch, 1.1, NONE kdebase-workspace-4.0.2-plasma-konsole.patch, 1.1, NONE kdebase-workspace-4.0.3-ck-shutdown.patch, 1.1, NONE kdebase-workspace-4.0.3-kde#155362.patch, 1.1, NONE kdebase-workspace-4.0.3-menu-switch.patch, 1.2, NONE kdebase-workspace-4.0.3-plasma-default-wallpaper.patch, 1.2, NONE kdebase-workspace-4.0.3-rh#443610.patch, 1.2, NONE kdebase-workspace-4.0.3-rootprivs.patch, 1.1, NONE kdebase-workspace-4.0.3-suspend.patch, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Wed May 7 00:03:30 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729/devel
Modified Files:
.cvsignore kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.0.72-ck-shutdown.patch
kdebase-workspace-4.0.72-plasma-default-wallpaper.patch
kdebase-workspace-4.0.72-plasma-konsole.patch
kdebase-workspace-4.0.72-rootprivs.patch
kdebase-workspace-4.0.72-show-systemsettings.patch
Removed Files:
kdebase-workspace-4.0.2-onlyshowkde.patch
kdebase-workspace-4.0.2-plasma-konsole.patch
kdebase-workspace-4.0.3-ck-shutdown.patch
kdebase-workspace-4.0.3-kde#155362.patch
kdebase-workspace-4.0.3-menu-switch.patch
kdebase-workspace-4.0.3-plasma-default-wallpaper.patch
kdebase-workspace-4.0.3-rh#443610.patch
kdebase-workspace-4.0.3-rootprivs.patch
kdebase-workspace-4.0.3-suspend.patch
Log Message:
* Wed May 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
- update to 4.0.72
- update file list (Lorenzo Villani)
- port plasma-konsole, ck-shutdown, rootprivs, plasma-default-wallpaper patches
- remove NoDisplay=true in systemsettings onlyshowkde patch (still add
OnlyShowIn=KDE), rename to show-systemsettings
- drop upstreamed suspend patch
- drop backported kde#155362 and menu-switch patches
- drop rh#443610 patch, "Zoom Out" should be working in 4.1
- disable kde#158301 patch for now (fails to apply, looks hard to port)
kdebase-workspace-4.0.72-ck-shutdown.patch:
--- NEW FILE kdebase-workspace-4.0.72-ck-shutdown.patch ---
diff -ur kdebase-workspace-4.0.72/libs/kworkspace/kdisplaymanager.cpp kdebase-workspace-4.0.72-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.0.72/libs/kworkspace/kdisplaymanager.cpp 2008-02-21 10:28:02.000000000 +0100
+++ kdebase-workspace-4.0.72-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp 2008-05-07 00:56:17.000000000 +0200
@@ -26,6 +26,7 @@
#include <QtDBus/QtDBus>
#include <QRegExp>
+#include <QLatin1String>
#include <X11/Xauth.h>
#include <X11/Xlib.h>
@@ -85,6 +86,7 @@
strcpy( sa.sun_path, "/tmp/.gdm_socket" );
if (::connect( d->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
::close( d->fd );
+ DMType = NoDM;
d->fd = -1;
break;
}
@@ -185,6 +187,21 @@
bool
KDisplayManager::canShutdown()
{
+ if (DMType == NoDM) {
+ // No DM or newest GDM running, we'll try shutting down through ConsoleKit.
+ // Unfortunately, ConsoleKit won't tell us if we're allowed to do that
+ // (it also depends on whether there are other users logged in on the
+ // system), so we can only check if it's running at all.
+ QDBusConnection systemBus = QDBusConnection::systemBus();
+ if (!systemBus.isConnected())
+ return false;
+ QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+ QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+ QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+ systemBus );
+ return consoleKit.isValid();
+ }
+
if (DMType == OldKDM)
return strstr( ctl, ",maysd" ) != 0;
@@ -204,6 +221,21 @@
if (shutdownType == KWorkSpace::ShutdownTypeNone)
return;
+ if (DMType == NoDM) {
+ // No DM or newest GDM running, try shutting down through ConsoleKit.
+ QDBusConnection systemBus = QDBusConnection::systemBus();
+ if (!systemBus.isConnected())
+ return;
+ QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+ QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+ QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+ systemBus );
+ if (consoleKit.isValid())
+ consoleKit.call( QLatin1String( shutdownType == KWorkSpace::ShutdownTypeReboot ?
+ "Restart" : "Stop" ) );
+ return;
+ }
+
bool cap_ask;
if (DMType == NewKDM) {
QByteArray re;
kdebase-workspace-4.0.72-plasma-default-wallpaper.patch:
--- NEW FILE kdebase-workspace-4.0.72-plasma-default-wallpaper.patch ---
diff -ur kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.0.72-plasma-default-wallpaper/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp 2008-04-30 15:58:29.000000000 +0200
+++ kdebase-workspace-4.0.72-plasma-default-wallpaper/plasma/containments/desktop/desktop.cpp 2008-05-07 01:19:24.000000000 +0200
@@ -261,7 +261,9 @@
void DefaultDesktop::updateBackground()
{
if (m_wallpaperPath.isEmpty() && m_backgroundMode != BackgroundDialog::kNoBackground) {
- QString defaultPath = QString("EOS/contents/images/%1x%2.jpg");
+ KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc");
+ KConfigGroup group = KConfigGroup(config, "Defaults");
+ QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/%1x%2.jpg");
QString testPath = defaultPath.arg(geometry().width()).arg(geometry().height());
m_wallpaperPath = KStandardDirs::locate("wallpaper", testPath);
kdebase-workspace-4.0.72-plasma-konsole.patch:
--- NEW FILE kdebase-workspace-4.0.72-plasma-konsole.patch ---
diff -ur kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp 2008-04-30 15:58:29.000000000 +0200
+++ kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.cpp 2008-05-07 00:45:34.000000000 +0200
@@ -39,6 +39,7 @@
#include <KStandardDirs>
#include <KSvgRenderer>
#include <KWindowSystem>
+#include <KProcess>
#include "plasma/corona.h"
#include "plasma/appletbrowser.h"
@@ -62,6 +63,7 @@
m_lockDesktopAction(0),
m_appletBrowserAction(0),
m_addPanelAction(0),
+ m_runKonsoleAction(0),
m_runCommandAction(0),
m_lockScreenAction(0),
m_logoutAction(0),
@@ -341,6 +343,13 @@
}
}
+void DefaultDesktop::runKonsole()
+{
+ KProcess proc;
+ proc << KStandardDirs::locate("exe", "konsole");
+ proc.execute();
+}
+
void DefaultDesktop::lockScreen()
{
if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -368,6 +377,10 @@
connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel()));
m_addPanelAction->setIcon(KIcon("list-add"));
+ m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+ connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+ m_runKonsoleAction->setIcon(KIcon("terminal"));
+
m_runCommandAction = new QAction(i18n("Run Command..."), this);
connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
m_runCommandAction->setIcon(KIcon("system-run"));
@@ -398,6 +411,8 @@
QList<QAction*> actions;
+ actions.append(m_runKonsoleAction);
+
if (KAuthorized::authorizeKAction("run_command")) {
actions.append(m_runCommandAction);
}
diff -ur kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.h kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.h 2008-04-30 15:58:29.000000000 +0200
+++ kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.h 2008-05-07 00:44:21.000000000 +0200
@@ -84,6 +84,7 @@
const QRect& contentsRect);
protected Q_SLOTS:
+ void runKonsole();
void runCommand();
void configure();
void applyConfig();
@@ -106,6 +107,7 @@
QAction *m_lockDesktopAction;
QAction *m_appletBrowserAction;
QAction *m_addPanelAction;
+ QAction *m_runKonsoleAction;
QAction *m_runCommandAction;
QAction *m_setupDesktopAction;
QAction *m_lockScreenAction;
kdebase-workspace-4.0.72-rootprivs.patch:
--- NEW FILE kdebase-workspace-4.0.72-rootprivs.patch ---
diff -ur kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp
--- kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp 2008-04-30 15:58:34.000000000 +0200
+++ kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp 2008-05-07 01:05:14.000000000 +0200
@@ -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>
@@ -297,9 +299,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
@@ -311,6 +317,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 ) {
kdebase-workspace-4.0.72-show-systemsettings.patch:
--- NEW FILE kdebase-workspace-4.0.72-show-systemsettings.patch ---
diff -ur kdebase-workspace-4.0.72/systemsettings/systemsettings.desktop kdebase-workspace-4.0.72-show-systemsettings/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.0.72/systemsettings/systemsettings.desktop 2008-04-30 15:58:34.000000000 +0200
+++ kdebase-workspace-4.0.72-show-systemsettings/systemsettings/systemsettings.desktop 2008-05-07 00:50:55.000000000 +0200
@@ -114,4 +114,4 @@
X-DBUS-StartupType=Unique
Categories=Qt;KDE;System;
-NoDisplay=true
+OnlyShowIn=KDE;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 28 Mar 2008 16:59:46 -0000 1.8
+++ .cvsignore 7 May 2008 00:02:53 -0000 1.9
@@ -1,4 +1 @@
-kdebase-workspace-4.0.0.tar.bz2
-kdebase-workspace-4.0.1.tar.bz2
-kdebase-workspace-4.0.2.tar.bz2
-kdebase-workspace-4.0.3.tar.bz2
+kdebase-workspace-4.0.72.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdebase-workspace.spec 6 May 2008 21:15:02 -0000 1.76
+++ kdebase-workspace.spec 7 May 2008 00:02:53 -0000 1.77
@@ -4,10 +4,10 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
-Version: 4.0.3
+Version: 4.0.72
-Release: 20%{?dist}
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
+Release: 1%{?dist}
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
@@ -15,39 +15,27 @@
Patch1: kdebase-workspace-4.0.3-redhat-startkde.patch
Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.0.2-plasma-konsole.patch
-Patch4: kdebase-workspace-4.0.2-onlyshowkde.patch
-Patch5: kdebase-workspace-4.0.3-ck-shutdown.patch
+Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
+Patch4: kdebase-workspace-4.0.72-show-systemsettings.patch
+Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
#Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch6: kdebase-workspace-4.0.3-rootprivs.patch
+Patch6: kdebase-workspace-4.0.72-rootprivs.patch
Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
#Â 441062: packagekit tools do not show icons correctly on KDE
Patch8: kdebase-workspace-4.0.3-krdb.patch
-Patch9: kdebase-workspace-4.0.3-suspend.patch
# upstream patches:
-# http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
-# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
-# This has been merged into 4.0.3 in http://websvn.kde.org/?view=rev&revision=790059
-# and the config parts reverted in http://websvn.kde.org/?view=rev&revision=790454
-# due to new strings. This patch reverts rev 790454 and restores the full backport.
-Patch100: kdebase-workspace-4.0.3-kde#155362.patch
-# backport of http://websvn.kde.org/?view=rev&revision=780495 from 4.1
-# (fixed version of http://websvn.kde.org/?view=rev&revision=790063
-# which was reverted in http://websvn.kde.org/?view=rev&revision=790104)
-Patch101: kdebase-workspace-4.0.3-menu-switch.patch
# plasma-4.0-openSUSE patches:
# http://websvn.kde.org/?view=rev&revision=795438
# allows to define a default wallpaper via plasmarc:wallpaper
-Patch200: kdebase-workspace-4.0.3-plasma-default-wallpaper.patch
+Patch200: kdebase-workspace-4.0.72-plasma-default-wallpaper.patch
# http://websvn.kde.org/?view=rev&revision=791852
# from Plasma review board: http://mattr.info/r/261/
# allows moving plasmoids on panels (#439587, kde#158301)
-Patch201: kdebase-workspace-4.0.3-kde#158301.patch
-# http://websvn.kde.org/?view=rev&revision=794496
-# don't show "Zoom Out" toolbox action (not working in 4.0)
-Patch202: kdebase-workspace-4.0.3-rh#443610.patch
+# FIXME: Doesn't apply to 4.1, looks hard to port.
+# Hopefully this is being fixed properly for 4.1.
+#Patch201: kdebase-workspace-4.0.3-kde#158301.patch
# #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves"
#Â http://websvn.kde.org/?view=rev&revision=801651
Patch203: kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch
@@ -140,22 +128,19 @@
# ConsoleKit support for KDM (#228111, kde#147790)
%patch2 -p1 -b .consolekit
%patch3 -p1 -b .plasma-konsole
-%patch4 -p1 -b .onlyshowkde
+%patch4 -p1 -b .show-systemsettings
# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
%patch5 -p1 -b .ck-shutdown
-%patch6 -p0 -b .rootprivs
+%patch6 -p1 -b .rootprivs
%patch7 -p0 -b .timedate-kcm
%patch8 -p0 -b .krdb
-%patch9 -p1 -b .suspend
# upstream patches
-%patch101 -p1 -b .menu-switch
-%patch100 -p0 -b .kde#155362
# plasma-4.0-openSUSE patches:
-%patch200 -p0 -b .plasma-default-wallpaper
-%patch201 -p1 -b .kde#158301
-%patch202 -p1 -b .rh#443610
+%patch200 -p1 -b .plasma-default-wallpaper
+# FIXME/TODO: fails to apply
+#%patch201 -p1 -b .kde#158301
%patch203 -p0 -b .plasma-default-wallpaper-config
%build
@@ -245,7 +230,6 @@
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/wallpapers/*
%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/desktop-directories/*
%{_kde4_datadir}/autostart/*
%{_kde4_datadir}/applications/kde4/*
%{_datadir}/dbus-1/interfaces/*
@@ -275,6 +259,17 @@
%changelog
+* Wed May 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72
+- update file list (Lorenzo Villani)
+- port plasma-konsole, ck-shutdown, rootprivs, plasma-default-wallpaper patches
+- remove NoDisplay=true in systemsettings onlyshowkde patch (still add
+ OnlyShowIn=KDE), rename to show-systemsettings
+- drop upstreamed suspend patch
+- drop backported kde#155362 and menu-switch patches
+- drop rh#443610 patch, "Zoom Out" should be working in 4.1
+- disable kde#158301 patch for now (fails to apply, looks hard to port)
+
* Fri May 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-20
- Requires: kdebase , so it doesn't go missing on upgrades from kde3 (#444928)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 28 Mar 2008 16:59:46 -0000 1.10
+++ sources 7 May 2008 00:02:53 -0000 1.11
@@ -1 +1 @@
-11c339f329176a01ff2a8fce57025fe2 kdebase-workspace-4.0.3.tar.bz2
+afab232c830d056d720c2d6fa4d7e78e kdebase-workspace-4.0.72.tar.bz2
--- kdebase-workspace-4.0.2-onlyshowkde.patch DELETED ---
--- kdebase-workspace-4.0.2-plasma-konsole.patch DELETED ---
--- kdebase-workspace-4.0.3-ck-shutdown.patch DELETED ---
--- kdebase-workspace-4.0.3-kde#155362.patch DELETED ---
--- kdebase-workspace-4.0.3-menu-switch.patch DELETED ---
--- kdebase-workspace-4.0.3-plasma-default-wallpaper.patch DELETED ---
--- kdebase-workspace-4.0.3-rh#443610.patch DELETED ---
--- kdebase-workspace-4.0.3-rootprivs.patch DELETED ---
--- kdebase-workspace-4.0.3-suspend.patch DELETED ---
More information about the scm-commits
mailing list