[arch-commits] Commit in gcin/trunk (PKGBUILD install)

[Gaetan Bisson]

    Date: Monday, May 2, 2011 @ 14:01:07
  Author: bisson
Revision: 122190

fix FS#24051

Modified:
  gcin/trunk/PKGBUILD
  gcin/trunk/install

----------+
 PKGBUILD |   10 +++++++---
 install  |   11 ++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-02 18:00:23 UTC (rev 122189)
+++ PKGBUILD	2011-05-02 18:01:07 UTC (rev 122190)
@@ -5,14 +5,16 @@
 
 pkgname=gcin
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url='http://cle.linux.org.tw/gcin/download/'
 depends=('gtk2' 'libxtst')
-makedepends=('anthy' 'qt')
-optdepends=('qt: support for qt4 input method')
+makedepends=('qt' 'gtk3' 'anthy')
+optdepends=('qt: support for qt4 input method'
+            'gtk3: support for gtk3 input method'
+            'anthy: support for anthy input method')
 source=("${url}${pkgname}-${pkgver}.tar.bz2"
         'fix_x86_64_libdir.patch'
         'fix_qt4_paths.patch')
@@ -26,6 +28,8 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../fix_x86_64_libdir.patch
 	patch -p1 -i ../fix_qt4_paths.patch
+	sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile
+	sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }

Modified: install
===================================================================
--- install	2011-05-02 18:00:23 UTC (rev 122189)
+++ install	2011-05-02 18:01:07 UTC (rev 122190)
@@ -1,13 +1,14 @@
 post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
+	echo -n "updating gtk immodules... "
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache
+	echo "done."
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }