aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-workspace
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-02 19:04:18 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-02 19:04:18 +0000
commit18ff93d1a7890eb2f3b1c6249141e45a3e45e037 (patch)
tree2923053fc55dccac74b95b5ed97ba05ff2db25bb /x11/kde4-workspace
parentf026ee1fe8da98244462007ccf598885ff54758f (diff)
downloadports-18ff93d1a7890eb2f3b1c6249141e45a3e45e037.tar.gz
ports-18ff93d1a7890eb2f3b1c6249141e45a3e45e037.zip
Notes
Diffstat (limited to 'x11/kde4-workspace')
-rw-r--r--x11/kde4-workspace/Makefile2
-rw-r--r--x11/kde4-workspace/distinfo4
-rw-r--r--x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js15
-rw-r--r--x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml11
-rw-r--r--x11/kde4-workspace/pkg-plist4
5 files changed, 30 insertions, 6 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index b731f23109df..3a8e79a7db22 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -146,6 +146,8 @@ post-patch:
${PATCH_WRKSRC}/kdm/backend/client.c \
${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
${PATCH_WRKSRC}/CMakeLists.txt
+ ${RM} ${WRKSRC}/plasma/generic/applets/batterymonitor/contents/code/logic.js.orig
+ ${RM} ${WRKSRC}/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml.orig
pre-configure:
${REINPLACE_CMD} -e '/ksysguardd/ d' \
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 1e0594c671b3..6bd4adfbf625 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d
-SIZE (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = 13569364
+SHA256 (KDE/4.10.4/kde-workspace-4.10.4.tar.xz) = 55b9c79829fbbe781653951eb0b94dcfbb21fa46102c0c15db40521c143f22d1
+SIZE (KDE/4.10.4/kde-workspace-4.10.4.tar.xz) = 13426036
diff --git a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js
new file mode 100644
index 000000000000..0918956f7ed6
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js
@@ -0,0 +1,15 @@
+--- ./plasma/generic/applets/batterymonitor/contents/code/logic.js.orig 2013-05-03 06:36:45.739116000 +0200
++++ ./plasma/generic/applets/batterymonitor/contents/code/logic.js 2013-06-11 00:33:16.130983470 +0200
+@@ -24,10 +24,12 @@
+ function updateCumulative() {
+ var sum = 0;
+ var charged = true;
++ batteries.cumulativePluggedin = false;
+ for (var i=0; i<batteries.count; i++) {
+ var b = batteries.get(i);
+ if (b["Plugged in"]) {
+ sum += b["Percent"];
++ batteries.cumulativePluggedin = true;
+ }
+ if (b["State"] != "NoCharge") {
+ charged = false;
diff --git a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml
new file mode 100644
index 000000000000..a0599f93c5ab
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml
@@ -0,0 +1,11 @@
+--- ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml.orig 2013-05-03 06:36:45.739116000 +0200
++++ ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml 2013-06-11 00:33:16.141003089 +0200
+@@ -186,7 +186,7 @@
+ }
+
+ property int cumulativePercent
+- property bool cumulativePluggedin: count > 0
++ property bool cumulativePluggedin
+ // true --> all batteries charged
+ // false --> one of the batteries charging/discharging
+ property bool allCharged
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 58e9bc2e37c6..92dec596cc69 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -2175,7 +2175,6 @@ share/wallpapers/stripes.png.desktop
@dirrm share/apps/plasma/plasmoids/battery/contents/code
@dirrm share/apps/plasma/plasmoids/battery/contents
@dirrm share/apps/plasma/plasmoids/battery
-@dirrm share/apps/plasma/plasmoids
@dirrm share/apps/plasma/packages/org.kde.systemtray/contents/ui
@dirrm share/apps/plasma/packages/org.kde.systemtray/contents/code
@dirrm share/apps/plasma/packages/org.kde.systemtray/contents
@@ -2355,9 +2354,6 @@ share/wallpapers/stripes.png.desktop
@dirrm lib/kde4/imports/org/kde/kwin/decorations
@dirrm lib/kde4/imports/org/kde/kwin/decoration
@dirrm lib/kde4/imports/org/kde/kwin
-@dirrmtry lib/kde4/imports/org/kde
-@dirrmtry lib/kde4/imports/org
-@dirrmtry lib/kde4/imports
@dirrm lib/cmake/KDE4Workspace
@dirrmtry lib/cmake
@dirrm include/taskmanager