[arch-commits] Commit in gcin/trunk (PKGBUILD gtk3-crash.patch)

[Gaetan Bisson]

    Date: Sunday, September 4, 2011 @ 16:40:24
  Author: bisson
Revision: 136990

possible fix for FS#25886

Added:
  gcin/trunk/gtk3-crash.patch
Modified:
  gcin/trunk/PKGBUILD

------------------+
 PKGBUILD         |    5 ++++-
 gtk3-crash.patch |   12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-04 19:07:07 UTC (rev 136989)
+++ PKGBUILD	2011-09-04 20:40:24 UTC (rev 136990)
@@ -5,7 +5,7 @@
 
 pkgname=gcin
 pkgver=1.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -17,8 +17,10 @@
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
+        'gtk3-crash.patch'
         'qt4-lib64.patch')
 sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
+          '5529884d655cf9c95e7bf5ddced3ffed140bbc20'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
@@ -26,6 +28,7 @@
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../qt4-lib64.patch
+	patch -p1 -i ../gtk3-crash.patch
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }

Added: gtk3-crash.patch
===================================================================
--- gtk3-crash.patch	                        (rev 0)
+++ gtk3-crash.patch	2011-09-04 20:40:24 UTC (rev 136990)
@@ -0,0 +1,12 @@
+diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
+--- old/gtk3-im/gtkimcontextgcin.c	2011-08-31 09:14:58.000000000 -0700
++++ new/gtk3-im/gtkimcontextgcin.c	2011-09-04 13:29:58.838065420 -0700
+@@ -127,6 +127,8 @@
+ {
+   GdkWindow *client_window = context_xim->client_window;
+   GdkScreen *screen = gdk_window_get_screen (client_window);
++  if (screen == NULL)
++	  return;
+   GdkDisplay *display = gdk_screen_get_display (screen);
+   if (!context_xim->gcin_ch) {
+     if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))