Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 8 insertions, 22 deletions

diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 1f6d9ea22..e4a06047b 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,35 +1,21 @@
-# $Id: PKGBUILD 93582 2013-07-06 12:35:20Z fyan $
+# $Id: PKGBUILD 94235 2013-07-17 12:26:33Z 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-qt4')
-pkgver=4.2.8
-pkgrel=3
+pkgver=4.2.8.1
+pkgrel=2
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx-im.org"
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
              'iso-codes' 'gobject-introspection' 'libxkbfile')
-source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz
-        https://github.com/fcitx/fcitx/commit/b0a5439ac0188211c0955baf6811a0e3406ac812.patch
-        https://github.com/fcitx/fcitx/commit/94635187b18badb1a2dff821de9a30a20d00feb1.patch
-        https://github.com/fcitx/fcitx/commit/46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch)
+source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz)
 
 build() {
-  #source /etc/profile.d/qt4.sh
-
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  # Fix ELF file patch
-  patch -p1 -i ../b0a5439ac0188211c0955baf6811a0e3406ac812.patch
-
-  # Fix switch key issue
-  patch -p1 -i ../94635187b18badb1a2dff821de9a30a20d00feb1.patch
-  patch -p1 -i ../46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch
-
   cd "$srcdir"
   mkdir -p build
   cd build
@@ -69,11 +55,14 @@ package_fcitx() {
 	      'fcitx-gtk2: GTK2 IM Module for fcitx'
 	      'fcitx-gtk3: GTK3 IM Module for fcitx'
 	      'fcitx-hangul: Hangul (Korean) support for fcitx'
+	      'fcitx-kkc: libkkc (Japanese Kana Kanji input method) engine for 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-qt4: QT4 IM Module for fcitx'
+	      'fcitx-qt5: QT5 IM Module for fcitx'
 	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
+	      'fcitx-sayura: Sinhala Transe IME engine for fcitx'
   	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
 	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
 	      'fcitx-table-other: Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables'
@@ -129,7 +118,4 @@ package_fcitx-qt4() {
   make DESTDIR="${pkgdir}" install
 }
 
-md5sums=('79676d18536ebb9d0a0fa47e96416016'
-         '0f3f85204ac1559bbf2cff304122234e'
-         '417cd212d9fb7b9881232d57d023e49f'
-         'd91ae8316154eccce3234c55e53a3c3b')
+sha512sums=('981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72')