From b215b5e985b9310dff8d992510f12a87141fe7cb Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 6 Jul 2011 23:10:44 +0000
Subject: Wed Jul  6 23:10:44 UTC 2011

---
 extra/gcin/PKGBUILD        | 19 +++++++------------
 extra/gcin/qt4-lib64.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 extra/gcin/qt4-lib64.patch

(limited to 'extra/gcin')

diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 78786a2ae..285a6ba8e 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 122612 2011-05-05 01:46:31Z bisson $
+# $Id: PKGBUILD 130320 2011-07-05 06:30:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
-url='http://cle.linux.org.tw/trac/'
+url='http://hyperrate.com/dir.php?eid=67'
 depends=('gtk2' 'libxtst')
 makedepends=('qt' 'gtk3' 'anthy')
 optdepends=('qt: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
-        'fix_x86_64_libdir.patch'
-        'fix_qt4_paths.patch')
-sha1sums=('50522908d3e64319baafb5317c0b4327bbe0fb18'
-          'e5c113e50420bf4750f5547641df6ec4b7e437e0'
-          '16d004424caed541d5baaa6874f708b1c138ab08')
+        'qt4-lib64.patch')
+sha1sums=('36ed067b354abb1e0707a4b327e2ad624cb6f88d'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	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
+	patch -p1 -i ../qt4-lib64.patch
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
new file mode 100644
index 000000000..13cb3dc15
--- /dev/null
+++ b/extra/gcin/qt4-lib64.patch
@@ -0,0 +1,40 @@
+diff -aur old/configure new/configure
+--- old/configure	2011-06-08 16:00:37.000000000 +0200
++++ new/configure	2011-07-05 08:02:33.223601351 +0200
+@@ -164,7 +164,7 @@
+ 
+ LIB='lib'
+ if [ -d /lib64 ]; then
+-LIB='lib64'
++LIB='lib'
+ fi
+ 
+ QT_IM='N'
+@@ -188,7 +188,7 @@
+ 
+ 
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
+ if [ $? = 0 ]; then
+diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile	2011-06-08 15:03:50.000000000 +0200
++++ new/qt4-im/Makefile	2011-07-05 08:04:15.717731695 +0200
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+ 
+@@ -15,7 +15,7 @@
+ 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
+ 
+ moc_gcin-qt.cpp:	gcin-qt.h
+-	/usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++	/usr/bin/moc $< -o moc_gcin-qt.cpp
+ 
+ im-gcin.so: $(OBJS)
+ 	export LD_RUN_PATH=$(gcinlibdir) ;\
-- 
cgit v1.2.3-54-g00ecf