diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
| commit | 4a9023500f5b915ccbf556296c756ce3f2faef5b (patch) | |
| tree | 28258893f8d5094fdb84ede1e97afa36a5276696 /extra/fcitx | |
| parent | 3dac66779d53dc58badb4f964177f7692c1bd92c (diff) | |
| parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/smb4k/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/xfig/PKGBUILD
Diffstat (limited to 'extra/fcitx')
| -rw-r--r-- | extra/fcitx/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/fcitx/fcitx.install | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 00ddeae8a..9d8416a66 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139597 2011-10-03 17:18:33Z andrea $ +# $Id: PKGBUILD 148644 2012-02-05 01:57:05Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.1.2 +pkgver=4.2.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('d2d4e725b1c2ed60543d466504954b631d5689e3') +sha1sums=('b3c09f1eda7fb71208d348c34389dc824d6b2a80') build() { cd "${srcdir}" @@ -28,7 +28,8 @@ build() { package_fcitx() { pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system" - depends=('dbus-core' 'pango') + depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \ + 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') install=fcitx.install cd "${srcdir}"/build diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install index 316bccffe..7f156e002 100644 --- a/extra/fcitx/fcitx.install +++ b/extra/fcitx/fcitx.install @@ -1,6 +1,7 @@ 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 + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } post_upgrade() { |