diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
commit | 127dc69a077301eaf514a49a1c8f883584396e1c (patch) | |
tree | a48e082ea38a50dee109bbfe7d977b5a81c3c4a1 /community/fcitx/PKGBUILD | |
parent | b820811488f4e50bbff8e8e84af774adc79375d9 (diff) | |
parent | a247f0004e94d32b5fe69a5123e1c6684d8cf096 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/audit/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/dia/PKGBUILD
community/gedit-plugins/PKGBUILD
community/giggle/PKGBUILD
community/gitg/PKGBUILD
community/gmic/PKGBUILD
community/gnome-applets/PKGBUILD
community/gnome-panel/PKGBUILD
community/gnome-screensaver/PKGBUILD
community/gtranslator/PKGBUILD
community/metacity/PKGBUILD
community/zeitgeist-datahub/PKGBUILD
core/glib2/PKGBUILD
core/perl/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/brltty/PKGBUILD
extra/cheese/PKGBUILD
extra/clutter/PKGBUILD
extra/cogl/PKGBUILD
extra/devhelp/PKGBUILD
extra/empathy/PKGBUILD
extra/eog/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gcr/PKGBUILD
extra/gdl/PKGBUILD
extra/gedit/PKGBUILD
extra/gjs/PKGBUILD
extra/glade/PKGBUILD
extra/glib-networking/PKGBUILD
extra/gnome-calculator/PKGBUILD
extra/gnome-contacts/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-documents/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-games/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-session/PKGBUILD
extra/gnome-terminal/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo-plugins/PKGBUILD
extra/gssdp/PKGBUILD
extra/gthumb/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gtksourceview3/PKGBUILD
extra/gucharmap/PKGBUILD
extra/gupnp-av/PKGBUILD
extra/gupnp-dlna/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/gupnp/PKGBUILD
extra/gvfs/PKGBUILD
extra/js/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgee/PKGBUILD
extra/libgweather/PKGBUILD
extra/liboauth/PKGBUILD
extra/libpeas/PKGBUILD
extra/librsvg/PKGBUILD
extra/libsocialweb/PKGBUILD
extra/libsoup/PKGBUILD
extra/mash/PKGBUILD
extra/modemmanager/PKGBUILD
extra/mutter/PKGBUILD
extra/mysql/PKGBUILD
extra/nautilus-sendto/PKGBUILD
extra/nautilus/PKGBUILD
extra/network-manager-applet/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/p11-kit/PKGBUILD
extra/pango/PKGBUILD
extra/pangomm/PKGBUILD
extra/polkit/PKGBUILD
extra/pygobject/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/rygel/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/totem/PKGBUILD
extra/vala/PKGBUILD
extra/vinagre/PKGBUILD
extra/vte3/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/yelp/PKGBUILD
extra/zeitgeist/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'community/fcitx/PKGBUILD')
-rw-r--r-- | community/fcitx/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 6ca866d24..7cd37be7d 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88243 2013-04-15 01:48:05Z 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> @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=6 +pkgrel=8 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" @@ -17,6 +17,7 @@ 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() { @@ -26,6 +27,7 @@ build() { 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 @@ -56,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' @@ -127,6 +129,7 @@ package_fcitx-qt4() { } md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - 'ce299aa5b596cc52dc9e66b47795e627' + '246e36c2232f107ed1692a52ebc43c39' '6f420547bc8af9627db2e5290f758433' - '51e53377e1b83661f2896e25d1a46242') + '51e53377e1b83661f2896e25d1a46242' + '5e9f90817722a138b459b2bf6a926f96') |