summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-10-20 10:01:01 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-10-20 10:01:01 +0000
commitc661e8e99273ad3d611cfe85b0ae0b64c8b9fbc4 (patch)
tree5b1ee442d1f16d7875236dd2ac2fc36656a43931 /kde-base/ktimetracker
parentInitial import. (diff)
downloadgentoo-2-c661e8e99273ad3d611cfe85b0ae0b64c8b9fbc4.tar.gz
gentoo-2-c661e8e99273ad3d611cfe85b0ae0b64c8b9fbc4.tar.bz2
gentoo-2-c661e8e99273ad3d611cfe85b0ae0b64c8b9fbc4.zip
Apply upstream patch to bring back menu options. Per bug #288472.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/ktimetracker')
-rw-r--r--kde-base/ktimetracker/ChangeLog9
-rw-r--r--kde-base/ktimetracker/files/4.3.2-fix-menu.patch12
-rw-r--r--kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild (renamed from kde-base/ktimetracker/ktimetracker-4.3.2.ebuild)6
3 files changed, 25 insertions, 2 deletions
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 33f05b674b96..70b7eb5a1274 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/ktimetracker
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.27 2009/10/18 17:30:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.28 2009/10/20 10:01:01 scarabeus Exp $
+
+*ktimetracker-4.3.2-r1 (20 Oct 2009)
+
+ 20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/4.3.2-fix-menu.patch, -ktimetracker-4.3.2.ebuild,
+ +ktimetracker-4.3.2-r1.ebuild:
+ Apply upstream patch to bring back menu options. Per bug #288472.
18 Oct 2009; Markus Meier <maekke@gentoo.org> ktimetracker-4.3.1.ebuild:
x86 stable, bug #287697
diff --git a/kde-base/ktimetracker/files/4.3.2-fix-menu.patch b/kde-base/ktimetracker/files/4.3.2-fix-menu.patch
new file mode 100644
index 000000000000..991e46f12b13
--- /dev/null
+++ b/kde-base/ktimetracker/files/4.3.2-fix-menu.patch
@@ -0,0 +1,12 @@
+Index: branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp
+===================================================================
+--- branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp (revision 1035758)
++++ branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp (revision 1035759)
+@@ -73,6 +73,7 @@
+ ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
+ connect(configureAction, SIGNAL(triggered(bool)),
+ m_part->widget(), SLOT(showSettingsDialog()));
++ ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
+ m_part->openFile(icsfile);
+ setupGUI();
+ }
diff --git a/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild b/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild
index d2315f3946e1..774fa122433a 100644
--- a/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild,v 1.1 2009/10/06 20:12:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild,v 1.1 2009/10/20 10:01:01 scarabeus Exp $
EAPI="2"
@@ -26,6 +26,10 @@ KMEXTRACTONLY="
KMLOADLIBS="libkdepim"
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-menu.patch
+)
+
src_unpack() {
if use kontact; then
KMLOADLIBS="${KMLOADLIBS} kontactinterfaces"