diff options
| author | root <root@rshg054.dnsready.net> | 2011-09-08 16:35:25 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-09-08 16:35:25 +0000 |
| commit | 8cca36c97b57b8d0a7e5521647c02409eb94ade4 (patch) | |
| tree | 8e893420d3a3c3ce565a8ab627f3bbce04ac5a69 /extra/gcin | |
| parent | e63433d7f10b5c32f348d4b2cfb38c777b314420 (diff) | |
Thu Sep 8 16:35:25 UTC 2011
Diffstat (limited to 'extra/gcin')
| -rw-r--r-- | extra/gcin/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/gcin/missing.patch | 31 |
2 files changed, 40 insertions, 6 deletions
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index ef8002d16..74172e954 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137064 2011-09-05 20:37:32Z bisson $ +# $Id: PKGBUILD 137498 2011-09-07 18:03:42Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.6.6 -pkgrel=1 +pkgver=1.6.8 +pkgrel=2 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64') license=('LGPL') @@ -17,15 +17,18 @@ 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.xz" - 'qt4-lib64.patch') -sha1sums=('d230f8cd0bd1d16321a49e51e42869fd18c3f399' - '4307b0d7d6dc10f15909c94973c4357caf31de7e') + 'qt4-lib64.patch' + 'missing.patch') +sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d' + '4307b0d7d6dc10f15909c94973c4357caf31de7e' + '791c190c8b0db2e70b0099d4d03a32417497d065') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../missing.patch patch -p1 -i ../qt4-lib64.patch sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ diff --git a/extra/gcin/missing.patch b/extra/gcin/missing.patch new file mode 100644 index 000000000..3d8737392 --- /dev/null +++ b/extra/gcin/missing.patch @@ -0,0 +1,31 @@ +diff -aur old/gen-dist new/gen-dist +--- old/gen-dist 2011-09-07 10:51:59.214132579 -0700 ++++ new/gen-dist 2011-09-07 10:53:27.534010656 -0700 +@@ -1,5 +1,5 @@ + GCIN_VERSION="gcin-`cat VERSION.gcin`" +-sh gen-gtk3 ++#sh gen-gtk3 + sed -i '/^$/d' Changelog.html + rm -f tags core.* + cd .. +diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c +--- old/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:51:59.224132565 -0700 ++++ new/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:53:09.984034884 -0700 +@@ -128,7 +128,7 @@ + GdkWindow *client_window = context_xim->client_window; + if (!client_window) + return; +- GdkScreen *screen = gdk_drawable_get_screen (client_window); ++ GdkScreen *screen = gdk_window_get_screen (client_window); + if (!screen) + return; + +@@ -137,7 +137,7 @@ + return; + + if (!context_xim->gcin_ch) { +- if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY()))) ++ if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) + perror("cannot open gcin_ch"); + #if 1 + context_xim->timeout_handle = 0; |