diff --git a/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild b/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild index 7f754b1..d8b1220 100644 --- a/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild +++ b/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cinnamon-settings-daemon -# Copyright 2014 Willy Sudiarto Raharjo +# Copyright 2014-2015 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cinnamon-settings-daemon -VERSION=${VERSION:-2.0.10} +VERSION=${VERSION:-2.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_csb} @@ -69,9 +69,7 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 < $CWD/dpms.patch + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/cinnamon-settings-daemon/dpms.patch b/cinnamon-settings-daemon/dpms.patch deleted file mode 100644 index 3262961..0000000 --- a/cinnamon-settings-daemon/dpms.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/plugins/power/csd-power-manager.c -+++ b/plugins/power/csd-power-manager.c -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include - -@@ -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); diff --git a/gksu/gksu.SlackBuild b/gksu/gksu.SlackBuild index 52b39c6..6bb74fc 100644 --- a/gksu/gksu.SlackBuild +++ b/gksu/gksu.SlackBuild @@ -69,7 +69,7 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \