diff options
Diffstat (limited to 'kde-unstable')
| -rw-r--r-- | kde-unstable/kdeplasma-addons/PKGBUILD | 14 | ||||
| -rw-r--r-- | kde-unstable/kdeplasma-addons/fix-build.patch | 163 |
2 files changed, 172 insertions, 5 deletions
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index 21270b2f6..ff363b32a 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143418 2011-11-24 16:16:32Z andrea $ +# $Id: PKGBUILD 143608 2011-11-27 12:08:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -75,23 +75,27 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.7.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-build.patch') +sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9' + '408f4ba54c2aba93e68f3454be0ef4327e48a51b') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/kde-unstable/kdeplasma-addons/fix-build.patch b/kde-unstable/kdeplasma-addons/fix-build.patch new file mode 100644 index 000000000..79e1d1f8c --- /dev/null +++ b/kde-unstable/kdeplasma-addons/fix-build.patch @@ -0,0 +1,163 @@ +From: Aaron Seigo <aseigo@kde.org> +Date: Tue, 22 Nov 2011 20:10:45 +0000 +Subject: fix build +X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=6967ee53518136651b4fd5d691293a3c866d7a47 +--- +fix build +--- + + +--- a/libs/lancelot-datamodels/OpenDocuments.cpp ++++ b/libs/lancelot-datamodels/OpenDocuments.cpp +@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments() + delete d; + } + +-void OpenDocuments::Private::connectTask(TaskPtr task) ++void OpenDocuments::Private::connectTask(::TaskManager::Task *task) + { + Q_ASSERT(task); + connect( +- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)), ++ task, SIGNAL(changed(::TaskManager::TaskChanges)), + this, SLOT(taskChanged()) + ); + } + + void OpenDocuments::load() + { +- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) { ++ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) { + if (d->setDataForTask(task)) { + d->connectTask(task); + } + } + + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)), +- d, SLOT(taskAdded(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)), ++ d, SLOT(taskAdded(::TaskManager::Task*)) + ); + + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)), +- d, SLOT(taskRemoved(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)), ++ d, SLOT(taskRemoved(::TaskManager::Task*)) + ); + } + +-void OpenDocuments::Private::taskAdded(TaskPtr task) ++void OpenDocuments::Private::taskAdded(::TaskManager::Task *task) + { + connectTask(task); + setDataForTask(task); + } + +-void OpenDocuments::Private::taskRemoved(TaskPtr task) ++void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task) + { + Q_ASSERT(task); + int index = indexOf(task->window()); +@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged + TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender()); + Q_ASSERT(task); + +- setDataForTask(TaskPtr(task)); ++ setDataForTask(task); + } + +-bool OpenDocuments::Private::setDataForTask(TaskPtr task) ++bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task) + { + Q_ASSERT(task); + + +--- a/libs/lancelot-datamodels/OpenDocuments.h ++++ b/libs/lancelot-datamodels/OpenDocuments.h +@@ -26,8 +26,6 @@ + #include <taskmanager/taskmanager.h> + #include <QSet> + +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { + + +--- a/libs/lancelot-datamodels/OpenDocuments_p.h ++++ b/libs/lancelot-datamodels/OpenDocuments_p.h +@@ -24,8 +24,6 @@ + #include <taskmanager/taskmanager.h> + #include <QSet> + +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { + +@@ -44,16 +42,16 @@ public: + + public Q_SLOTS: + void taskChanged(); +- void taskAdded(TaskPtr task); +- void taskRemoved(TaskPtr task); ++ void taskAdded(::TaskManager::Task *task); ++ void taskRemoved(::TaskManager::Task *task); + +- void connectTask(TaskPtr task); +- bool setDataForTask(TaskPtr task); ++ void connectTask(::TaskManager::Task *task); ++ bool setDataForTask(::TaskManager::Task *task); + + int indexOf(WId wid); + + public: +- QMap <WId, TaskPtr > tasks; ++ QMap <WId, TaskManager::Task *> tasks; + QList <SupportedTask> supportedTasks; + + private: + +From: Aaron Seigo <aseigo@kde.org> +Date: Tue, 22 Nov 2011 13:07:59 +0000 +Subject: remove outdated using statements +X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=b0c70d7fd866efb628036f43978bc791e0485f90 +--- +remove outdated using statements +--- + + +--- a/applets/icontasks/taskitemlayout.h ++++ b/applets/icontasks/taskitemlayout.h +@@ -32,9 +32,6 @@ class TaskGroupItem; + class AbstractTaskItem; + class LauncherSeparator; + +-using TaskManager::StartupPtr; +-using TaskManager::TaskPtr; +- + /** + * A Layout for the expanded group + */ + +--- a/applets/icontasks/tasks.h ++++ b/applets/icontasks/tasks.h +@@ -54,15 +54,6 @@ namespace TaskManager + class GroupManager; + } // namespace TaskManager + +-using TaskManager::StartupPtr; +-using TaskManager::TaskPtr; +-using TaskManager::StartupPtr; +-using TaskManager::GroupPtr; +-using TaskManager::AbstractGroupableItem; +-using TaskManager::TaskItem; +-using TaskManager::TaskGroup; +-using TaskManager::LauncherItem; +- + class TaskGroupItem; + class GroupManager; + + |