From e05f52e52ba779f4b0ebb5463dba9fc74f67f0b8 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 5 Sep 2011 23:14:38 +0000 Subject: Mon Sep 5 23:14:38 UTC 2011 --- extra/gcin/PKGBUILD | 7 +++++-- extra/gcin/gtk3-crash.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 extra/gcin/gtk3-crash.patch (limited to 'extra/gcin') diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 41a1bf574..dc0a8fdfe 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136756 2011-09-01 08:20:58Z bisson $ +# $Id: PKGBUILD 136997 2011-09-05 01:18:48Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir 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 @@ optdepends=('qt: support for qt4 input method' '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 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../qt4-lib64.patch + patch -p1 -i ../gtk3-crash.patch ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/gcin/gtk3-crash.patch b/extra/gcin/gtk3-crash.patch new file mode 100644 index 000000000..17cfa6c2d --- /dev/null +++ b/extra/gcin/gtk3-crash.patch @@ -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())))) -- cgit v1.2.3-54-g00ecf