[arch-commits] Commit in kactivities/trunk (PKGBUILD fix-activities.patch)
Andrea Scarpino
andrea at archlinux.org
Wed Dec 7 08:22:45 UTC 2011
Date: Wednesday, December 7, 2011 @ 03:22:45
Author: andrea
Revision: 144507
KDE 4.8beta2
Modified:
kactivities/trunk/PKGBUILD
Deleted:
kactivities/trunk/fix-activities.patch
----------------------+
PKGBUILD | 13 +---
fix-activities.patch | 156 -------------------------------------------------
2 files changed, 4 insertions(+), 165 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-07 08:22:41 UTC (rev 144506)
+++ PKGBUILD 2011-12-07 08:22:45 UTC (rev 144507)
@@ -2,23 +2,18 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
pkgname=kactivities
-pkgver=4.7.80
-pkgrel=2
+pkgver=4.7.90
+pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='API for using and interacting with Activities'
url='http://kde.org/'
license=('GPL' 'FDL')
depends=('kdelibs')
makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'fix-activities.patch')
-sha1sums=('c619c5d6e3e2ef79d0cebf52bf18d1b467dc24f9'
- '6eb890958726856cf4ddb172acd46ba08f7a5088')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('23ae79b85dd8c754950fcbabbd4cae5c9f139e74')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/fix-activities.patch
-
cd "${srcdir}"
mkdir build
cd build
Deleted: fix-activities.patch
===================================================================
--- fix-activities.patch 2011-12-07 08:22:41 UTC (rev 144506)
+++ fix-activities.patch 2011-12-07 08:22:45 UTC (rev 144507)
@@ -1,156 +0,0 @@
---- kactivities-4.7.80/service/ActivityManager.cpp~ 2011-11-24 16:05:52.777981854 +0000
-+++ kactivities-4.7.80/service/ActivityManager.cpp 2011-11-24 16:06:32.721637122 +0000
-@@ -75,14 +75,14 @@
- QHash < WId, SharedInfo::WindowData > & _windows,
- QHash < KUrl, SharedInfo::ResourceData > & _resources
- )
-- : haveSessions(false),
-- config("activitymanagerrc"),
-- windows(_windows),
-- resources(_resources),
-+ : config("activitymanagerrc"),
-+ windows(_windows),
-+ resources(_resources),
- #ifdef HAVE_NEPOMUK
-- m_nepomukInitCalled(false),
-+ m_nepomukInitCalled(false),
- #endif
-- q(parent)
-+ q(parent),
-+ ksmserverInterface(0)
- {
- // Initializing config
- connect(&configSyncTimer, SIGNAL(timeout()),
-@@ -116,20 +116,26 @@
- this, SLOT(activeWindowChanged(WId)));
-
- //listen to ksmserver for starting/stopping
-+ QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.ksmserver",
-+ QDBusConnection::sessionBus(),
-+ QDBusServiceWatcher::WatchForRegistration);
-+ connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(sessionServiceRegistered()));
-+ sessionServiceRegistered();
-+}
-+
-+void ActivityManagerPrivate::sessionServiceRegistered()
-+{
-+ delete ksmserverInterface;
- ksmserverInterface = new QDBusInterface("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface");
- if (ksmserverInterface->isValid()) {
- ksmserverInterface->setParent(this);
- connect(ksmserverInterface, SIGNAL(subSessionOpened()), this, SLOT(startCompleted()));
- connect(ksmserverInterface, SIGNAL(subSessionClosed()), this, SLOT(stopCompleted()));
- connect(ksmserverInterface, SIGNAL(subSessionCloseCanceled()), this, SLOT(stopCancelled())); //spelling fail :)
-- haveSessions = true;
- } else {
-- kDebug() << "couldn't connect to ksmserver! session stuff won't work";
-- //note: in theory it's nice to try again later
-- //but in practice, ksmserver is either there or it isn't (killing it logs you out)
-- //so in this case there's no point. :)
-- ksmserverInterface->deleteLater();
-+ delete ksmserverInterface;
- ksmserverInterface = 0;
-+ kDebug() << "couldn't connect to ksmserver! session stuff won't work";
- }
- }
-
-@@ -519,26 +525,24 @@
- {
- bool called = false;
- // start the starting :)
-- if (haveSessions) {
-- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-- if (kwin.isValid()) {
-- QDBusMessage reply = kwin.call("startActivity", id);
-- if (reply.type() == QDBusMessage::ErrorMessage) {
-- kDebug() << "dbus error:" << reply.errorMessage();
-+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+ if (kwin.isValid()) {
-+ QDBusMessage reply = kwin.call("startActivity", id);
-+ if (reply.type() == QDBusMessage::ErrorMessage) {
-+ kDebug() << "dbus error:" << reply.errorMessage();
-+ } else {
-+ QList<QVariant> ret = reply.arguments();
-+ if (ret.length() == 1 && ret.first().toBool()) {
-+ called = true;
- } else {
-- QList<QVariant> ret = reply.arguments();
-- if (ret.length() == 1 && ret.first().toBool()) {
-- called = true;
-- } else {
-- kDebug() << "call returned false; probably ksmserver is busy";
-- setActivityState(transitioningActivity, ActivityManager::Stopped);
-- transitioningActivity.clear();
-- return; //assume we're mid-logout and just don't touch anything
-- }
-+ kDebug() << "call returned false; probably ksmserver is busy";
-+ setActivityState(transitioningActivity, ActivityManager::Stopped);
-+ transitioningActivity.clear();
-+ return; //assume we're mid-logout and just don't touch anything
- }
-- } else {
-- kDebug() << "couldn't get kwin interface";
- }
-+ } else {
-+ kDebug() << "couldn't get kwin interface";
- }
-
- if (!called) {
-@@ -585,25 +589,23 @@
- {
- bool called = false;
- // start the stopping :)
-- if (haveSessions) {
-- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-- if (kwin.isValid()) {
-- QDBusMessage reply = kwin.call("stopActivity", id);
-- if (reply.type() == QDBusMessage::ErrorMessage) {
-- kDebug() << "dbus error:" << reply.errorMessage();
-+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+ if (kwin.isValid()) {
-+ QDBusMessage reply = kwin.call("stopActivity", id);
-+ if (reply.type() == QDBusMessage::ErrorMessage) {
-+ kDebug() << "dbus error:" << reply.errorMessage();
-+ } else {
-+ QList<QVariant> ret = reply.arguments();
-+ if (ret.length() == 1 && ret.first().toBool()) {
-+ called = true;
- } else {
-- QList<QVariant> ret = reply.arguments();
-- if (ret.length() == 1 && ret.first().toBool()) {
-- called = true;
-- } else {
-- kDebug() << "call returned false; probably ksmserver is busy";
-- stopCancelled();
-- return; //assume we're mid-logout and just don't touch anything
-- }
-+ kDebug() << "call returned false; probably ksmserver is busy";
-+ stopCancelled();
-+ return; //assume we're mid-logout and just don't touch anything
- }
-- } else {
-- kDebug() << "couldn't get kwin interface";
- }
-+ } else {
-+ kDebug() << "couldn't get kwin interface";
- }
-
- if (!called) {
---- kactivities-4.7.80/service/ActivityManager_p.h~ 2011-11-24 16:06:01.618054620 +0000
-+++ kactivities-4.7.80/service/ActivityManager_p.h 2011-11-24 16:06:32.721637122 +0000
-@@ -68,7 +68,6 @@
-
- //opening/closing activity (ksmserver can only handle one at a time)
- QString transitioningActivity;
-- bool haveSessions; //whether ksmserver's available
-
- // Configuration
- QTimer configSyncTimer;
-@@ -106,6 +105,7 @@
-
- void backstoreAvailable();
- void syncActivitiesWithNepomuk();
-+ void sessionServiceRegistered();
-
- private:
- ActivityManager * const q;
More information about the arch-commits
mailing list