[arch-commits] Commit in gcin/repos (3 files)

[andyrtr at archlinux.org]

    Date: Monday, December 28, 2009 @ 13:46:03
  Author: andyrtr
Revision: 61944

Merged revisions 61942 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcin/trunk

........
  r61942 | andyrtr | 2009-12-28 18:43:58 +0000 (Mo, 28 Dez 2009) | 2 lines
  
  upgpkg: gcin 1.4.6-2
      add support for Qt4 input method; FS #17606
........

Added:
  gcin/repos/extra-x86_64/gcin-1.4.6-qt4.patch
    (from rev 61942, gcin/trunk/gcin-1.4.6-qt4.patch)
Modified:
  gcin/repos/extra-x86_64/	(properties)
  gcin/repos/extra-x86_64/PKGBUILD

----------------------+
 PKGBUILD             |    9 ++++++---
 gcin-1.4.6-qt4.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)


Property changes on: gcin/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gcin/trunk:1-61901
   + /gcin/trunk:1-61943

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-28 18:44:47 UTC (rev 61943)
+++ extra-x86_64/PKGBUILD	2009-12-28 18:46:03 UTC (rev 61944)
@@ -4,7 +4,7 @@
 
 pkgname=gcin
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Traditional Chinese Input Method Server for X window system (XIM)"
 arch=("i686" "x86_64")
 license=('LGPL')
@@ -14,14 +14,17 @@
 optdepends=('qt:	support for Qt4 Input Method')
 install=gcin.install
 source=(http://cle.linux.org.tw/gcin/download/${pkgname}-${pkgver}.tar.bz2
-	fix_x86_64_libdir.patch)
+	fix_x86_64_libdir.patch
+	gcin-1.4.6-qt4.patch)
 #options=('!makeflags')
 md5sums=('64f5ded6404d9091560c2316e9207158'
-         '2018737a07a0a7a9e0c28e11245dde14')
+         '2018737a07a0a7a9e0c28e11245dde14'
+	 'ac1e85a36ad5a32597793281e3253b84')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -Np0 -i "${srcdir}/fix_x86_64_libdir.patch" || return 1
+    patch -Np1 -i "${srcdir}/gcin-1.4.6-qt4.patch" || return 1
     ./configure --prefix=/usr || return 1
     make || return 1
     make DESTDIR="${pkgdir}" install || return 1

Copied: gcin/repos/extra-x86_64/gcin-1.4.6-qt4.patch (from rev 61942, gcin/trunk/gcin-1.4.6-qt4.patch)
===================================================================
--- extra-x86_64/gcin-1.4.6-qt4.patch	                        (rev 0)
+++ extra-x86_64/gcin-1.4.6-qt4.patch	2009-12-28 18:46:03 UTC (rev 61944)
@@ -0,0 +1,31 @@
+diff -ruN gcin-1.4.6/configure gcin-1.4.6-new/configure
+--- gcin-1.4.6/configure	2009-12-17 17:29:46.000000000 +0800
++++ gcin-1.4.6-new/configure	2009-12-28 16:46:25.000000000 +0800
+@@ -164,7 +164,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"
+ if [ -d  $QT4_IM_DIR ]; then
+   QT4_IM='Y'
+diff -ruN gcin-1.4.6/qt4-im/Makefile gcin-1.4.6-new/qt4-im/Makefile
+--- gcin-1.4.6/qt4-im/Makefile	2009-12-10 07:09:17.000000000 +0800
++++ gcin-1.4.6-new/qt4-im/Makefile	2009-12-28 16:47:59.000000000 +0800
+@@ -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) ;\