[arch-commits] Commit in cinnamon-session/trunk (2 files)

[Balló György]

    Date: Saturday, November 22, 2014 @ 19:47:25
  Author: bgyorgy
Revision: 122934

upgpkg: cinnamon-session 2.4.1-2

Blacklist gnome-initial-setup from autostart, it's not designed for Cinnamon

Added:
  cinnamon-session/trunk/blacklist_gnome-initial-setup.patch
Modified:
  cinnamon-session/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   10 +++++++---
 blacklist_gnome-initial-setup.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-22 18:02:40 UTC (rev 122933)
+++ PKGBUILD	2014-11-22 18:47:25 UTC (rev 122934)
@@ -4,7 +4,7 @@
 
 pkgname=cinnamon-session
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Session Handler"
 arch=(i686 x86_64)
 license=(GPL LGPL)
@@ -14,9 +14,11 @@
 install=cinnamon-session.install
 url="https://github.com/linuxmint/cinnamon-session"
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
-        timeout.patch)
+        timeout.patch
+        blacklist_gnome-initial-setup.patch)
 sha256sums=('0fe4a1a5cc7f9f0860722ac52f55ca918c980ade3dfc500d2c90da681f1a8f4c'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -24,6 +26,8 @@
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
 
+  # Blacklist gnome-initial-setup from autostart, it's not designed for Cinnamon
+  patch -Np1 -i ../blacklist_gnome-initial-setup.patch
 }
 
 build() {

Added: blacklist_gnome-initial-setup.patch
===================================================================
--- blacklist_gnome-initial-setup.patch	                        (rev 0)
+++ blacklist_gnome-initial-setup.patch	2014-11-22 18:47:25 UTC (rev 122934)
@@ -0,0 +1,14 @@
+--- a/cinnamon-session/csm-manager.c	2014-11-08 09:05:05.000000000 +0000
++++ b/cinnamon-session/csm-manager.c	2014-11-21 17:35:31.979898468 +0000
+@@ -107,7 +107,10 @@ const gchar *blacklist[] = {
+                             "gnome-screensaver",
+                             "mate-screensaver",
+                             "mate-keyring-daemon",
+-                            "indicator-"
++                            "indicator-",
++                            "gnome-initial-setup-copy-worker",
++                            "gnome-initial-setup-first-login",
++                            "gnome-welcome-tour"
+                            };
+ 
+ static void app_registered (CsmApp     *app, CsmManager *manager);