Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/perl-file-path-expand/PKGBUILD
	community/perl-file-slurp/PKGBUILD
	community/perl-getopt-argvfile/PKGBUILD
	community/perl-graphics-colornames/PKGBUILD
	community/perl-html-tableextract/PKGBUILD
	community/perl-xml-regexp/PKGBUILD
	community/perlio-eol/PKGBUILD
	community/virtualbox/PKGBUILD
	community/xemacs/PKGBUILD
	core/gawk/PKGBUILD
	extra/bogofilter/PKGBUILD
	extra/feh/PKGBUILD
	extra/gnome-phone-manager/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/samba/PKGBUILD
	extra/squirrelmail/PKGBUILD
	extra/subversion/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/xawtv/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	testing/mesa/PKGBUILD

3 files changed, 24 insertions, 32 deletions

diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index a7f0f6536..dacfd800a 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' 'mips64el')
 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/fix_x86_64_libdir.patch b/extra/gcin/fix_x86_64_libdir.patch
deleted file mode 100644
index 5f4df6a9e..000000000
--- a/extra/gcin/fix_x86_64_libdir.patch
+++ /dev/null
@@ -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'
diff --git a/extra/gcin/fix_qt4_paths.patch b/extra/gcin/qt4-lib64.patch
index b029c17e5..13cb3dc15 100644
--- a/extra/gcin/fix_qt4_paths.patch
+++ b/extra/gcin/qt4-lib64.patch
@@ -1,18 +1,27 @@
 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 @@
+--- 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"
- if [ -d  $QT4_IM_DIR ]; then
-   QT4_IM='Y'
+ 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-02-10 20:34:23.236682152 +0100
-+++ new/qt4-im/Makefile	2011-02-10 20:35:09.623348816 +0100
+--- 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
@@ -24,7 +33,7 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
  	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
  
  moc_gcin-qt.cpp:	gcin-qt.h
--	/usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
+-	/usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
 +	/usr/bin/moc $< -o moc_gcin-qt.cpp
  
  im-gcin.so: $(OBJS)