[arch-commits] Commit in cinnamon-session/repos (10 files)
Balló György
bgyorgy at archlinux.org
Wed Oct 8 17:05:37 UTC 2014
Date: Wednesday, October 8, 2014 @ 19:05:37
Author: bgyorgy
Revision: 120406
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
cinnamon-session/repos/community-testing-i686/
cinnamon-session/repos/community-testing-i686/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch
(from rev 120405, cinnamon-session/trunk/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
cinnamon-session/repos/community-testing-i686/PKGBUILD
(from rev 120405, cinnamon-session/trunk/PKGBUILD)
cinnamon-session/repos/community-testing-i686/cinnamon-session.install
(from rev 120405, cinnamon-session/trunk/cinnamon-session.install)
cinnamon-session/repos/community-testing-i686/timeout.patch
(from rev 120405, cinnamon-session/trunk/timeout.patch)
cinnamon-session/repos/community-testing-x86_64/
cinnamon-session/repos/community-testing-x86_64/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch
(from rev 120405, cinnamon-session/trunk/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
cinnamon-session/repos/community-testing-x86_64/PKGBUILD
(from rev 120405, cinnamon-session/trunk/PKGBUILD)
cinnamon-session/repos/community-testing-x86_64/cinnamon-session.install
(from rev 120405, cinnamon-session/trunk/cinnamon-session.install)
cinnamon-session/repos/community-testing-x86_64/timeout.patch
(from rev 120405, cinnamon-session/trunk/timeout.patch)
----------------------------------------------------------------------------------+
community-testing-i686/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch | 45 ++++++++++
community-testing-i686/PKGBUILD | 44 +++++++++
community-testing-i686/cinnamon-session.install | 12 ++
community-testing-i686/timeout.patch | 24 +++++
community-testing-x86_64/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch | 45 ++++++++++
community-testing-x86_64/PKGBUILD | 44 +++++++++
community-testing-x86_64/cinnamon-session.install | 12 ++
community-testing-x86_64/timeout.patch | 24 +++++
8 files changed, 250 insertions(+)
Copied: cinnamon-session/repos/community-testing-i686/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch (from rev 120405, cinnamon-session/trunk/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
===================================================================
--- community-testing-i686/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch (rev 0)
+++ community-testing-i686/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch 2014-10-08 17:05:37 UTC (rev 120406)
@@ -0,0 +1,45 @@
+diff --git a/capplet/csm-app-dialog.c b/capplet/csm-app-dialog.c
+index df177f0..c1001e8 100644
+--- a/capplet/csm-app-dialog.c
++++ b/capplet/csm-app-dialog.c
+@@ -270,8 +270,6 @@ csm_app_dialog_constructor (GType type,
+
+ setup_dialog (dialog);
+
+- gtk_widget_show_all (GTK_WIDGET (dialog));
+-
+ return G_OBJECT (dialog);
+ }
+
+diff --git a/capplet/csm-properties-dialog.c b/capplet/csm-properties-dialog.c
+index 5ccb815..5c2cc56 100644
+--- a/capplet/csm-properties-dialog.c
++++ b/capplet/csm-properties-dialog.c
+@@ -374,6 +374,7 @@ on_add_app_clicked (GtkWidget *widget,
+ gtk_window_set_transient_for (GTK_WINDOW (add_dialog),
+ GTK_WINDOW (dialog));
+
++ gtk_widget_show_all (add_dialog);
+ if (csm_app_dialog_run (CSM_APP_DIALOG (add_dialog),
+ &name, &exec, &comment, &delay)) {
+ csp_app_create (name, comment, exec, delay);
+@@ -444,6 +445,7 @@ on_edit_app_clicked (GtkWidget *widget,
+ gtk_window_set_transient_for (GTK_WINDOW (edit_dialog),
+ GTK_WINDOW (dialog));
+
++ gtk_widget_show_all (edit_dialog);
+ if (csm_app_dialog_run (CSM_APP_DIALOG (edit_dialog),
+ &name, &exec, &comment, &delay)) {
+ csp_app_update (app, name, comment, exec, delay);
+@@ -678,8 +680,6 @@ csm_properties_dialog_constructor (GType type,
+
+ setup_dialog (dialog);
+
+- gtk_widget_show (GTK_WIDGET (dialog));
+-
+ return G_OBJECT (dialog);
+ }
+
+--
+1.9.3
+
Copied: cinnamon-session/repos/community-testing-i686/PKGBUILD (from rev 120405, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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.2.2
+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
+ 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
+sha256sums=('16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288'
+ 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+ '78ef4ca45fd03ec9921b1ce02a340376223423ad54d3b256e2b7205a4f0d6d74')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+
+ # Fix cinnamon-session-properties for GTK+ 3.14
+ patch -Np1 -i ../0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.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-testing-i686/cinnamon-session.install (from rev 120405, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-testing-i686/cinnamon-session.install (rev 0)
+++ community-testing-i686/cinnamon-session.install 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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-testing-i686/timeout.patch (from rev 120405, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-testing-i686/timeout.patch (rev 0)
+++ community-testing-i686/timeout.patch 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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
Copied: cinnamon-session/repos/community-testing-x86_64/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch (from rev 120405, cinnamon-session/trunk/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
===================================================================
--- community-testing-x86_64/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch (rev 0)
+++ community-testing-x86_64/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch 2014-10-08 17:05:37 UTC (rev 120406)
@@ -0,0 +1,45 @@
+diff --git a/capplet/csm-app-dialog.c b/capplet/csm-app-dialog.c
+index df177f0..c1001e8 100644
+--- a/capplet/csm-app-dialog.c
++++ b/capplet/csm-app-dialog.c
+@@ -270,8 +270,6 @@ csm_app_dialog_constructor (GType type,
+
+ setup_dialog (dialog);
+
+- gtk_widget_show_all (GTK_WIDGET (dialog));
+-
+ return G_OBJECT (dialog);
+ }
+
+diff --git a/capplet/csm-properties-dialog.c b/capplet/csm-properties-dialog.c
+index 5ccb815..5c2cc56 100644
+--- a/capplet/csm-properties-dialog.c
++++ b/capplet/csm-properties-dialog.c
+@@ -374,6 +374,7 @@ on_add_app_clicked (GtkWidget *widget,
+ gtk_window_set_transient_for (GTK_WINDOW (add_dialog),
+ GTK_WINDOW (dialog));
+
++ gtk_widget_show_all (add_dialog);
+ if (csm_app_dialog_run (CSM_APP_DIALOG (add_dialog),
+ &name, &exec, &comment, &delay)) {
+ csp_app_create (name, comment, exec, delay);
+@@ -444,6 +445,7 @@ on_edit_app_clicked (GtkWidget *widget,
+ gtk_window_set_transient_for (GTK_WINDOW (edit_dialog),
+ GTK_WINDOW (dialog));
+
++ gtk_widget_show_all (edit_dialog);
+ if (csm_app_dialog_run (CSM_APP_DIALOG (edit_dialog),
+ &name, &exec, &comment, &delay)) {
+ csp_app_update (app, name, comment, exec, delay);
+@@ -678,8 +680,6 @@ csm_properties_dialog_constructor (GType type,
+
+ setup_dialog (dialog);
+
+- gtk_widget_show (GTK_WIDGET (dialog));
+-
+ return G_OBJECT (dialog);
+ }
+
+--
+1.9.3
+
Copied: cinnamon-session/repos/community-testing-x86_64/PKGBUILD (from rev 120405, cinnamon-session/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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.2.2
+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
+ 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
+sha256sums=('16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288'
+ 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+ '78ef4ca45fd03ec9921b1ce02a340376223423ad54d3b256e2b7205a4f0d6d74')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+
+ # Fix cinnamon-session-properties for GTK+ 3.14
+ patch -Np1 -i ../0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.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-testing-x86_64/cinnamon-session.install (from rev 120405, cinnamon-session/trunk/cinnamon-session.install)
===================================================================
--- community-testing-x86_64/cinnamon-session.install (rev 0)
+++ community-testing-x86_64/cinnamon-session.install 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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-testing-x86_64/timeout.patch (from rev 120405, cinnamon-session/trunk/timeout.patch)
===================================================================
--- community-testing-x86_64/timeout.patch (rev 0)
+++ community-testing-x86_64/timeout.patch 2014-10-08 17:05:37 UTC (rev 120406)
@@ -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