From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RV64h-0000JN-6c for garchives@archives.gentoo.org; Mon, 28 Nov 2011 18:37:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 266C021C023; Mon, 28 Nov 2011 18:36:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D2C3921C023 for ; Mon, 28 Nov 2011 18:36:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40EBF1B400F for ; Mon, 28 Nov 2011 18:36:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A50BC80044 for ; Mon, 28 Nov 2011 18:36:47 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <4a12e63bdaa62c532ede0673168c8e53c97a0de3.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild X-VCS-Directories: kde-base/kdeplasma-addons/files/ kde-base/kdeplasma-addons/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 4a12e63bdaa62c532ede0673168c8e53c97a0de3 Date: Mon, 28 Nov 2011 18:36:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bc664763-46fd-4d98-9220-a9f0ca5fa5a1 X-Archives-Hash: 2ba368ba070b7cb524226ea00bce308b commit: 4a12e63bdaa62c532ede0673168c8e53c97a0de3 Author: Johannes Huber gmx de> AuthorDate: Mon Nov 28 18:37:29 2011 +0000 Commit: Johannes Huber gmx de> CommitDate: Mon Nov 28 18:37:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D4a12e63b [kde-base/kdeplasma-addons] Add build fix patches to 4.7.80, bug 392027. = Thanks Marian Kyral email.cz>. (Portage version: 2.2.0_alpha78/git/Linux i686, unsigned Manifest commit) --- ...deplasma-addons-4.7.80-fix-build-lancelot.patch | 122 ++++++++++++++= ++++++ ...-addons-4.7.80-fix-build-marble-wallpaper.patch | 19 +++ ...-addons-4.7.80-remove-outdated-statements.patch | 40 +++++++ .../kdeplasma-addons-4.7.80.ebuild | 3 + 4 files changed, 184 insertions(+), 0 deletions(-) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-= build-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4= .7.80-fix-build-lancelot.patch new file mode 100644 index 0000000..96a00c5 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-l= ancelot.patch @@ -0,0 +1,122 @@ +commit 6967ee53518136651b4fd5d691293a3c866d7a47 +Author: Aaron Seigo +Date: Tue Nov 22 21:10:45 2011 +0100 + + fix build + +diff --git a/libs/lancelot-datamodels/OpenDocuments.cpp b/libs/lancelot-= datamodels/OpenDocuments.cpp +index 4b2bec5..b9f24ec 100644 +--- a/libs/lancelot-datamodels/OpenDocuments.cpp ++++ b/libs/lancelot-datamodels/OpenDocuments.cpp +@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments() + delete d; + } +=20 +-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()) + ); + } +=20 + 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); + } + } +=20 + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)), +- d, SLOT(taskAdded(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManage= r::Task*)), ++ d, SLOT(taskAdded(::TaskManager::Task*)) + ); +=20 + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)), +- d, SLOT(taskRemoved(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskMana= ger::Task*)), ++ d, SLOT(taskRemoved(::TaskManager::Task*)) + ); + } +=20 +-void OpenDocuments::Private::taskAdded(TaskPtr task) ++void OpenDocuments::Private::taskAdded(::TaskManager::Task *task) + { + connectTask(task); + setDataForTask(task); + } +=20 +-void OpenDocuments::Private::taskRemoved(TaskPtr task) ++void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task) + { + Q_ASSERT(task); + int index =3D indexOf(task->window()); +@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged() + TaskManager::Task* task =3D qobject_cast(sender= ()); + Q_ASSERT(task); +=20 +- setDataForTask(TaskPtr(task)); ++ setDataForTask(task); + } +=20 +-bool OpenDocuments::Private::setDataForTask(TaskPtr task) ++bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task) + { + Q_ASSERT(task); +=20 +diff --git a/libs/lancelot-datamodels/OpenDocuments.h b/libs/lancelot-da= tamodels/OpenDocuments.h +index 00b0910..f9c5461 100644 +--- a/libs/lancelot-datamodels/OpenDocuments.h ++++ b/libs/lancelot-datamodels/OpenDocuments.h +@@ -26,8 +26,6 @@ + #include + #include +=20 +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { +=20 +diff --git a/libs/lancelot-datamodels/OpenDocuments_p.h b/libs/lancelot-= datamodels/OpenDocuments_p.h +index 5fdfe70..d2dc374 100644 +--- a/libs/lancelot-datamodels/OpenDocuments_p.h ++++ b/libs/lancelot-datamodels/OpenDocuments_p.h +@@ -24,8 +24,6 @@ + #include + #include +=20 +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { +=20 +@@ -44,16 +42,16 @@ public: +=20 + public Q_SLOTS: + void taskChanged(); +- void taskAdded(TaskPtr task); +- void taskRemoved(TaskPtr task); ++ void taskAdded(::TaskManager::Task *task); ++ void taskRemoved(::TaskManager::Task *task); +=20 +- void connectTask(TaskPtr task); +- bool setDataForTask(TaskPtr task); ++ void connectTask(::TaskManager::Task *task); ++ bool setDataForTask(::TaskManager::Task *task); +=20 + int indexOf(WId wid); +=20 + public: +- QMap tasks; ++ QMap tasks; + QList supportedTasks; +=20 + private: diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-= build-marble-wallpaper.patch b/kde-base/kdeplasma-addons/files/kdeplasma-= addons-4.7.80-fix-build-marble-wallpaper.patch new file mode 100644 index 0000000..c01f131 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-m= arble-wallpaper.patch @@ -0,0 +1,19 @@ +commit e089568a73ec0fa9f8e9ec61c9853b1905d3a1d7 +Author: Ben Cooksley +Date: Mon Nov 28 08:14:54 2011 +1300 + + Fix build of Marble wallpaper + REVIEW: 103243 + +diff --git a/wallpapers/marble/marble.cpp b/wallpapers/marble/marble.cpp +index 3cecaae..988a8b6 100644 +--- a/wallpapers/marble/marble.cpp ++++ b/wallpapers/marble/marble.cpp +@@ -137,7 +137,6 @@ QWidget *MarbleWallpaper::createConfigurationInterfa= ce(QWidget *parent) + m_ui.showPlacemarks->setChecked(m_showPlacemarks); +=20 + MapThemeManager themeManager; +- themeManager.updateMapThemeModel(); + // FIXME: Going manually through the model is ugly as hell, but plu= gging the + // model into the view didn't work for me + for (int i =3D 0; i < themeManager.mapThemeModel()->rowCount(); i++= ) { diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remo= ve-outdated-statements.patch b/kde-base/kdeplasma-addons/files/kdeplasma-= addons-4.7.80-remove-outdated-statements.patch new file mode 100644 index 0000000..cc6958d --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outd= ated-statements.patch @@ -0,0 +1,40 @@ +commit b0c70d7fd866efb628036f43978bc791e0485f90 +Author: Aaron Seigo +Date: Tue Nov 22 14:07:59 2011 +0100 + + remove outdated using statements + +diff --git a/applets/icontasks/taskitemlayout.h b/applets/icontasks/task= itemlayout.h +index 9ebf82f..64142e1 100644 +--- a/applets/icontasks/taskitemlayout.h ++++ b/applets/icontasks/taskitemlayout.h +@@ -32,9 +32,6 @@ class TaskGroupItem; + class AbstractTaskItem; + class LauncherSeparator; +=20 +-using TaskManager::StartupPtr; +-using TaskManager::TaskPtr; +- + /** + * A Layout for the expanded group + */ +diff --git a/applets/icontasks/tasks.h b/applets/icontasks/tasks.h +index e7bab6b..bf8a665 100644 +--- a/applets/icontasks/tasks.h ++++ b/applets/icontasks/tasks.h +@@ -54,15 +54,6 @@ namespace TaskManager + class GroupManager; + } // namespace TaskManager +=20 +-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; +=20 diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild b/k= de-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild index 3999258..0e775f9 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild @@ -41,6 +41,9 @@ RDEPEND=3D"${COMMON_DEPEND} =20 PATCHES=3D( "${FILESDIR}/${PN}-4.7.3-knowledge.patch" + "${FILESDIR}/${PN}-4.7.80-fix-build-lancelot.patch" + "${FILESDIR}/${PN}-4.7.80-remove-outdated-statements.patch" + "${FILESDIR}/${PN}-4.7.80-fix-build-marble-wallpaper.patch" ) =20 src_prepare() {