Merge branch 'master' of gparabola:abslibre-mips64el

1 files changed, 37 insertions, 15 deletions

diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index afae00724..7cd37be7d 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,24 +1,38 @@
-# $Id: PKGBUILD 82948 2013-01-26 02:17:24Z fyan $
+# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.7
-pkgrel=1
+pkgrel=8
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz)
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
+             'iso-codes' 'gobject-introspection' 'libxkbfile' 'git')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz
+	https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch
+	https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch
+	https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch
+	https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch
+)
 
 build() {
-  cd "${srcdir}"
+  #source /etc/profile.d/qt4.sh
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch"
+  patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch"
+  git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch"
+  patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch"
+
+  cd "$srcdir"
   mkdir -p build
   cd build
+
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -28,7 +42,8 @@ build() {
     -DENABLE_TEST=ON \
     -DENABLE_GTK2_IM_MODULE=ON \
     -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON
+    -DENABLE_QT_IM_MODULE=ON \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
@@ -43,7 +58,7 @@ package_fcitx() {
            'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
            'libxfixes' 'dbus-core' 'icu')
   optdepends=('enchant: for word predication support'
-	      'opencc: optional engine to do chinese convert'
+              'opencc: optional engine to do chinese convert'
   	      'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method'
 	      'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese'
 	      'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
@@ -56,7 +71,7 @@ package_fcitx() {
 	      'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin'
 	      'fcitx-m17n: Multilingual text processing library'
 	      'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)'
-	      'fcitx-qt: QT IM Module for fcitx'
+	      'fcitx-qt4: QT4 IM Module for fcitx'
 	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
   	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
 	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
@@ -70,7 +85,7 @@ package_fcitx() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 
-  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt}
+  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
   rm -r "${pkgdir}/usr/lib/fcitx/qt"
   rm -r "${pkgdir}/usr/include/fcitx-qt"
   rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper"
@@ -96,9 +111,12 @@ package_fcitx-gtk3() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_fcitx-qt() {
-  pkgdesc='QT IM Module for fcitx'
-  depends=('qt' "fcitx>=$pkgver")
+package_fcitx-qt4() {
+  pkgdesc='QT4 IM Module for fcitx'
+  depends=('qt4' "fcitx>=$pkgver")
+  replaces=('fcitx-qt')
+  provides=('fcitx-qt')
+  conflicts=('fcitx-qt')
 
   cd "${srcdir}/build/src/frontend/qt"
   make DESTDIR="${pkgdir}" install
@@ -110,4 +128,8 @@ package_fcitx-qt() {
   make DESTDIR="${pkgdir}" install
 }
 
-md5sums=('6e291717c24615b9dc9bfaa2949af3a7')
+md5sums=('6e291717c24615b9dc9bfaa2949af3a7'
+         '246e36c2232f107ed1692a52ebc43c39'
+         '6f420547bc8af9627db2e5290f758433'
+         '51e53377e1b83661f2896e25d1a46242'
+         '5e9f90817722a138b459b2bf6a926f96')