Revision bump to fix indicator issues per bug #292235.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 60 insertions, 4 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 339a8c92c1a3..62da23e0765c 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.41 2009/11/22 11:38:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.42 2009/11/22 12:02:10 scarabeus Exp $
+
+*plasma-workspace-4.3.3-r1 (22 Nov 2009)
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.3.3-progress_indicator.patch, -plasma-workspace-4.3.3.ebuild,
+  +plasma-workspace-4.3.3-r1.ebuild:
+  Revision bump to fix indicator issues per bug #292235.
 
   22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   plasma-workspace-4.3.3.ebuild:
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index de2b47f0ece8..6a5051f98883 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,6 +1,7 @@
+AUX 4.3.3-progress_indicator.patch 1620 RMD160 c0b70bae4d6966b71cb7f505b0626a6bbe5560bd SHA1 13f8288ce3738ad90d123f2fed094f621379d2b7 SHA256 792032dc6442625f04b9e80af20f66c77e7acdc20b29ff9f35ef6a038a736d78
 DIST kdebase-workspace-4.3.1.tar.bz2 62286316 RMD160 1db4e5428a497efff6910b5e1442eaffd2d0bad0 SHA1 c21a6e8028aa993878cccccb26b2611b3337eac9 SHA256 4c4b184615aab07134abbf05ec306f9ef37eb4f02f1e4eb9d4a16e44f859d6ed
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 EBUILD plasma-workspace-4.3.1.ebuild 2821 RMD160 2ef0afbb7a5dea693341ea5f6a24f0684cecaf81 SHA1 e356bf5b05c3cb6155d3d3aa42dfc8789c3eb377 SHA256 17f4a8a053348cf98743bc11840c272d5af62588a5e1b5fb20082791cf6daad9
-EBUILD plasma-workspace-4.3.3.ebuild 2800 RMD160 c8d7f8fc3dece431848470522aea3d8fbc3ba3d6 SHA1 4f86953c4a93825ed963172fa594f265782e02c2 SHA256 2c6efc5664f9302738bd90d67314c2b9000fc84510767322b7ad78dcb14e8053
-MISC ChangeLog 5910 RMD160 9d681a05b346de1bf607a018cd5087496ffa1713 SHA1 4883b3507e36e7c0afcd66b1dbb7b2c9ec28fc13 SHA256 6181163c22c2c64c8a9013c9e0823c1351f88982c2422344f0ca6ff7b807f85a
+EBUILD plasma-workspace-4.3.3-r1.ebuild 2862 RMD160 4d6aad155975bbde20ff6ee1777faca19b48395e SHA1 b0e14d2a2848aa754c1eb9f16f1a46cc42f38569 SHA256 33a8d417430332da6d785e2dced668304c01f3db69320e72e9447de87fe63a85
+MISC ChangeLog 6175 RMD160 67f0ae3fb1b5db6e2ce81104950103bf28d90a21 SHA1 8427e3a5d39eb54ed375418d872df0443998b857 SHA256 d0af5b6f371e60c7f3a2c29bb8d9f95d3b991c8f966f1b4367f4d7c35a64b978
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch b/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch
new file mode 100644
index 000000000000..64e6d460bc89
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch
@@ -0,0 +1,44 @@
+--- plasma/applets/systemtray/ui/jobwidget.cpp	2009/10/31 23:47:17	1043182
++++ plasma/applets/systemtray/ui/jobwidget.cpp	2009/10/31 23:48:31	1043183
+@@ -208,6 +208,16 @@
+     m_meter->setValue(m_job->percentage());
+ 
+     if (m_job) {
++        if (m_job->state() == SystemTray::Job::Running) {
++            //Update the ETA and job speed
++            if (m_job->eta()) {
++                m_eta->setText(i18n("%1 (%2 remaining)", m_job->speed(),
++                                 KGlobal::locale()->formatDuration(m_job->eta())));
++            } else {
++                m_eta->setText(QString());
++            }
++        }
++
+         if (m_job->labels().count() > 0) {
+             labelName0 = m_job->labels().value(0).first;
+             label0 = m_job->labels().value(0).second;
+--- plasma/applets/systemtray/ui/jobwidget.h	2009/10/31 23:47:17	1043182
++++ plasma/applets/systemtray/ui/jobwidget.h	2009/10/31 23:48:31	1043183
+@@ -61,10 +61,10 @@
+         void detailsClicked();
+         void destroyExtenderItem();
+         void scheduleUpdateJob();
++        void updateJobState();
+ 
+     private:
+         void updateLabels();
+-        void updateJobState();
+         void updateJob();
+ 
+         Plasma::ExtenderItem *m_extenderItem;
+--- plasma/dataengines/applicationjobs/kuiserverengine.cpp	2009/10/31 23:47:17	1043182
++++ plasma/dataengines/applicationjobs/kuiserverengine.cpp	2009/10/31 23:48:31	1043183
+@@ -178,6 +178,8 @@
+ void JobView::setSpeed(qlonglong bytesPerSecond)
+ {
+     m_speed = bytesPerSecond;
++    setData("speed", speedString());
++    scheduleUpdate();
+ }
+ 
+ QString JobView::speedString() const
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.3.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.3.3-r1.ebuild
index ee1753c81f12..c72e16e1f740 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.3.3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.3.3-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/plasma-workspace/plasma-workspace-4.3.3.ebuild,v 1.2 2009/11/22 11:38:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.3.3-r1.ebuild,v 1.1 2009/11/22 12:02:10 scarabeus Exp $
 
 EAPI="2"
 
@@ -62,6 +62,10 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-progress_indicator.patch"
+)
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)