[arch-commits] Commit in gcin/trunk (PKGBUILD qt4-lib64.patch)

[Gaetan Bisson]

    Date: Saturday, December 24, 2011 @ 12:42:08
  Author: bisson
Revision: 145629

upstream update

Modified:
  gcin/trunk/PKGBUILD
  gcin/trunk/qt4-lib64.patch

-----------------+
 PKGBUILD        |    6 +++---
 qt4-lib64.patch |   26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-24 14:44:56 UTC (rev 145628)
+++ PKGBUILD	2011-12-24 17:42:08 UTC (rev 145629)
@@ -4,7 +4,7 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=gcin
-pkgver=2.6.0
+pkgver=2.6.6
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,8 +18,8 @@
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
-          '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
+sha1sums=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0'
+          '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
 

Modified: qt4-lib64.patch
===================================================================
--- qt4-lib64.patch	2011-12-24 14:44:56 UTC (rev 145628)
+++ qt4-lib64.patch	2011-12-24 17:42:08 UTC (rev 145629)
@@ -1,6 +1,6 @@
 diff -aur old/configure new/configure
---- old/configure	2011-11-07 06:51:12.000000000 +1100
-+++ new/configure	2011-11-25 14:02:10.819256960 +1100
+--- old/configure	2011-12-21 00:48:03.000000000 +1100
++++ new/configure	2011-12-25 04:06:14.424317251 +1100
 @@ -188,7 +188,7 @@
  
  
@@ -10,9 +10,18 @@
  echo "testing if you have qt4 support"
  pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
  if [ $? = 0 ]; then
+@@ -245,7 +245,7 @@
+   mv gcin.spec gcin.spec.tmp
+   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+-  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
++  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
+   do
+ 	[ -x $i ] && QT4_MOC=$i
+   done
 diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-06-08 23:03:50.000000000 +1000
-+++ new/qt4-im/Makefile	2011-11-25 14:05:28.844110772 +1100
+--- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile	2011-12-25 04:06:14.424317251 +1100
 @@ -1,5 +1,5 @@
  include ../config.mak
 -QT=qt4
@@ -20,12 +29,3 @@
  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) ;\