[arch-commits] Commit in cinnamon-settings-daemon/trunk (PKGBUILD dpms.patch)

[Alexandre Filgueira]

    Date: Monday, March 10, 2014 @ 22:07:22
  Author: faidoc
Revision: 106944

upgpkg: cinnamon-settings-daemon 2.0.8-3

Added:
  cinnamon-settings-daemon/trunk/dpms.patch
Modified:
  cinnamon-settings-daemon/trunk/PKGBUILD

------------+
 PKGBUILD   |   11 ++++++++---
 dpms.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-10 20:57:25 UTC (rev 106943)
+++ PKGBUILD	2014-03-10 21:07:22 UTC (rev 106944)
@@ -4,7 +4,7 @@
 
 pkgname=cinnamon-settings-daemon
 pkgver=2.0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,10 +15,12 @@
 url="https://github.com/linuxmint/cinnamon-settings-daemon"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
         keyboard.patch
-        automount-plugin.patch)
+        automount-plugin.patch
+        dpms.patch)
 sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
             '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
-            '4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837')
+            '4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
+            '194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -28,6 +30,9 @@
 
   # Turn automount helper into a plugin
   patch -Np1 -i ../automount-plugin.patch
+
+  # Fix DPMS issue with Xorg 1.14
+  patch -Np1 -i ../dpms.patch
 }
 
 build() {

Added: dpms.patch
===================================================================
--- dpms.patch	                        (rev 0)
+++ dpms.patch	2014-03-10 21:07:22 UTC (rev 106944)
@@ -0,0 +1,29 @@
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -33,6 +33,8 @@
+ #include <libnotify/notify.h>
+ #include <canberra-gtk.h>
+ 
++#include <X11/extensions/dpms.h>
++
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libcinnamon-desktop/gnome-rr.h>
+ 
+@@ -3967,6 +3790,17 @@ csd_power_manager_start (CsdPowerManager
+         /* set the initial dim time that can adapt for the user */
+         refresh_idle_dim_settings (manager);
+ 
++        /* Make sure that Xorg's DPMS extension never gets in our way. The defaults seem to have changed in Xorg 1.14
++         * being "0" by default to being "600" by default 
++         * https://bugzilla.gnome.org/show_bug.cgi?id=709114
++         */
++        gdk_error_trap_push ();
++        int dummy;
++        if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) {
++            DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0);
++        }
++        gdk_error_trap_pop_ignored ();
++
+         manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
+                                                                                disable_builtin_screensaver,
+                                                                                NULL);
\ No newline at end of file