[arch-commits] Commit in fcitx/trunk (PKGBUILD)

[Felix Yan]

    Date: Tuesday, February 19, 2013 @ 05:47:56
  Author: fyan
Revision: 84455

upgpkg: fcitx 4.2.7-2 QT5 rebuild

Modified:
  fcitx/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-19 04:39:30 UTC (rev 84454)
+++ PKGBUILD	2013-02-19 04:47:56 UTC (rev 84455)
@@ -4,18 +4,20 @@
 # 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=2
 groups=('fcitx-im')
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
              'iso-codes' 'gobject-introspection' 'libxkbfile')
 source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz)
 
 build() {
+  #source /etc/profile.d/qt4.sh
+
   cd "${srcdir}"
   mkdir -p build
   cd build
@@ -56,7 +58,7 @@
 	      '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 +72,7 @@
   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 +98,11 @@
   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')
+  conflicts=('fcitx-qt')
 
   cd "${srcdir}/build/src/frontend/qt"
   make DESTDIR="${pkgdir}" install