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

Balló György bgyorgy at archlinux.org
Sat Nov 22 18:47:38 UTC 2014


    Date: Saturday, November 22, 2014 @ 19:47:37
  Author: bgyorgy
Revision: 122936

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

Added:
  cinnamon-session/repos/community-i686/PKGBUILD
    (from rev 122935, cinnamon-session/trunk/PKGBUILD)
  cinnamon-session/repos/community-i686/blacklist_gnome-initial-setup.patch
    (from rev 122935, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
  cinnamon-session/repos/community-i686/cinnamon-session.install
    (from rev 122935, cinnamon-session/trunk/cinnamon-session.install)
  cinnamon-session/repos/community-i686/timeout.patch
    (from rev 122935, cinnamon-session/trunk/timeout.patch)
  cinnamon-session/repos/community-x86_64/PKGBUILD
    (from rev 122935, cinnamon-session/trunk/PKGBUILD)
  cinnamon-session/repos/community-x86_64/blacklist_gnome-initial-setup.patch
    (from rev 122935, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
  cinnamon-session/repos/community-x86_64/cinnamon-session.install
    (from rev 122935, cinnamon-session/trunk/cinnamon-session.install)
  cinnamon-session/repos/community-x86_64/timeout.patch
    (from rev 122935, cinnamon-session/trunk/timeout.patch)
Deleted:
  cinnamon-session/repos/community-i686/PKGBUILD
  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/cinnamon-session.install
  cinnamon-session/repos/community-x86_64/timeout.patch

------------------------------------------------------+
 /PKGBUILD                                            |   88 +++++++++++++++++
 /cinnamon-session.install                            |   24 ++++
 /timeout.patch                                       |   48 +++++++++
 community-i686/PKGBUILD                              |   40 -------
 community-i686/blacklist_gnome-initial-setup.patch   |   14 ++
 community-i686/cinnamon-session.install              |   12 --
 community-i686/timeout.patch                         |   24 ----
 community-x86_64/PKGBUILD                            |   40 -------
 community-x86_64/blacklist_gnome-initial-setup.patch |   14 ++
 community-x86_64/cinnamon-session.install            |   12 --
 community-x86_64/timeout.patch                       |   24 ----
 11 files changed, 188 insertions(+), 152 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-i686/PKGBUILD	2014-11-22 18:47:37 UTC (rev 122936)
@@ -1,40 +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.1
-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)
-sha256sums=('0fe4a1a5cc7f9f0860722ac52f55ca918c980ade3dfc500d2c90da681f1a8f4c'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.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 122935, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-22 18:47:37 UTC (rev 122936)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.4.1
+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)
+sha256sums=('0fe4a1a5cc7f9f0860722ac52f55ca918c980ade3dfc500d2c90da681f1a8f4c'
+            '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/blacklist_gnome-initial-setup.patch (from rev 122935, cinnamon-session/trunk/blacklist_gnome-initial-setup.patch)
===================================================================
--- community-i686/blacklist_gnome-initial-setup.patch	                        (rev 0)
+++ community-i686/blacklist_gnome-initial-setup.patch	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-i686/cinnamon-session.install	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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 122935, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-i686/cinnamon-session.install	                        (rev 0)
+++ community-i686/cinnamon-session.install	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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
+}

Deleted: community-i686/timeout.patch
===================================================================
--- community-i686/timeout.patch	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-i686/timeout.patch	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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 122935, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-i686/timeout.patch	                        (rev 0)
+++ community-i686/timeout.patch	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-x86_64/PKGBUILD	2014-11-22 18:47:37 UTC (rev 122936)
@@ -1,40 +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.1
-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)
-sha256sums=('0fe4a1a5cc7f9f0860722ac52f55ca918c980ade3dfc500d2c90da681f1a8f4c'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.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 122935, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-22 18:47:37 UTC (rev 122936)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.4.1
+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)
+sha256sums=('0fe4a1a5cc7f9f0860722ac52f55ca918c980ade3dfc500d2c90da681f1a8f4c'
+            '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/blacklist_gnome-initial-setup.patch (from rev 122935, 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	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-x86_64/cinnamon-session.install	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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 122935, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-x86_64/cinnamon-session.install	                        (rev 0)
+++ community-x86_64/cinnamon-session.install	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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
+}

Deleted: community-x86_64/timeout.patch
===================================================================
--- community-x86_64/timeout.patch	2014-11-22 18:47:27 UTC (rev 122935)
+++ community-x86_64/timeout.patch	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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 122935, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-x86_64/timeout.patch	                        (rev 0)
+++ community-x86_64/timeout.patch	2014-11-22 18:47:37 UTC (rev 122936)
@@ -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