[arch-commits] Commit in cinnamon-session/trunk (PKGBUILD gtk316.patch)

[Alexandre Filgueira]

    Date: Sunday, April 12, 2015 @ 03:17:36
  Author: faidoc
Revision: 131207

upgpkg: cinnamon-session 2.4.3-2

Added:
  cinnamon-session/trunk/gtk316.patch
Modified:
  cinnamon-session/trunk/PKGBUILD

--------------+
 PKGBUILD     |   10 +++++++---
 gtk316.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-12 01:15:32 UTC (rev 131206)
+++ PKGBUILD	2015-04-12 01:17:36 UTC (rev 131207)
@@ -4,7 +4,7 @@
 
 pkgname=cinnamon-session
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Session Handler"
 arch=(i686 x86_64)
 license=(GPL LGPL)
@@ -15,10 +15,12 @@
 url="https://github.com/linuxmint/cinnamon-session"
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
         timeout.patch
-        blacklist_gnome-initial-setup.patch)
+        blacklist_gnome-initial-setup.patch
+        gtk316.patch)
 sha256sums=('07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733'
             'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
-            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778')
+            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778'
+            '012feb2ed16570a54e3b1d26b6e45677a16fbd86a3bea828b58b516885ddb871')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -28,6 +30,8 @@
 
   # Blacklist gnome-initial-setup from autostart, it's not designed for Cinnamon
   patch -Np1 -i ../blacklist_gnome-initial-setup.patch
+
+  patch -Np1 -i ../gtk316.patch
 }
 
 build() {

Added: gtk316.patch
===================================================================
--- gtk316.patch	                        (rev 0)
+++ gtk316.patch	2015-04-12 01:17:36 UTC (rev 131207)
@@ -0,0 +1,21 @@
+From 70893dc7a32fb983f44c8e9be07ffe65baf6bbd3 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Mon, 6 Apr 2015 21:17:28 -0400
+Subject: [PATCH] main.c: Add CLUTTER_BACKEND="x11" for forward-compatibility.
+
+---
+ cinnamon-session/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
+index 011cd6e..1f94e12 100644
+--- a/cinnamon-session/main.c
++++ b/cinnamon-session/main.c
+@@ -348,6 +348,7 @@ main (int argc, char **argv)
+          * detect if GNOME is running. We keep this for compatibility reasons.
+          */
+         csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
++        csm_util_setenv ("CLUTTER_BACKEND", "x11");
+ 
+         client_store = csm_store_new ();
+