Date: Tuesday, July 5, 2011 @ 02:30:24 Author: bisson Revision: 130320
upstream update Added: gcin/trunk/qt4-lib64.patch Modified: gcin/trunk/PKGBUILD Deleted: gcin/trunk/fix_qt4_paths.patch gcin/trunk/fix_x86_64_libdir.patch -------------------------+ PKGBUILD | 17 ++++++----------- fix_qt4_paths.patch | 31 ------------------------------- fix_x86_64_libdir.patch | 12 ------------ qt4-lib64.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-07-04 23:46:17 UTC (rev 130319) +++ PKGBUILD 2011-07-05 06:30:24 UTC (rev 130320) @@ -4,32 +4,27 @@ # Contributor: damir <[email protected]> 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 } Deleted: fix_qt4_paths.patch =================================================================== --- fix_qt4_paths.patch 2011-07-04 23:46:17 UTC (rev 130319) +++ fix_qt4_paths.patch 2011-07-05 06:30:24 UTC (rev 130320) @@ -1,31 +0,0 @@ -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' --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 -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 -+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) ;\ Deleted: fix_x86_64_libdir.patch =================================================================== --- fix_x86_64_libdir.patch 2011-07-04 23:46:17 UTC (rev 130319) +++ fix_x86_64_libdir.patch 2011-07-05 06:30:24 UTC (rev 130320) @@ -1,12 +0,0 @@ -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 --LIB='lib64' -+LIB='lib' - fi - - QT_IM='N' Added: qt4-lib64.patch =================================================================== --- qt4-lib64.patch (rev 0) +++ qt4-lib64.patch 2011-07-05 06:30:24 UTC (rev 130320) @@ -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) ;\
