[arch-commits] Commit in cinnamon/trunk (PKGBUILD idle-dim.patch)

[Balló György]

    Date: Thursday, May 2, 2013 @ 20:23:17
  Author: bgyorgy
Revision: 89830

upgpkg: cinnamon 1.7.8-2

Fix brightness applet for GNOME 3.8

Added:
  cinnamon/trunk/idle-dim.patch
Modified:
  cinnamon/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 ++++++++---
 idle-dim.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-02 17:25:36 UTC (rev 89829)
+++ PKGBUILD	2013-05-02 18:23:17 UTC (rev 89830)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=1.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -29,13 +29,15 @@
         "fix-control-center-check.patch"
         "gnome-3.8.patch"
         "switch-applications.patch"
-        "fallback-helpers.patch")
+        "fallback-helpers.patch"
+        "idle-dim.patch")
 sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969'
             'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
             '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3'
             '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
-            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e')
+            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
+            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
@@ -62,6 +64,9 @@
   # Start media keys and mount helpers with the session
   patch -Np1 -i ../fallback-helpers.patch
 
+  # Fix brightness applet for GNOME 3.8
+  patch -Np1 -i ../idle-dim.patch
+
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
                --libexecdir=/usr/lib/cinnamon \

Added: idle-dim.patch
===================================================================
--- idle-dim.patch	                        (rev 0)
+++ idle-dim.patch	2013-05-02 18:23:17 UTC (rev 89830)
@@ -0,0 +1,35 @@
+diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
+@@ -9,8 +9,7 @@
+ 
+ /* constants */
+ const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
+-const DimSettingsAc = "idle-dim-ac";
+-const DimSettingsBattery = "idle-dim-battery";
++const DimSettings = "idle-dim";
+ const PowerBusName = 'org.gnome.SettingsDaemon';
+ const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
+ 
+@@ -116,10 +115,8 @@
+             
+             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
+             
+-            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
+-            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
++            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
++            this._settingsMenu.menu.addMenuItem(dimSwitch);
+                       
+             //initial update.
+             //We have to wait until dbus calls back to decide whether to display brightness controls.
+@@ -145,7 +142,7 @@
+                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+                 }
+                 
+-                this.menu.addSettingsAction(_("Settings"), "screen");
++                this.menu.addSettingsAction(_("Settings"), "screensaver");
+ 		    }));
+         }
+         catch (e) {