summaryrefslogtreecommitdiff
path: root/extra/gcin
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-09-05 23:14:38 +0000
committerroot <root@rshg054.dnsready.net>2011-09-05 23:14:38 +0000
commite05f52e52ba779f4b0ebb5463dba9fc74f67f0b8 (patch)
tree426be7e1703e9b4aaec588af1dcec4ae24fe161e /extra/gcin
parentf651180e6b1ac9508ec0d1d9b94972de776020a9 (diff)
Mon Sep 5 23:14:38 UTC 2011
Diffstat (limited to 'extra/gcin')
-rw-r--r--extra/gcin/PKGBUILD7
-rw-r--r--extra/gcin/gtk3-crash.patch12
2 files changed, 17 insertions, 2 deletions
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 <bisson@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: damir <damir@archlinux.org>
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()))))