[arch-commits] Commit in gcin/trunk (5 files)

[Gaetan Bisson]

    Date: Thursday, February 10, 2011 @ 15:12:52
  Author: bisson
Revision: 109564

upstream update, some cleanup, and enable i18n

Added:
  gcin/trunk/install
    (from rev 109558, gcin/trunk/gcin.install)
Modified:
  gcin/trunk/PKGBUILD
  gcin/trunk/fix_qt4_paths.patch
  gcin/trunk/fix_x86_64_libdir.patch
Deleted:
  gcin/trunk/gcin.install

-------------------------+
 PKGBUILD                |   32 ++++++++++++++++----------------
 fix_qt4_paths.patch     |   14 +++++++-------
 fix_x86_64_libdir.patch |    7 ++++---
 gcin.install            |   13 -------------
 install                 |   13 +++++++++++++
 5 files changed, 40 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-10 19:33:54 UTC (rev 109563)
+++ PKGBUILD	2011-02-10 20:12:52 UTC (rev 109564)
@@ -3,33 +3,33 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=gcin
-pkgver=1.5.6
+pkgver=1.5.7
 pkgrel=1
-pkgdesc='Traditional Chinese Input Method Server for X window system (XIM)'
+pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url='http://www.csie.nctu.edu.tw/~cp76/gcin/'
-depends=('gtk2>=2.16.1' 'libxtst')
+depends=('gtk2' 'libxtst')
 makedepends=('anthy' 'qt')
-optdepends=('qt:	support for Qt4 Input Method')
-install=gcin.install
+optdepends=('qt: support for qt4 input method')
 source=("http://cle.linux.org.tw/gcin/download/${pkgname}-${pkgver}.tar.bz2"
         'fix_x86_64_libdir.patch'
         'fix_qt4_paths.patch')
-#options=('!makeflags')
-sha1sums=('a72bece13c10b76fb12f067678b90018cad9d8dc'
-          '60113b605bc509d660f03852be546ea757710f99'
-          '1664ab0c760d2e769ee8a90c0879928b21fd7ae1')
+sha1sums=('3b2a2e3505beac8f4902be140702b5817ea76421'
+          'e5c113e50420bf4750f5547641df6ec4b7e437e0'
+          '16d004424caed541d5baaa6874f708b1c138ab08')
 
+install=install
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/fix_x86_64_libdir.patch"
-  patch -Np1 -i "${srcdir}/fix_qt4_paths.patch"
-  ./configure --prefix=/usr
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i "${srcdir}/fix_x86_64_libdir.patch"
+	patch -p1 -i "${srcdir}/fix_qt4_paths.patch"
+	./configure --prefix=/usr --use_i18n=Y
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }

Modified: fix_qt4_paths.patch
===================================================================
--- fix_qt4_paths.patch	2011-02-10 19:33:54 UTC (rev 109563)
+++ fix_qt4_paths.patch	2011-02-10 20:12:52 UTC (rev 109564)
@@ -1,7 +1,7 @@
-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 @@
+diff -aur old/configure new/configure
+--- old/configure	2011-02-10 20:34:48.153348697 +0100
++++ new/configure	2011-02-10 20:35:09.623348816 +0100
+@@ -174,7 +174,7 @@
  
  
  QT4_IM='N'
@@ -10,9 +10,9 @@
  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
+diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile	2011-02-10 20:34:23.236682152 +0100
++++ new/qt4-im/Makefile	2011-02-10 20:35:09.623348816 +0100
 @@ -1,5 +1,5 @@
  include ../config.mak
 -QT=qt4

Modified: fix_x86_64_libdir.patch
===================================================================
--- fix_x86_64_libdir.patch	2011-02-10 19:33:54 UTC (rev 109563)
+++ fix_x86_64_libdir.patch	2011-02-10 20:12:52 UTC (rev 109564)
@@ -1,6 +1,7 @@
---- configure	2008-01-11 01:00:35.000000000 +0000
-+++ configure.new	2008-12-12 21:06:41.064992082 +0000
-@@ -108,7 +108,7 @@
+diff -aur old/configure new/configure
+--- old/configure	2011-02-10 20:34:20.943348819 +0100
++++ new/configure	2011-02-10 20:34:48.153348697 +0100
+@@ -151,7 +151,7 @@
  
  LIB='lib'
  if [ -d /lib64 ]; then

Deleted: gcin.install
===================================================================
--- gcin.install	2011-02-10 19:33:54 UTC (rev 109563)
+++ gcin.install	2011-02-10 20:12:52 UTC (rev 109564)
@@ -1,13 +0,0 @@
-post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gcin/trunk/install (from rev 109558, gcin/trunk/gcin.install)
===================================================================
--- install	                        (rev 0)
+++ install	2011-02-10 20:12:52 UTC (rev 109564)
@@ -0,0 +1,13 @@
+post_install() {
+  echo -n "updating gtk.immodules... "
+  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  echo "done."
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}