Date: Wednesday, May 20, 2015 @ 03:14:42 Author: faidoc Revision: 133854
upgpkg: cinnamon-session 2.6.0-1 Modified: cinnamon-session/trunk/PKGBUILD Deleted: cinnamon-session/trunk/blacklist_gnome-initial-setup.patch cinnamon-session/trunk/gtk316.patch -------------------------------------+ PKGBUILD | 18 +++++------------- blacklist_gnome-initial-setup.patch | 14 -------------- gtk316.patch | 21 --------------------- 3 files changed, 5 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-20 01:13:54 UTC (rev 133853) +++ PKGBUILD 2015-05-20 01:14:42 UTC (rev 133854) @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) <[email protected]> pkgname=cinnamon-session -pkgver=2.4.3 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc="The Cinnamon Session Handler" arch=(i686 x86_64) license=(GPL LGPL) @@ -14,13 +14,9 @@ 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') + timeout.patch) +sha256sums=('b738fb4d1f8b93e2217b2c7e0d905e964e0ebde726a4cf5a28296e3eba7daab7' + 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a') prepare() { cd $pkgname-$pkgver @@ -28,10 +24,6 @@ # 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() { Deleted: blacklist_gnome-initial-setup.patch =================================================================== --- blacklist_gnome-initial-setup.patch 2015-05-20 01:13:54 UTC (rev 133853) +++ blacklist_gnome-initial-setup.patch 2015-05-20 01:14:42 UTC (rev 133854) @@ -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); Deleted: gtk316.patch =================================================================== --- gtk316.patch 2015-05-20 01:13:54 UTC (rev 133853) +++ gtk316.patch 2015-05-20 01:14:42 UTC (rev 133854) @@ -1,21 +0,0 @@ -From 70893dc7a32fb983f44c8e9be07ffe65baf6bbd3 Mon Sep 17 00:00:00 2001 -From: Michael Webster <[email protected]> -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 (); -
