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

Alexandre Filgueira faidoc at nymeria.archlinux.org
Mon Mar 10 20:57:25 UTC 2014 

    Date: Monday, March 10, 2014 @ 21:57:25
  Author: faidoc
Revision: 106943

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

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

------------------------------------------------+
 /PKGBUILD                                      |   96 +++++++++++++++++++++++
 /cinnamon-session.install                      |   24 +++++
 /remove_sessionmigration.patch                 |   36 ++++++++
 /timeout.patch                                 |   48 +++++++++++
 community-i686/PKGBUILD                        |   48 -----------
 community-i686/cinnamon-session.install        |   12 --
 community-i686/remove_sessionmigration.patch   |   18 ----
 community-i686/timeout.patch                   |   24 -----
 community-x86_64/PKGBUILD                      |   48 -----------
 community-x86_64/cinnamon-session.install      |   12 --
 community-x86_64/remove_sessionmigration.patch |   18 ----
 community-x86_64/timeout.patch                 |   24 -----
 12 files changed, 204 insertions(+), 204 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-i686/PKGBUILD	2014-03-10 20:57:25 UTC (rev 106943)
@@ -1,48 +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.0.6
-pkgrel=1
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(cinnamon-desktop upower)
-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
-        remove_sessionmigration.patch
-        timeout.patch)
-sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
-            'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Do not try to execute session-migration script (it's specific to Ubuntu)
-  patch -Np1 -i ../remove_sessionmigration.patch
-
-  # 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
-
-  # Prefix 'Startup Applications' with 'Cinnamon' to avoid confusion with gnome-session
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' \
-      "$pkgdir/usr/share/applications/cinnamon-session-properties.desktop"
-}

Copied: cinnamon-session/repos/community-i686/PKGBUILD (from rev 106942, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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.0.6
+pkgrel=2
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(cinnamon-desktop libsm upower)
+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
+        remove_sessionmigration.patch
+        timeout.patch)
+sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
+            'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Do not try to execute session-migration script (it's specific to Ubuntu)
+  patch -Np1 -i ../remove_sessionmigration.patch
+
+  # 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
+
+  # Prefix 'Startup Applications' with 'Cinnamon' to avoid confusion with gnome-session
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' \
+      "$pkgdir/usr/share/applications/cinnamon-session-properties.desktop"
+}

Deleted: community-i686/cinnamon-session.install
===================================================================
--- community-i686/cinnamon-session.install	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-i686/cinnamon-session.install	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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 106942, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-i686/cinnamon-session.install	                        (rev 0)
+++ community-i686/cinnamon-session.install	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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/remove_sessionmigration.patch
===================================================================
--- community-i686/remove_sessionmigration.patch	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-i686/remove_sessionmigration.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -1,18 +0,0 @@
---- a/cinnamon-session/csm-session-fill.c
-+++ b/cinnamon-session/csm-session-fill.c
-@@ -228,15 +228,6 @@
- load_standard_apps (CsmManager *manager,
-                     GKeyFile   *keyfile)
- {
--        GError *error;
--
--        g_debug ("fill: *** Executing user migration");
--        error = NULL;
--        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
--                 g_warning ("Error while executing session-migration: %s", error->message);
--                 g_error_free (error);
--        }
--
-         g_debug ("fill: *** Adding required components");
-         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
-                                     append_required_components_helper, manager);

Copied: cinnamon-session/repos/community-i686/remove_sessionmigration.patch (from rev 106942, cinnamon-session/trunk/remove_sessionmigration.patch)
===================================================================
--- community-i686/remove_sessionmigration.patch	                        (rev 0)
+++ community-i686/remove_sessionmigration.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -0,0 +1,18 @@
+--- a/cinnamon-session/csm-session-fill.c
++++ b/cinnamon-session/csm-session-fill.c
+@@ -228,15 +228,6 @@
+ load_standard_apps (CsmManager *manager,
+                     GKeyFile   *keyfile)
+ {
+-        GError *error;
+-
+-        g_debug ("fill: *** Executing user migration");
+-        error = NULL;
+-        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
+-                 g_warning ("Error while executing session-migration: %s", error->message);
+-                 g_error_free (error);
+-        }
+-
+         g_debug ("fill: *** Adding required components");
+         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
+                                     append_required_components_helper, manager);

