Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/sword/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/pgadmin3/PKGBUILD
	libre/lame-libre/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/tracker/PKGBUILD
	testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
	testing/udev/0002-reinstate-TIMEOUT-handling.patch
	testing/udev/PKGBUILD

5 files changed, 133 insertions, 0 deletions

diff --git a/testing/fcitx/Fix-for-gcc-4.7.0.patch b/testing/fcitx/Fix-for-gcc-4.7.0.patch
new file mode 100644
index 000000000..d02852281
--- /dev/null
+++ b/testing/fcitx/Fix-for-gcc-4.7.0.patch
@@ -0,0 +1,31 @@
+From 74ae75e291862530801ec9cc707dc810c52a84fd Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sun, 25 Mar 2012 09:59:24 +0800
+Subject: [PATCH 1/2] fix for gcc 4.7.0
+
+---
+ src/lib/fcitx-config/CMakeLists.txt |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
+index f9fd2ec..2b361c6 100644
+--- a/src/lib/fcitx-config/CMakeLists.txt
++++ b/src/lib/fcitx-config/CMakeLists.txt
+@@ -1,10 +1,13 @@
+ set(FCITX_CONFIG_SOURCES
+     fcitx-config.c
+     hotkey.c
+-    sprintf.c
+     xdg.c
+ )
+ 
++if (NOT HAVE_ASPRINTF)
++    set(FCITX_CONFIG_SOURCES ${FCITX_CONFIG_SOURCES} sprintf.c)
++endif (NOT HAVE_ASPRINTF)
++
+ set(FCITX_CONFIG_HEADERS
+     fcitx-config.h
+     hotkey.h
+-- 
+1.7.9.4
+
diff --git a/testing/fcitx/PKGBUILD b/testing/fcitx/PKGBUILD
new file mode 100644
index 000000000..2e4a2d55e
--- /dev/null
+++ b/testing/fcitx/PKGBUILD
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 155932 2012-04-09 13:40:42Z andyrtr $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.2.1
+pkgrel=2
+arch=('i686' 'x86_64')
+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.xz Fix-for-gcc-4.7.0.patch)
+sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215'
+          '3f9a31d67cdbbb25f2151cb81208f1f3e0dd6e8f')
+
+build() {
+  cd "${srcdir}"
+  (cd ${pkgbase}-${pkgver}; patch -p1 -i ../Fix-for-gcc-4.7.0.patch)
+  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_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \
+           'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
+  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
+}
diff --git a/testing/fcitx/fcitx-gtk2.install b/testing/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/testing/fcitx/fcitx-gtk2.install
@@ -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
+}
diff --git a/testing/fcitx/fcitx-gtk3.install b/testing/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/testing/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/testing/fcitx/fcitx.install b/testing/fcitx/fcitx.install
new file mode 100644
index 000000000..7f156e002
--- /dev/null
+++ b/testing/fcitx/fcitx.install
@@ -0,0 +1,13 @@
+post_install() {
+  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() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}