[arch-commits] Commit in cinnamon-session/trunk (2 files)

[Balló György]

    Date: Wednesday, October 8, 2014 @ 19:05:12
  Author: bgyorgy
Revision: 120405

upgpkg: cinnamon-session 2.2.2-2

Fix compatiblility with GTK+ 3.14

Added:
  cinnamon-session/trunk/0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch
Modified:
  cinnamon-session/trunk/PKGBUILD

---------------------------------------------------------+
 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch |   45 ++++++++++++++
 PKGBUILD                                                |   13 ++--
 2 files changed, 54 insertions(+), 4 deletions(-)

Added: 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch
===================================================================
--- 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch	                        (rev 0)
+++ 0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch	2014-10-08 17:05:12 UTC (rev 120405)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-08 16:39:05 UTC (rev 120404)
+++ PKGBUILD	2014-10-08 17:05:12 UTC (rev 120405)
@@ -4,19 +4,21 @@
 
 pkgname=cinnamon-session
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Session Handler"
 arch=(i686 x86_64)
 license=(GPL LGPL)
-depends=(cinnamon-desktop libsm upower libcanberra)
+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)
+        timeout.patch
+        0001-Fix-misplaced-gtk_widget_show-s-for-gtk-3.14.patch)
 sha256sums=('16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288'
-            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a'
+            '78ef4ca45fd03ec9921b1ce02a340376223423ad54d3b256e2b7205a4f0d6d74')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -23,6 +25,9 @@
 
   # 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() {