Deleted: community-i686/timeout.patch
===================================================================
--- community-i686/timeout.patch	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-i686/timeout.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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 106942, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-i686/timeout.patch	                        (rev 0)
+++ community-i686/timeout.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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-03-10 20:56:03 UTC (rev 106942)
+++ community-x86_64/PKGBUILD	2014-03-10 20:57:25 UTC (rev 106943)
@@ -1,48 +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.0.6
-pkgrel=1
-pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(cinnamon-desktop upower)
-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
-        remove_sessionmigration.patch
-        timeout.patch)
-sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
-            'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Do not try to execute session-migration script (it's specific to Ubuntu)
-  patch -Np1 -i ../remove_sessionmigration.patch
-
-  # 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
-
-  # Prefix 'Startup Applications' with 'Cinnamon' to avoid confusion with gnome-session
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' \
-      "$pkgdir/usr/share/applications/cinnamon-session-properties.desktop"
-}

Copied: cinnamon-session/repos/community-x86_64/PKGBUILD (from rev 106942, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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.0.6
+pkgrel=2
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(cinnamon-desktop libsm upower)
+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
+        remove_sessionmigration.patch
+        timeout.patch)
+sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
+            'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Do not try to execute session-migration script (it's specific to Ubuntu)
+  patch -Np1 -i ../remove_sessionmigration.patch
+
+  # 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
+
+  # Prefix 'Startup Applications' with 'Cinnamon' to avoid confusion with gnome-session
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' \
+      "$pkgdir/usr/share/applications/cinnamon-session-properties.desktop"
+}

Deleted: community-x86_64/cinnamon-session.install
===================================================================
--- community-x86_64/cinnamon-session.install	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-x86_64/cinnamon-session.install	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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 106942, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-x86_64/cinnamon-session.install	                        (rev 0)
+++ community-x86_64/cinnamon-session.install	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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/remove_sessionmigration.patch
===================================================================
--- community-x86_64/remove_sessionmigration.patch	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-x86_64/remove_sessionmigration.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -1,18 +0,0 @@
---- a/cinnamon-session/csm-session-fill.c
-+++ b/cinnamon-session/csm-session-fill.c
-@@ -228,15 +228,6 @@
- load_standard_apps (CsmManager *manager,
-                     GKeyFile   *keyfile)
- {
--        GError *error;
--
--        g_debug ("fill: *** Executing user migration");
--        error = NULL;
--        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
--                 g_warning ("Error while executing session-migration: %s", error->message);
--                 g_error_free (error);
--        }
--
-         g_debug ("fill: *** Adding required components");
-         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
-                                     append_required_components_helper, manager);

Copied: cinnamon-session/repos/community-x86_64/remove_sessionmigration.patch (from rev 106942, cinnamon-session/trunk/remove_sessionmigration.patch)
===================================================================
--- community-x86_64/remove_sessionmigration.patch	                        (rev 0)
+++ community-x86_64/remove_sessionmigration.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -0,0 +1,18 @@
+--- a/cinnamon-session/csm-session-fill.c
++++ b/cinnamon-session/csm-session-fill.c
+@@ -228,15 +228,6 @@
+ load_standard_apps (CsmManager *manager,
+                     GKeyFile   *keyfile)
+ {
+-        GError *error;
+-
+-        g_debug ("fill: *** Executing user migration");
+-        error = NULL;
+-        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
+-                 g_warning ("Error while executing session-migration: %s", error->message);
+-                 g_error_free (error);
+-        }
+-
+         g_debug ("fill: *** Adding required components");
+         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
+                                     append_required_components_helper, manager);

Deleted: community-x86_64/timeout.patch
===================================================================
--- community-x86_64/timeout.patch	2014-03-10 20:56:03 UTC (rev 106942)
+++ community-x86_64/timeout.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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 106942, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-x86_64/timeout.patch	                        (rev 0)
+++ community-x86_64/timeout.patch	2014-03-10 20:57:25 UTC (rev 106943)
@@ -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