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

[Andrea Scarpino]

    Date: Saturday, September 3, 2011 @ 06:32:40
  Author: andrea
Revision: 136942

upgpkg: fcitx 4.1.0-1

upstream release; split frontends

Added:
  fcitx/trunk/fcitx-gtk2.install
  fcitx/trunk/fcitx-gtk3.install
  fcitx/trunk/fcitx.install
Modified:
  fcitx/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   63 ++++++++++++++++++++++++++++++++++++++++-----------
 fcitx-gtk2.install |   11 ++++++++
 fcitx-gtk3.install |   11 ++++++++
 fcitx.install      |   12 +++++++++
 4 files changed, 84 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-03 09:56:30 UTC (rev 136941)
+++ PKGBUILD	2011-09-03 10:32:40 UTC (rev 136942)
@@ -1,27 +1,64 @@
 # $Id$
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
 
-pkgname=fcitx
-pkgver=4.0.1
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-depends=('dbus-core' 'pango')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('22d48cd65ae6ee36e49c0ed07761a3cb2f7e2669')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
 }
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'icu' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
+  make DESTDIR="${pkgdir}" install
+}

Added: fcitx-gtk2.install
===================================================================
--- fcitx-gtk2.install	                        (rev 0)
+++ fcitx-gtk2.install	2011-09-03 10:32:40 UTC (rev 136942)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Added: fcitx-gtk3.install
===================================================================
--- fcitx-gtk3.install	                        (rev 0)
+++ fcitx-gtk3.install	2011-09-03 10:32:40 UTC (rev 136942)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Added: fcitx.install
===================================================================
--- fcitx.install	                        (rev 0)
+++ fcitx.install	2011-09-03 10:32:40 UTC (rev 136942)
@@ -0,0 +1,12 @@
+post_install() {
+  [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
+  [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}