rpms/kdebase-workspace/devel kdebase-workspace-4.3.75-brightness-keys.patch, NONE, 1.1 kdebase-workspace-4.3.75-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace-4.3.75-cmake-targets.patch, NONE, 1.1 kdebase-workspace-4.3.75-kio_sysinfo.patch, NONE, 1.1 kdebase-workspace-4.3.75-plasma-konsole.patch, NONE, 1.1 kdebase-workspace-4.3.75-redhat-startkde.patch, NONE, 1.1 kdebase-workspace-4.3.75-rootprivs.patch, NONE, 1.1 kdebase-workspace-4.3.75-show_systemsettings.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 kdebase-workspace.spec, 1.314, 1.315 sources, 1.49, 1.50 kdebase-workspace-4.2.0-kio_sysinfo.patch, 1.1, NONE kdebase-workspace-4.2.90-show_systemsettings.patch, 1.1, NONE kdebase-workspace-4.2.95-plasma-konsole.patch, 1.1, NONE kdebase-workspace-4.2.95-rootprivs.patch, 1.2, NONE kdebase-workspace-4.3.0-default_applets.patch, 1.1, NONE kdebase-workspace-4.3.1-classicmenu-logout.patch, 1.1, NONE kdebase-workspace-4.3.3-redhat-startkde.patch, 1.1, NONE kubuntu_101_brightness_fn_keys_and_osd.diff, 1.1, NONE
Ben Boeckel
mathstuf at fedoraproject.org
Tue Nov 24 16:34:32 UTC 2009
Author: mathstuf
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8528
Modified Files:
.cvsignore kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.3.75-brightness-keys.patch
kdebase-workspace-4.3.75-classicmenu-logout.patch
kdebase-workspace-4.3.75-cmake-targets.patch
kdebase-workspace-4.3.75-kio_sysinfo.patch
kdebase-workspace-4.3.75-plasma-konsole.patch
kdebase-workspace-4.3.75-redhat-startkde.patch
kdebase-workspace-4.3.75-rootprivs.patch
kdebase-workspace-4.3.75-show_systemsettings.patch
Removed Files:
kdebase-workspace-4.2.0-kio_sysinfo.patch
kdebase-workspace-4.2.90-show_systemsettings.patch
kdebase-workspace-4.2.95-plasma-konsole.patch
kdebase-workspace-4.2.95-rootprivs.patch
kdebase-workspace-4.3.0-default_applets.patch
kdebase-workspace-4.3.1-classicmenu-logout.patch
kdebase-workspace-4.3.3-redhat-startkde.patch
kubuntu_101_brightness_fn_keys_and_osd.diff
Log Message:
Update to 4.3.75
kdebase-workspace-4.3.75-brightness-keys.patch:
libs/solid/control/powermanager.cpp | 11 ++-
plasma/generic/applets/battery/battery.cpp | 74 ++++++++++++++++++++---
plasma/generic/applets/battery/battery.cpp.orig |only
plasma/generic/applets/battery/battery.cpp.rej |only
plasma/generic/applets/battery/battery.h | 10 ++-
plasma/generic/applets/battery/battery.h.orig |only
powerdevil/daemon/PowerDevilDaemon.cpp | 75 +++++++++++++++++++++---
powerdevil/daemon/PowerDevilDaemon.cpp.orig |only
powerdevil/daemon/PowerDevilDaemon.h | 6 +
powerdevil/daemon/PowerDevilDaemon.h.orig |only
powerdevil/daemon/org.kde.PowerDevil.xml | 8 ++
powerdevil/daemon/org.kde.PowerDevil.xml.orig |only
12 files changed, 161 insertions(+), 23 deletions(-)
--- NEW FILE kdebase-workspace-4.3.75-brightness-keys.patch ---
diff -r -U5 kdebase-workspace-4.3.75svn1048496/libs/solid/control/powermanager.cpp kdebase-workspace-4.3.75svn1048496.brightness-keys/libs/solid/control/powermanager.cpp
--- kdebase-workspace-4.3.75svn1048496/libs/solid/control/powermanager.cpp 2009-02-12 05:23:46.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/libs/solid/control/powermanager.cpp 2009-11-21 17:56:42.000000000 -0500
@@ -23,10 +23,12 @@
#include "soliddefs_p.h"
#include "managerbase_p.h"
#include "ifaces/powermanager.h"
#include <kdebug.h>
#include <kglobal.h>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
#include <QX11Info>
K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
Solid::Control::PowerManagerPrivate::PowerManagerPrivate()
@@ -158,22 +160,27 @@
if(controls.size() == 0)
{
#ifdef Q_WS_WIN
return false;
#else
- return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
+ if ( xrandr_brightlight( QX11Info::display(), brightness ) < 0 )
+ return false;
#endif
}
else
{
foreach(const QString &device, controls.keys())
{
SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(), setBrightness(brightness, device));
}
//TODO - This should be done better, it will return true even if one of the calls returns false. SOLID_CALL does not allow us to get the return value.
- return true;
}
+
+ QDBusConnection dbus(QDBusConnection::sessionBus());
+ QDBusInterface iface("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil", dbus);
+ iface.asyncCall("notifyOfBrightnessChange", (int) Solid::Control::PowerManager::brightness());
+ return true;
}
else
{
return_SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(),
false, setBrightness(brightness, device));
diff -r -U5 kdebase-workspace-4.3.75svn1048496/plasma/generic/applets/battery/battery.cpp kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery/battery.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/generic/applets/battery/battery.cpp 2009-11-13 05:57:50.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery/battery.cpp 2009-11-21 18:00:16.000000000 -0500
@@ -22,19 +22,23 @@
#include "battery.h"
#include <QApplication>
#include <QDBusConnection>
#include <QDBusInterface>
+#include <QDesktopWidget>
#include <QPainter>
+#include <QProgressBar>
#include <QStyleOptionGraphicsItem>
#include <QFont>
#include <QGraphicsSceneHoverEvent>
#include <QGraphicsGridLayout>
#include <QGraphicsLinearLayout>
#include <QDBusPendingCall>
#include <QLabel>
+#include <QTimer>
+#include <KApplication>
#include <KDebug>
#include <KIcon>
#include <KSharedConfig>
#include <KToolInvocation>
#include <KColorScheme>
@@ -92,11 +96,12 @@
m_batteryFadeIn(false),
m_isHovered(false),
m_firstRun(true),
m_numOfBattery(0),
m_acAdapterPlugged(false),
- m_remainingMSecs(0)
+ m_remainingMSecs(0),
+ m_brightnessDisplay(0)
{
//kDebug() << "Loading applet battery";
setAcceptsHoverEvents(true);
setPopupIcon(QIcon());
resize(128, 128);
@@ -310,10 +315,11 @@
Applet::hoverLeaveEvent(event);
}
Battery::~Battery()
{
+ delete m_brightnessDisplay;
}
void Battery::suspend()
{
hidePopup();
@@ -330,17 +336,21 @@
iface.asyncCall("suspend", Solid::Control::PowerManager::ToDisk);
}
void Battery::brightnessChanged(const int brightness)
{
- Solid::Control::PowerManager::setBrightness(brightness);
+ if (!m_ignoreBrightnessChange) {
+ Solid::Control::PowerManager::setBrightness(brightness);
+ }
}
-void Battery::updateSlider(const float brightness)
+void Battery::updateSlider(int brightness)
{
- if (m_brightnessSlider->value() != (int)brightness) {
- m_brightnessSlider->setValue((int) brightness);
+ if (m_brightnessSlider->value() != brightness) {
+ m_ignoreBrightnessChange = true;
+ m_brightnessSlider->setValue(brightness);
+ m_ignoreBrightnessChange = false;
}
}
void Battery::setFullBrightness()
{
@@ -361,10 +371,11 @@
// as the battery applet is also embedded into the battery's extender.
if (!m_isEmbedded && item->name() == "powermanagement") {
int row = 0;
int rowHeight = 20;
int columnWidth = 120;
+ m_ignoreBrightnessChange = false;
QGraphicsWidget *controls = new QGraphicsWidget(item);
controls->setMinimumWidth(360);
m_controlsLayout = new QGraphicsGridLayout(controls);
m_controlsLayout->setColumnStretchFactor(1, 3);
@@ -430,20 +441,16 @@
m_controlsLayout->addItem(brightnessLabel, row, 0);
m_brightnessSlider = new Plasma::Slider(controls);
m_brightnessSlider->setRange(0, 100);
- m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+ updateSlider(Solid::Control::PowerManager::brightness());
m_brightnessSlider->nativeWidget()->setTickInterval(10);
m_brightnessSlider->setOrientation(Qt::Horizontal);
connect(m_brightnessSlider, SIGNAL(valueChanged(int)),
this, SLOT(brightnessChanged(int)));
- Solid::Control::PowerManager::Notifier *notifier = Solid::Control::PowerManager::notifier();
-
- connect(notifier, SIGNAL(brightnessChanged(float)),
- this, SLOT(updateSlider(float)));
m_controlsLayout->addItem(m_brightnessSlider, row, 1);
row++;
m_profileLabel = new Plasma::Label(controls);
m_profileLabel->setText(i18n("Power Profile"));
@@ -512,10 +519,25 @@
m_controlsLayout->addItem(configButton, row, 1, Qt::AlignRight);
controls->setLayout(m_controlsLayout);
item->setWidget(controls);
item->setTitle(i18n("Power Management"));
+
+ m_brightnessDisplay = new QProgressBar();
+ m_brightnessDisplay->setWindowFlags(Qt::X11BypassWindowManagerHint);
+ QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+ //Getting QRect of the screen where cursor is positioned
+ QRect rect = desktop->screenGeometry(QCursor::pos());
+ int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+ int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+ width += rect.x();
+ height += rect.y();
+ m_brightnessDisplay->move(width, height);
+ m_brightnessDisplayTimer = new QTimer(this);
+ connect(m_brightnessDisplayTimer, SIGNAL(timeout()), this, SLOT(hideOSD()));
+ QDBusConnection::sessionBus().connect("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil",
+ "brightnessChanged", this, SLOT(showBrightnessOSD(int,bool)));
}
}
void Battery::popupEvent(bool show)
{
@@ -620,11 +642,11 @@
m_profileLabel->show();
}
}
if (m_brightnessSlider) {
- m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+ updateSlider(Solid::Control::PowerManager::brightness());
//kDebug() << "Updating brightness:" << Solid::Control::PowerManager::brightness();
}
//kDebug() << "SIZE LABEL" << m_batteryLabel->size() << m_batteryLabel->preferredSize() << m_batteryLabel->preferredSize();
//m_controlsLayout->setColumnMinimumWidth(1,280);
//m_batteryLayout->setColumnMinimumWidth(0,200);
@@ -1036,6 +1058,36 @@
if (source == "PowerDevil") {
dataEngine("powermanagement")->disconnectSource(source, this);
}
}
+void Battery::showBrightnessOSD(int brightness, bool byFnKey)
+{
+ if (byFnKey) {
+ m_brightnessDisplay->setValue(brightness);
+ m_brightnessDisplay->show();
+
+ //FIXME, how to get this to work before it is displayed for the first time?
+ QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+ //Getting QRect of the screen where cursor is positioned
+ QRect rect = desktop->screenGeometry(QCursor::pos());
+ int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+ int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+ width += rect.x();
+ height += rect.y();
+ m_brightnessDisplay->move(width, height);
+
+ m_brightnessDisplayTimer->setInterval(2000);
+ m_brightnessDisplayTimer->start();
+
+ if (m_extenderVisible && m_brightnessSlider) {
+ updateSlider(brightness);
+ }
+ }
+}
+
+void Battery::hideOSD()
+{
+ m_brightnessDisplay->hide();
+}
+
#include "battery.moc"
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery: battery.cpp.orig
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery: battery.cpp.rej
diff -r -U5 kdebase-workspace-4.3.75svn1048496/plasma/generic/applets/battery/battery.h kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery/battery.h
--- kdebase-workspace-4.3.75svn1048496/plasma/generic/applets/battery/battery.h 2009-11-13 05:57:50.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery/battery.h 2009-11-21 17:57:10.000000000 -0500
@@ -36,10 +36,12 @@
class ExtenderItem;
class ComboBox;
class Slider;
}
+class QProgressBar;
+
class Battery : public Plasma::PopupApplet
{
Q_OBJECT
public:
Battery(QObject *parent, const QVariantList &args);
@@ -72,16 +74,18 @@
void acAnimationUpdate(qreal progress);
void batteryAnimationUpdate(qreal progress);
void sourceAdded(const QString &source);
void sourceRemoved(const QString &source);
void brightnessChanged(const int brightness);
- void updateSlider(const float brightness);
+ void updateSlider(int brightness);
void setFullBrightness();
void openConfig();
void setProfile(const QString &profile);
void suspend();
void hibernate();
+ void showBrightnessOSD(int brightness, bool byFnKey);
+ void hideOSD();
private:
void connectSources();
void initExtenderItem(Plasma::ExtenderItem *item);
void updateStatus();
@@ -161,10 +165,14 @@
int m_boxAlpha;
int m_boxHoverAlpha;
int m_numOfBattery;
bool m_acAdapterPlugged;
int m_remainingMSecs;
+
+ bool m_ignoreBrightnessChange;
+ QProgressBar* m_brightnessDisplay;
+ QTimer* m_brightnessDisplayTimer;
};
K_EXPORT_PLASMA_APPLET(battery, Battery)
#endif
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/plasma/generic/applets/battery: battery.h.orig
diff -r -U5 kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/org.kde.PowerDevil.xml kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/org.kde.PowerDevil.xml
--- kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/org.kde.PowerDevil.xml 2009-09-04 07:30:55.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/org.kde.PowerDevil.xml 2009-11-21 17:57:10.000000000 -0500
@@ -40,10 +40,14 @@
</method>
<method name="getSupportedSchemes">
<arg type="as" direction="out" />
</method>
+ <method name="notifyOfBrightnessChange">
+ <arg type="i" direction="in" />
+ </method>
+
<signal name="lidClosed">
<arg type="i" direction="out" />
<arg type="s" direction="out" />
</signal>
<signal name="stateChanged">
@@ -54,7 +58,11 @@
<arg type="s" direction="out" />
<arg type="as" direction="out" />
</signal>
<signal name="DPMSconfigUpdated">
</signal>
+ <signal name="brightnessChanged">
+ <arg type="i" direction="out" />
+ <arg type="b" direction="out" />
+ </signal>
</interface>
</node>
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon: org.kde.PowerDevil.xml.orig
diff -r -U5 kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/PowerDevilDaemon.cpp kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/PowerDevilDaemon.cpp
--- kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/PowerDevilDaemon.cpp 2009-09-23 15:21:36.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/PowerDevilDaemon.cpp 2009-11-21 17:57:10.000000000 -0500
@@ -24,10 +24,12 @@
#include "PowerDevilDaemon.h"
#include <kdemacros.h>
#include <KAboutData>
+#include <KAction>
+#include <KActionCollection>
#include <KPluginFactory>
#include <KNotification>
#include <KIcon>
#include <KMessageBox>
#include <kpluginfactory.h>
@@ -91,10 +93,11 @@
explicit Private()
: notifier(Solid::Control::PowerManager::notifier())
, battery(0)
, currentConfig(0)
, status(PowerDevilDaemon::NoAction)
+ , brightnessInHardware(false)
, ckSessionInterface(0) {}
Solid::Control::PowerManager::Notifier *notifier;
QPointer<Solid::Battery> battery;
@@ -117,11 +120,13 @@
PowerDevilDaemon::IdleStatus status;
int batteryPercent;
int brightness;
+ int cachedBrightness;
bool isPlugged;
+ bool brightnessInHardware;
// ConsoleKit stuff
QDBusInterface *ckSessionInterface;
bool ckAvailable;
};
@@ -172,10 +177,22 @@
"/ScreenSaver",
QDBusConnection::sessionBus(), this);
d->ksmServerIface = new OrgKdeKSMServerInterfaceInterface("org.kde.ksmserver", "/KSMServer",
QDBusConnection::sessionBus(), this);
+ QDBusInterface halManager("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal.Manager",
+ QDBusConnection::systemBus());
+ QStringList panelDevices = halManager.call("FindDeviceByCapability",
+ "laptop_panel").arguments().at(0).toStringList();
+ if (!panelDevices.empty()) {
+ QDBusInterface deviceInterface("org.freedesktop.Hal", panelDevices.at(0), "org.freedesktop.Hal.Device",
+ QDBusConnection::systemBus());
+ d->brightnessInHardware = deviceInterface.call("GetPropertyBoolean",
+ "laptop_panel.brightness_in_hardware").arguments().at(0).toBool();
+ }
+
/* Not needed anymore; I am not sure if we will need that in a future, so I leave it here
* just in case.
*
* d->kscreenSaverIface = new OrgKdeScreensaverInterface("org.freedesktop.ScreenSaver", "/ScreenSaver",
* QDBusConnection::sessionBus(), this);
@@ -196,10 +213,21 @@
conn.interface()->registerService("org.freedesktop.Policy.Power");
QDBusConnection::sessionBus().registerService("org.kde.powerdevil");
// All systems up Houston, let's go!
refreshStatus();
+
+ d->cachedBrightness = (int) Solid::Control::PowerManager::brightness();
+ KActionCollection* actionCollection = new KActionCollection( this );
+
+ KAction* globalAction = static_cast< KAction* >( actionCollection->addAction( "Increase Screen Brightness" ));
+ globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
+ connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
+
+ globalAction = static_cast< KAction* >( actionCollection->addAction( "Decrease Screen Brightness" ));
+ globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
+ connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
}
PowerDevilDaemon::~PowerDevilDaemon()
{
delete d->ckSessionInterface;
@@ -640,28 +668,44 @@
break;
}
}
}
-void PowerDevilDaemon::decreaseBrightness()
+void PowerDevilDaemon::incDecBrightness(bool increase)
{
if (!checkIfCurrentSessionActive()) {
return;
}
- int currentBrightness = qMax(0, (int)(Solid::Control::PowerManager::brightness() - 10));
- Solid::Control::PowerManager::setBrightness(currentBrightness);
+ int currentBrightness = (int) Solid::Control::PowerManager::brightness();
+ if ((currentBrightness == d->cachedBrightness) && !d->brightnessInHardware)
+ {
+ int newBrightness;
+ if (increase) {
+ newBrightness = qMin(100, currentBrightness + 10);
+ }
+ else {
+ newBrightness = qMax(0, currentBrightness - 10);
+ }
+
+ Solid::Control::PowerManager::setBrightness(newBrightness);
+ currentBrightness = (int) Solid::Control::PowerManager::brightness();
+ }
+
+ if (!d->brightnessInHardware) {
+ emitBrightnessChanged(currentBrightness, true);
+ }
}
-void PowerDevilDaemon::increaseBrightness()
+void PowerDevilDaemon::decreaseBrightness()
{
- if (!checkIfCurrentSessionActive()) {
- return;
- }
+ incDecBrightness(false);
+}
- int currentBrightness = qMin(100, (int)(Solid::Control::PowerManager::brightness() + 10));
- Solid::Control::PowerManager::setBrightness(currentBrightness);
+void PowerDevilDaemon::increaseBrightness()
+{
+ incDecBrightness(true);
}
void PowerDevilDaemon::shutdownNotification(bool automated)
{
if (!checkIfCurrentSessionActive()) {
@@ -1441,6 +1485,19 @@
QDBusConnection::systemBus().connect("org.freedesktop.ConsoleKit", sessionPath.value().path(),
"org.freedesktop.ConsoleKit.Session", "ActiveChanged", this,
SLOT(refreshStatus()));
}
+void PowerDevilDaemon::notifyOfBrightnessChange(int brightness)
+{
+ emitBrightnessChanged(brightness, false);
+}
+
+void PowerDevilDaemon::emitBrightnessChanged(int brightness, bool byFnKey)
+{
+ if ((d->cachedBrightness != brightness) || byFnKey) {
+ d->cachedBrightness = brightness;
+ emit brightnessChanged(brightness, byFnKey);
+ }
+}
+
#include "PowerDevilDaemon.moc"
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon: PowerDevilDaemon.cpp.orig
diff -r -U5 kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/PowerDevilDaemon.h kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/PowerDevilDaemon.h
--- kdebase-workspace-4.3.75svn1048496/powerdevil/daemon/PowerDevilDaemon.h 2009-09-23 15:21:36.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon/PowerDevilDaemon.h 2009-11-21 17:57:10.000000000 -0500
@@ -60,14 +60,17 @@
QStringList getSupportedSchemes();
QVariantMap getSupportedSuspendMethods();
SuspensionLockHandler *lockHandler();
+ void notifyOfBrightnessChange(int brightness);
+
private Q_SLOTS:
void acAdapterStateChanged(int state, bool forced = false);
void batteryChargePercentChanged(int percent, const QString &udi);
+ void incDecBrightness(bool increase);
void decreaseBrightness();
void increaseBrightness();
void shutdown(bool automated = false);
void shutdownDialog();
@@ -105,10 +108,11 @@
void errorTriggered(const QString &error);
void stateChanged(int, bool);
void profileChanged(const QString &, const QStringList &);
void DPMSconfigUpdated();
+ void brightnessChanged(int brightness, bool byFnKey);
private:
void lockScreen();
void setUpDPMS();
@@ -126,10 +130,12 @@
void setUpConsoleKit();
bool checkIfCurrentSessionActive();
+ void emitBrightnessChanged(int brightness, bool byFnKey);
+
public:
enum IdleAction {
None = 0,
Standby = 1,
S2Ram = 2,
Only in kdebase-workspace-4.3.75svn1048496.brightness-keys/powerdevil/daemon: PowerDevilDaemon.h.orig
kdebase-workspace-4.3.75-classicmenu-logout.patch:
core/itemhandlers.cpp | 7 ++++++-
simpleapplet/simpleapplet.cpp | 2 ++
simpleapplet/simpleapplet.h | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE kdebase-workspace-4.3.75-classicmenu-logout.patch ---
diff -r -U5 kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2009-09-16 07:40:52.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2009-11-21 17:46:56.000000000 -0500
@@ -107,11 +107,12 @@
} else if (m_logoutAction == "switch") {
// decouple dbus call, otherwise we'll run into a dead-lock
QTimer::singleShot(0, this, SLOT(switchUser()));
return true;
} else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
- m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+ m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+ m_logoutAction == "leave") {
// decouple dbus call, otherwise we'll run into a dead-lock
QTimer::singleShot(0, this, SLOT(logout()));
return true;
} else if (m_logoutAction == "savesession") {
// decouple dbus call, otherwise we'll run into a dead-lock
@@ -158,10 +159,14 @@
kDebug() << "Switching user";
} else if (m_logoutAction == "restart") {
type = KWorkSpace::ShutdownTypeReboot;
} else if (m_logoutAction == "shutdown") {
type = KWorkSpace::ShutdownTypeHalt;
+ } else if (m_logoutAction == "leave") {
+ // This one brings up the dialog, for use in the classic menu.
+ confirm = KWorkSpace::ShutdownConfirmYes;
+ type = KWorkSpace::ShutdownTypeDefault;
}
//FIXME: the proper fix is to implement the KWorkSpace methods for Windows
#ifndef Q_WS_WIN
KWorkSpace::requestShutDown(confirm, type);
diff -r -U5 kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2009-10-26 05:14:50.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2009-11-21 17:47:08.000000000 -0500
@@ -200,10 +200,11 @@
case SuspendRAM: return i18n("Sleep");
case Restart: return i18nc("Restart Computer", "Restart");
case Shutdown: return i18n("Shutdown");
case Logout: return i18n("Logout");
case Leave: return i18n("Leave");
+ case LeaveDialog: return i18n("Leave...");
}
return QString();
}
QString viewIcon(MenuLauncherApplet::ViewType vt) const {
@@ -225,10 +226,11 @@
case SuspendRAM: return "system-suspend-hibernate";
case Restart: return "system-reboot";
case Shutdown: return "system-shutdown";
case Logout: return "system-log-out";
case Leave: return "system-shutdown";
+ case LeaveDialog: return "system-shutdown";
}
return QString();
}
MenuLauncherApplet::ViewType viewType(const QByteArray& type) const {
diff -r -U5 kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2009-09-16 07:40:52.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2009-11-21 17:47:19.000000000 -0500
@@ -57,11 +57,12 @@
SuspendDisk, ///< Suspend to Disk Action
SuspendRAM, ///< Suspend to RAM Action
Restart, ///< Restart Action
Shutdown, ///< Shutdown Action
Logout, ///< Logout Action
- Leave ///< Leave Menu
+ Leave, ///< Leave Menu
+ LeaveDialog ///< Leave Dialog Action
};
/**
* How the text of the menuitems got formatted.
*/
kdebase-workspace-4.3.75-cmake-targets.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdebase-workspace-4.3.75-cmake-targets.patch ---
diff -r -U5 kdebase-workspace-4.3.75svn1048496/CMakeLists.txt kdebase-workspace-4.3.75svn1048496.cmake-targets/CMakeLists.txt
--- kdebase-workspace-4.3.75svn1048496/CMakeLists.txt 2009-11-13 05:57:52.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.cmake-targets/CMakeLists.txt 2009-11-21 22:42:23.000000000 -0500
@@ -1,11 +1,11 @@
project(KDEBASE_WORKSPACE)
# Used e.g. in KDE4WorkspaceConfig.cmake, Alex
set(KDE4WORKSPACE_VERSION_MAJOR 4)
set(KDE4WORKSPACE_VERSION_MINOR 3)
-set(KDE4WORKSPACE_VERSION_PATCH 61)
+set(KDE4WORKSPACE_VERSION_PATCH 75)
set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} )
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
kdebase-workspace-4.3.75-kio_sysinfo.patch:
models.cpp | 2 ++
systemmodel.cpp | 37 ++++++++++++++++++++++++++-----------
2 files changed, 28 insertions(+), 11 deletions(-)
--- NEW FILE kdebase-workspace-4.3.75-kio_sysinfo.patch ---
diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/models.cpp kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/models.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/models.cpp 2009-10-15 12:33:38.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/models.cpp 2009-11-21 15:24:44.000000000 -0500
@@ -176,10 +176,12 @@
QStringList Kickoff::systemApplicationList()
{
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
QStringList apps;
apps << "systemsettings";
+ if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
+ apps << "/usr/share/kde4/services/sysinfo.protocol";
apps = appsGroup.readEntry("DesktopFiles", apps);
return apps;
}
#if 0
diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/systemmodel.cpp kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/systemmodel.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/systemmodel.cpp 2009-11-13 05:57:47.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/systemmodel.cpp 2009-11-21 15:25:04.000000000 -0500
@@ -244,21 +244,36 @@
}
}
KService::Ptr service = d->appsList[index.row()];
- switch (role) {
- case Qt::DisplayRole:
- return service->name();
- case Qt::DecorationRole:
- return KIcon(service->icon());
- case SubTitleRole:
- return service->genericName();
- case UrlRole:
- return service->entryPath();
- default:
- return QVariant();
+ if (service->name()=="sysinfo") {
+ switch(role) {
+ case Qt::DisplayRole:
+ return i18n("System Information");
+ case Qt::DecorationRole:
+ return KIcon("hwinfo");
+ case SubTitleRole:
+ return "sysinfo:/";
+ case UrlRole:
+ return "sysinfo:/";
+ default:
+ return QVariant();
+ }
+ } else {
+ switch (role) {
+ case Qt::DisplayRole:
+ return service->name();
+ case Qt::DecorationRole:
+ return KIcon(service->icon());
+ case SubTitleRole:
+ return service->genericName();
+ case UrlRole:
+ return service->entryPath();
+ default:
+ return QVariant();
+ }
}
}
if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) {
QModelIndex parent = index.parent();
kdebase-workspace-4.3.75-plasma-konsole.patch:
desktop.cpp | 13 +++++++++++++
desktop.h | 2 ++
2 files changed, 15 insertions(+)
--- NEW FILE kdebase-workspace-4.3.75-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp.plasma-konsole 2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp 2009-06-26 12:00:49.000000000 +0200
@@ -41,6 +41,7 @@
#include <KRun>
#include <KStandardDirs>
#include <KWindowSystem>
+#include <ktoolinvocation.h>
#include <Plasma/Corona>
#include <Plasma/Animator>
@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
m_runCommandAction(0),
m_lockScreenAction(0),
m_logoutAction(0),
+ m_runKonsoleAction(0),
dropping(false)
{
qRegisterMetaType<QImage>("QImage");
@@ -203,6 +205,11 @@ void DefaultDesktop::runCommand()
krunner.display();
}
+void DefaultDesktop::runKonsole()
+{
+ KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
void DefaultDesktop::lockScreen()
{
if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -253,6 +260,10 @@ QList<QAction*> DefaultDesktop::contextu
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);
m_runCommandAction->setIcon(KIcon("system-run"));
connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
QList<QAction*> actions;
+ actions.append(m_runKonsoleAction);
+
if (KAuthorized::authorizeKAction("run_command")) {
actions.append(m_runCommandAction);
}
diff -up kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h
--- kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h.plasma-konsole 2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h 2009-06-26 11:49:24.000000000 +0200
@@ -70,6 +70,7 @@ protected:
void dropEvent(QGraphicsSceneDragDropEvent *event);
protected Q_SLOTS:
+ void runKonsole();
void runCommand();
void lockScreen();
@@ -89,6 +90,7 @@ private:
QAction *m_lockDesktopAction;
QAction *m_appletBrowserAction;
QAction *m_addPanelAction;
+ QAction *m_runKonsoleAction;
QAction *m_runCommandAction;
QAction *m_setupDesktopAction;
QAction *m_lockScreenAction;
kdebase-workspace-4.3.75-redhat-startkde.patch:
startkde.cmake | 63 ++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 20 deletions(-)
--- NEW FILE kdebase-workspace-4.3.75-redhat-startkde.patch ---
diff -U5 -r kdebase-workspace-4.3.75svn1048496/startkde.cmake kdebase-workspace-4.3.75svn1048496.redhat-startkde/startkde.cmake
--- kdebase-workspace-4.3.75svn1048496/startkde.cmake 2009-10-06 17:37:24.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.redhat-startkde/startkde.cmake 2009-11-21 03:56:23.000000000 -0500
@@ -23,16 +23,16 @@
elif test $kcheckrunning_result -eq 2 ; then
echo "\$DISPLAY is not set or cannot connect to the X server."
exit 1
fi
-# Set the background to plain grey.
+# Set the background to the Red Hat default.
# The standard X background is nasty, causing moire effects and exploding
# people's heads. We use colours from the standard KDE palette for those with
# palettised displays.
if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
- xsetroot -solid "#000000"
+ xsetroot -solid "#103D77"
fi
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE
@@ -50,26 +50,10 @@
perl -e "$ver_script" $glibc_version >/dev/null 2>&1 && MALLOC_CHECK_=3
export MALLOC_CHECK_
fi
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
- qbindir=`$bindir/kde4-config --qt-binaries`
- if [ -n "$qbindir" ]; then
- case $PATH in
- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
- *) PATH=$qbindir:$PATH; export PATH;;
- esac
- fi
- case $PATH in
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
- *) PATH=$bindir:$PATH; export PATH;;
- esac
-fi
-
# Boot sequence:
#
# kdeinit is used to fork off processes which improves memory usage
# and startup time.
#
@@ -86,10 +70,39 @@
# may be overridden by setting KDEHOME.
kdehome=$HOME/@KDE_DEFAULT_HOME@
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+# Read LANG and write the country part to kdeglobals
+# de_AT.UTF-8 => Country=at
+# This is necessary because klocale.cpp (kdelibs) does only try to read the value
+# from kdeglobals and then falls back to default instead of triyng to detect it
+
+if [ ! -e $kdehome/share/config/kdeglobals ] || [ ! `grep "Country=" $kdehome/share/config/kdeglobals` ]; then
+ if [ ! $LANG ]; then
+ if [ -e /etc/default/locale ]; then
+ localefile='/etc/default/locale'
+ elif [ -e /etc/environment ]; then
+ localefile='/etc/environment'
+ fi
+ if [ $localefile ]; then
+ locale=`sed -ne 's/^LANG="\(.*\)"$/\1/p' $localefile`
+ fi
+ else
+ locale=$LANG
+ fi
+ if [ $locale ]; then
+ country=`echo $locale | sed -ne 's/^[A-Za-z]*_\([A-Za-z]*\).*$/\1/p'|tr 'A-Z' 'a-z'`
+ if [ ! $country = "" ]; then
+cat >>$kdehome/share/config/kdeglobals <<EOF
+[Locale]
+Country=$country
+EOF
+ fi
+ fi
+fi
+
# see kstartupconfig source for usage
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
mkdir -m 700 -p $kdehome/share/config
cat >$kdehome/share/config/startupconfigkeys <<EOF
@@ -102,11 +115,19 @@
kcmrandrrc [Screen1]
kcmrandrrc [Screen2]
kcmrandrrc [Screen3]
kcmfonts General forceFontDPI 0
kdeglobals Locale Language '' # trigger requesting languages from KLocale
+kdeglobals Locale Country ''
EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+ then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+ if [ -n "$Theme" ]
+ then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+ fi
+fi
kstartupconfig4
returncode=$?
if test $returncode -ne 0; then
xmessage -geometry 500x100 "kstartupconfig4 does not exist or fails. The error code is $returncode. Check your installation."
exit 1
@@ -223,12 +244,13 @@
# (see end of this file).
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
for file in "$prefix"*.sh; do
test -r "$file" && . "$file"
done
done
@@ -437,11 +459,12 @@
kde3 dcopserver_shutdown --wait 2>/dev/null
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
done
done
kdebase-workspace-4.3.75-rootprivs.patch:
ModuleView.cpp | 27 +++++++++++++++++++++++++++
ModuleView.cpp.orig |only
ModuleView.cpp.rej |only
3 files changed, 27 insertions(+)
--- NEW FILE kdebase-workspace-4.3.75-rootprivs.patch ---
diff -U5 -r kdebase-workspace-4.3.75svn1048496/systemsettings/core/ModuleView.cpp kdebase-workspace-4.3.75svn1048496.rootprivs/systemsettings/core/ModuleView.cpp
--- kdebase-workspace-4.3.75svn1048496/systemsettings/core/ModuleView.cpp 2009-10-26 05:14:41.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.rootprivs/systemsettings/core/ModuleView.cpp 2009-11-21 06:07:10.000000000 -0500
@@ -38,10 +38,11 @@
#include <KMessageBox>
#include <KCModuleInfo>
#include <KCModuleProxy>
#include <KStandardGuiItem>
#include <KDialogButtonBox>
+#include <KStandardDirs>
#include <kauthaction.h>
#include "MenuItem.h"
class ModuleView::Private {
@@ -122,10 +123,36 @@
{
if ( !menuItem ) {
return;
}
+ if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
+ QString kdesu = KStandardDirs::findExe( "kdesu" );
+ QString cmd = menuItem->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 << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
+
+ kDebug() << "Starting root module: " << args;
+ QProcess::startDetached( kdesu, args );
+
+ return;
+ }
+
QList<KCModuleInfo*> modules;
if ( menuItem->children().empty() ) {
modules << &menuItem->item();
} else {
foreach ( MenuItem *child, menuItem->children() ) {
Only in kdebase-workspace-4.3.75svn1048496.rootprivs/systemsettings/core: ModuleView.cpp.orig
Only in kdebase-workspace-4.3.75svn1048496.rootprivs/systemsettings/core: ModuleView.cpp.rej
kdebase-workspace-4.3.75-show_systemsettings.patch:
plasma/desktop/applets/kickoff/core/applicationmodel.cpp | 1 -
systemsettings/app/systemsettings.desktop | 1 +
systemsettings/app/systemsettings.desktop.orig |only
3 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdebase-workspace-4.3.75-show_systemsettings.patch ---
diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/applicationmodel.cpp kdebase-workspace-4.3.75svn1048496.show_systemsettings/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2009-11-13 05:57:47.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.show_systemsettings/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2009-11-21 04:55:21.000000000 -0500
@@ -109,11 +109,10 @@
systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
primaryNamePolicy(ApplicationModel::GenericNamePrimary),
displayOrder(NameAfterDescription),
allowSeparators(_allowSeparators)
{
- systemApplications = Kickoff::systemApplicationList();
}
~ApplicationModelPrivate()
{
delete root;
diff -U5 -r kdebase-workspace-4.3.75svn1048496/systemsettings/app/systemsettings.desktop kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.3.75svn1048496/systemsettings/app/systemsettings.desktop 2009-09-23 15:21:33.000000000 -0400
+++ kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app/systemsettings.desktop 2009-11-21 04:55:21.000000000 -0500
@@ -161,5 +161,6 @@
Name[zh_CN]=系统设置
Name[zh_TW]=系統設定
X-DBUS-StartupType=Unique
Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;
Only in kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app: systemsettings.desktop.orig
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore 31 Oct 2009 14:27:17 -0000 1.41
+++ .cvsignore 24 Nov 2009 16:34:31 -0000 1.42
@@ -1 +1 @@
-kdebase-workspace-4.3.3.tar.bz2
+kdebase-workspace-4.3.75svn1048496.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- kdebase-workspace.spec 18 Nov 2009 18:51:13 -0000 1.314
+++ kdebase-workspace.spec 24 Nov 2009 16:34:32 -0000 1.315
@@ -1,3 +1,4 @@
+%define alphatag svn1048496
%if 0%{?fedora} && 0%{?fedora} < 12
%define with_polkit_09 1
@@ -7,41 +8,46 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
-Version: 4.3.3
-Release: 8%{?dist}
+Version: 4.3.75
+Release: 0.1.%{alphatag}%{?dist}
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}%{?alphatag}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kdebase-workspace-4.3.3-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
+Patch1: kdebase-workspace-4.3.75-redhat-startkde.patch
+# TODO: Disable for now, may be do-able in kde-settings now
+#Patch2: kdebase-workspace-4.3.75-plasma-konsole.patch
+Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
# 441062: packagekit tools do not show icons correctly on KDE
Patch7: kdebase-workspace-4.0.3-krdb.patch
Patch8: kdebase-workspace-4.2.85-klipper-url.patch
# 434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch9: kdebase-workspace-4.2.95-rootprivs.patch
+Patch9: kdebase-workspace-4.3.75-rootprivs.patch
Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.3.0-default_applets.patch
Patch13: kdebase-workspace-4.2.0-pykde4.patch
Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
-Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
-Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
+# FIXME: The code this patches is commented out
+#Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
# allow adding a "Leave..." button which brings up the complete shutdown dialog
# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
# default Leave submenu
-Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
+# Fix the version
+Patch18: kdebase-workspace-4.3.75-cmake-targets.patch
# upstream patches:
# "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
Patch50: kdebase-workspace-4.3.3-kde#171685.patch
# kubuntu working to upstream this
-Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
+# FIXME: Not upstreamed yet --Ben (4.3.75)
+#Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
+Patch51: kdebase-workspace-4.3.75-brightness-keys.patch
# 4.3 branch
# trunk
@@ -257,11 +263,11 @@ Requires: akonadi
%prep
-%setup -q
+%setup -q -n kdebase-workspace-%{version}%{?alphatag}
# RH/Fedora-specific startkde changes
%patch1 -p1 -b .redhat-startkde
-%patch2 -p1 -b .plasma-konsole
+#patch2 -p1 -b .plasma-konsole
%patch3 -p1 -b .show_systemsettings
# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
%patch4 -p1 -b .ck-shutdown
@@ -269,12 +275,12 @@ Requires: akonadi
%patch8 -p1 -b .klipper-url
%patch9 -p1 -b .rootprivs
%patch11 -p1 -b .font
-%patch12 -p1 -b .default_applets
%patch13 -p1 -b .pykde4
# kio_sysinfo based on OpenSUSE's patch
%patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .showremainingtime
+#patch16 -p1 -b .showremainingtime
%patch17 -p1 -b .classicmenu-logout
+%patch18 -p1 -b .cmake-targets
# upstream patches
%patch50 -p1 -b .kde#171685
@@ -366,8 +372,6 @@ fi
%{_kde4_bindir}/kcminit
%{_kde4_bindir}/kcminit_startup
%{_kde4_bindir}/kdostartupconfig4
-%{_kde4_bindir}/kfontinst
-%{_kde4_bindir}/kfontview
%{_kde4_bindir}/klipper
%{_kde4_bindir}/kmenuedit
%{_kde4_bindir}/krandom.kss
@@ -384,12 +388,12 @@ fi
%{_kde4_bindir}/kwin*
%{_kde4_bindir}/kxkb
%{_kde4_bindir}/plasma-desktop
+%{_kde4_bindir}/plasma-netbook
%{_kde4_bindir}/plasma-overlay
%{_kde4_bindir}/plasmaengineexplorer
%{_kde4_bindir}/plasmoidviewer
%{_kde4_bindir}/plasmawallpaperviewer
%{_kde4_bindir}/safestartkde
-%{_kde4_bindir}/setscheduler
%{_kde4_bindir}/solid-action-desktop-gen
%{_kde4_bindir}/solid-bluetooth
%{_kde4_bindir}/solid-network
@@ -397,32 +401,35 @@ fi
%{_kde4_bindir}/startkde
%{_kde4_bindir}/systemsettings
+%{_kde4_appsdir}/aurorae/
%{_kde4_appsdir}/color-schemes/
%{_kde4_appsdir}/desktoptheme/
%{_kde4_appsdir}/kaccess/
+%{_kde4_appsdir}/katepart/syntax/plasma-desktop-js.xml
%{_kde4_appsdir}/kcminput/
%{_kde4_appsdir}/kcmkeys/
%{_kde4_appsdir}/kcmsolidactions/
%{_kde4_appsdir}/kconf_update/
%{_kde4_appsdir}/kcontrol/
%{_kde4_appsdir}/kdisplay/
-%{_kde4_appsdir}/kfontinst/
-%{_kde4_appsdir}/kfontview/
%{_kde4_appsdir}/khotkeys/
%{_kde4_appsdir}/kmenuedit/
-%{_kde4_appsdir}/konqsidebartng/
+%{_kde4_appsdir}/kscreenlocker/
%{_kde4_appsdir}/ksplash/
%{_kde4_appsdir}/ksysguard/
%{_kde4_appsdir}/kthememanager/
%{_kde4_appsdir}/kwin/
%{_kde4_appsdir}/kwrited/
%{_kde4_appsdir}/plasma/
+%{_kde4_appsdir}/plasma-desktop/
+%{_kde4_appsdir}/plasma-netbook/
%{_kde4_appsdir}/plasma_scriptengine_ruby/
%{_kde4_appsdir}/powerdevil/
%{_kde4_appsdir}/solid/
%{_kde4_appsdir}/solidfakenetbackend/
%{_kde4_appsdir}/systemsettings/
+%{_kde4_configdir}/aurorae.knsrc
%{_kde4_configdir}/background.knsrc
%{_kde4_configdir}/colorschemes.knsrc
%{_kde4_configdir}/ksplash.knsrc
@@ -440,8 +447,10 @@ fi
%{_kde4_datadir}/autostart/plasma.desktop
%{_kde4_datadir}/autostart/plasma-desktop.desktop
%{_kde4_datadir}/applications/kde4/*
+%{_sysconfdir}/dbus-1/system.d/*.conf
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/dbus-1/services/*.service
+%{_datadir}/dbus-1/system-services/*.service
%{_kde4_datadir}/config.kcfg/*
%{_datadir}/xsessions/*.desktop
%{_kde4_docdir}/HTML/en/kcontrol/
@@ -454,19 +463,17 @@ fi
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_libdir}/kde4/classic_mode.so
-%{_kde4_libdir}/kde4/fontthumbnail.so
%{_kde4_libdir}/kde4/icon_mode.so
%{_kde4_libdir}/kde4/ion_*.so
%{_kde4_libdir}/kde4/kcm_*.so
%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
%{_kde4_libdir}/kde4/kded_*.so
-%{_kde4_libdir}/kde4/kfontviewpart.so
-%{_kde4_libdir}/kde4/kio_fonts.so
%{_kde4_libdir}/kde4/krunner_*.so
%{_kde4_libdir}/kde4/kstyle_keramik_config.so
%{_kde4_libdir}/kde4/kwin*_*.so
%{_kde4_libdir}/kde4/plasma_animator_default.so
%{_kde4_libdir}/kde4/plasma_applet_*.so
+%{_kde4_libdir}/kde4/plasma_containmentactions_*.so
%if 0%{?fedora}
%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
@@ -481,12 +488,10 @@ fi
%{_kde4_libdir}/kde4/solid_*.so
%{_kde4_libexecdir}/kcheckpass
%{_kde4_libexecdir}/kcmdatetimehelper
-%{_kde4_libexecdir}/kfontprint
-%{_kde4_libexecdir}/kio_fonts_helper
%{_kde4_libexecdir}/krootimage
%{_kde4_libexecdir}/kscreenlocker
+%{_kde4_libexecdir}/ksysguardprocesslist_helper
%{_kde4_libexecdir}/test_kcm_xinerama
-%{_libdir}/strigi/
%{_kde4_libdir}/libkdeinit*.so
%{_kde4_libdir}/libkickoff.so
%{_kde4_libdir}/libsystemsettingsview.so
@@ -614,6 +619,9 @@ fi
%changelog
+* Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
+
* Wed Nov 18 2009 Lukáš Tinkl <ltinkl at redhat.com> 4.3.3-8
- correctly try to deduce LANG (kubuntu_13_startkde_set_country.diff)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources 31 Oct 2009 14:27:17 -0000 1.49
+++ sources 24 Nov 2009 16:34:32 -0000 1.50
@@ -1 +1 @@
-0af67c6ee6385cc86f694bc8e1675ddb kdebase-workspace-4.3.3.tar.bz2
+6086e8256f7e57e105eae4439e9c5045 kdebase-workspace-4.3.75svn1048496.tar.bz2
--- kdebase-workspace-4.2.0-kio_sysinfo.patch DELETED ---
--- kdebase-workspace-4.2.90-show_systemsettings.patch DELETED ---
--- kdebase-workspace-4.2.95-plasma-konsole.patch DELETED ---
--- kdebase-workspace-4.2.95-rootprivs.patch DELETED ---
--- kdebase-workspace-4.3.0-default_applets.patch DELETED ---
--- kdebase-workspace-4.3.1-classicmenu-logout.patch DELETED ---
--- kdebase-workspace-4.3.3-redhat-startkde.patch DELETED ---
--- kubuntu_101_brightness_fn_keys_and_osd.diff DELETED ---
More information about the fedora-extras-commits
mailing list