[arch-commits] Commit in cinnamon-session/repos (18 files)

Alexandre Filgueira faidoc at archlinux.org
Sun Apr 12 01:19:21 UTC 2015


    Date: Sunday, April 12, 2015 @ 03:19:21
  Author: faidoc
Revision: 131208

archrelease: copy trunk to community-i686, community-x86_64

Added:
  cinnamon-session/repos/community-i686/PKGBUILD
    (from rev 131207, cinnamon-session/trunk/PKGBUILD)
  cinnamon-session/repos/community-i686/blacklist_gnome-initial-setup.patch
    (from rev 131207, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
  cinnamon-session/repos/community-i686/cinnamon-session.install
    (from rev 131207, cinnamon-session/trunk/cinnamon-session.install)
  cinnamon-session/repos/community-i686/gtk316.patch
    (from rev 131207, cinnamon-session/trunk/gtk316.patch)
  cinnamon-session/repos/community-i686/timeout.patch
    (from rev 131207, cinnamon-session/trunk/timeout.patch)
  cinnamon-session/repos/community-x86_64/PKGBUILD
    (from rev 131207, cinnamon-session/trunk/PKGBUILD)
  cinnamon-session/repos/community-x86_64/blacklist_gnome-initial-setup.patch
    (from rev 131207, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
  cinnamon-session/repos/community-x86_64/cinnamon-session.install
    (from rev 131207, cinnamon-session/trunk/cinnamon-session.install)
  cinnamon-session/repos/community-x86_64/gtk316.patch
    (from rev 131207, cinnamon-session/trunk/gtk316.patch)
  cinnamon-session/repos/community-x86_64/timeout.patch
    (from rev 131207, cinnamon-session/trunk/timeout.patch)
Deleted:
  cinnamon-session/repos/community-i686/PKGBUILD
  cinnamon-session/repos/community-i686/blacklist_gnome-initial-setup.patch
  cinnamon-session/repos/community-i686/cinnamon-session.install
  cinnamon-session/repos/community-i686/timeout.patch
  cinnamon-session/repos/community-x86_64/PKGBUILD
  cinnamon-session/repos/community-x86_64/blacklist_gnome-initial-setup.patch
  cinnamon-session/repos/community-x86_64/cinnamon-session.install
  cinnamon-session/repos/community-x86_64/timeout.patch

------------------------------------------------------+
 /PKGBUILD                                            |   96 +++++++++++++++++
 /blacklist_gnome-initial-setup.patch                 |   28 ++++
 /cinnamon-session.install                            |   24 ++++
 /timeout.patch                                       |   48 ++++++++
 community-i686/PKGBUILD                              |   44 -------
 community-i686/blacklist_gnome-initial-setup.patch   |   14 --
 community-i686/cinnamon-session.install              |   12 --
 community-i686/gtk316.patch                          |   21 +++
 community-i686/timeout.patch                         |   24 ----
 community-x86_64/PKGBUILD                            |   44 -------
 community-x86_64/blacklist_gnome-initial-setup.patch |   14 --
 community-x86_64/cinnamon-session.install            |   12 --
 community-x86_64/gtk316.patch                        |   21 +++
 community-x86_64/timeout.patch                       |   24 ----
 14 files changed, 238 insertions(+), 188 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-i686/PKGBUILD	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-session
-pkgver=2.4.3
-pkgrel=1
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(dbus-glib cinnamon-desktop libsm libcanberra)
-makedepends=(intltool mesa json-glib xtrans gnome-common)
-options=('!emptydirs')
-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
-        blacklist_gnome-initial-setup.patch)
-sha256sums=('07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
-            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # 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() {
-  cd $pkgname-$pkgver
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
-      --disable-schemas-compile --enable-systemd --disable-gconf
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: cinnamon-session/repos/community-i686/PKGBUILD (from rev 131207, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.4.3
+pkgrel=2
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(dbus-glib cinnamon-desktop libsm libcanberra)
+makedepends=(intltool mesa json-glib xtrans gnome-common)
+options=('!emptydirs')
+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
+        blacklist_gnome-initial-setup.patch
+        gtk316.patch)
+sha256sums=('07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778'
+            '012feb2ed16570a54e3b1d26b6e45677a16fbd86a3bea828b58b516885ddb871')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # 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
+
+  patch -Np1 -i ../gtk316.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/blacklist_gnome-initial-setup.patch
===================================================================
--- community-i686/blacklist_gnome-initial-setup.patch	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-i686/blacklist_gnome-initial-setup.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,14 +0,0 @@
---- 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);

Copied: cinnamon-session/repos/community-i686/blacklist_gnome-initial-setup.patch (from rev 131207, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
===================================================================
--- community-i686/blacklist_gnome-initial-setup.patch	                        (rev 0)
+++ community-i686/blacklist_gnome-initial-setup.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -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);

Deleted: community-i686/cinnamon-session.install
===================================================================
--- community-i686/cinnamon-session.install	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-i686/cinnamon-session.install	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: cinnamon-session/repos/community-i686/cinnamon-session.install (from rev 131207, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-i686/cinnamon-session.install	                        (rev 0)
+++ community-i686/cinnamon-session.install	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: cinnamon-session/repos/community-i686/gtk316.patch (from rev 131207, cinnamon-session/trunk/gtk316.patch)
===================================================================
--- community-i686/gtk316.patch	                        (rev 0)
+++ community-i686/gtk316.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -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 ();
+ 

Deleted: community-i686/timeout.patch
===================================================================
--- community-i686/timeout.patch	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-i686/timeout.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,24 +0,0 @@
-diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
---- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
---- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0

Copied: cinnamon-session/repos/community-i686/timeout.patch (from rev 131207, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-i686/timeout.patch	                        (rev 0)
+++ community-i686/timeout.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-x86_64/PKGBUILD	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-session
-pkgver=2.4.3
-pkgrel=1
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(dbus-glib cinnamon-desktop libsm libcanberra)
-makedepends=(intltool mesa json-glib xtrans gnome-common)
-options=('!emptydirs')
-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
-        blacklist_gnome-initial-setup.patch)
-sha256sums=('07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
-            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # 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() {
-  cd $pkgname-$pkgver
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
-      --disable-schemas-compile --enable-systemd --disable-gconf
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: cinnamon-session/repos/community-x86_64/PKGBUILD (from rev 131207, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.4.3
+pkgrel=2
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(dbus-glib cinnamon-desktop libsm libcanberra)
+makedepends=(intltool mesa json-glib xtrans gnome-common)
+options=('!emptydirs')
+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
+        blacklist_gnome-initial-setup.patch
+        gtk316.patch)
+sha256sums=('07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+            '0664375a725144b9e0cabfbcd9a424bf1cc65504cc30f71d1d7ea4a8cfa5a778'
+            '012feb2ed16570a54e3b1d26b6e45677a16fbd86a3bea828b58b516885ddb871')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # 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
+
+  patch -Np1 -i ../gtk316.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/blacklist_gnome-initial-setup.patch
===================================================================
--- community-x86_64/blacklist_gnome-initial-setup.patch	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-x86_64/blacklist_gnome-initial-setup.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,14 +0,0 @@
---- 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);

Copied: cinnamon-session/repos/community-x86_64/blacklist_gnome-initial-setup.patch (from rev 131207, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
===================================================================
--- community-x86_64/blacklist_gnome-initial-setup.patch	                        (rev 0)
+++ community-x86_64/blacklist_gnome-initial-setup.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -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);

Deleted: community-x86_64/cinnamon-session.install
===================================================================
--- community-x86_64/cinnamon-session.install	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-x86_64/cinnamon-session.install	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: cinnamon-session/repos/community-x86_64/cinnamon-session.install (from rev 131207, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-x86_64/cinnamon-session.install	                        (rev 0)
+++ community-x86_64/cinnamon-session.install	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: cinnamon-session/repos/community-x86_64/gtk316.patch (from rev 131207, cinnamon-session/trunk/gtk316.patch)
===================================================================
--- community-x86_64/gtk316.patch	                        (rev 0)
+++ community-x86_64/gtk316.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -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 ();
+ 

Deleted: community-x86_64/timeout.patch
===================================================================
--- community-x86_64/timeout.patch	2015-04-12 01:17:36 UTC (rev 131207)
+++ community-x86_64/timeout.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -1,24 +0,0 @@
-diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
---- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
---- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0

Copied: cinnamon-session/repos/community-x86_64/timeout.patch (from rev 131207, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-x86_64/timeout.patch	                        (rev 0)
+++ community-x86_64/timeout.patch	2015-04-12 01:19:21 UTC (rev 131208)
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0



More information about the arch-commits mailing list