[arch-commits] Commit in fcitx/repos (7 files)

[andyrtr at archlinux.org]

    Date: Monday, April 9, 2012 @ 09:40:40
  Author: andyrtr
Revision: 155931

db-move: moved fcitx from [staging] to [testing] (i686)

Added:
  fcitx/repos/testing-i686/
  fcitx/repos/testing-i686/Fix-for-gcc-4.7.0.patch
    (from rev 155924, fcitx/repos/staging-i686/Fix-for-gcc-4.7.0.patch)
  fcitx/repos/testing-i686/PKGBUILD
    (from rev 155924, fcitx/repos/staging-i686/PKGBUILD)
  fcitx/repos/testing-i686/fcitx-gtk2.install
    (from rev 155924, fcitx/repos/staging-i686/fcitx-gtk2.install)
  fcitx/repos/testing-i686/fcitx-gtk3.install
    (from rev 155924, fcitx/repos/staging-i686/fcitx-gtk3.install)
  fcitx/repos/testing-i686/fcitx.install
    (from rev 155924, fcitx/repos/staging-i686/fcitx.install)
Deleted:
  fcitx/repos/staging-i686/

-------------------------+
 Fix-for-gcc-4.7.0.patch |   31 +++++++++++++++++++++
 PKGBUILD                |   67 ++++++++++++++++++++++++++++++++++++++++++++++
 fcitx-gtk2.install      |   11 +++++++
 fcitx-gtk3.install      |   11 +++++++
 fcitx.install           |   13 ++++++++
 5 files changed, 133 insertions(+)

Copied: fcitx/repos/testing-i686/Fix-for-gcc-4.7.0.patch (from rev 155924, fcitx/repos/staging-i686/Fix-for-gcc-4.7.0.patch)
===================================================================
--- testing-i686/Fix-for-gcc-4.7.0.patch	                        (rev 0)
+++ testing-i686/Fix-for-gcc-4.7.0.patch	2012-04-09 13:40:40 UTC (rev 155931)
@@ -0,0 +1,31 @@
+From 74ae75e291862530801ec9cc707dc810c52a84fd Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt at 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
+

Copied: fcitx/repos/testing-i686/PKGBUILD (from rev 155924, fcitx/repos/staging-i686/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-04-09 13:40:40 UTC (rev 155931)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at 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
+}

Copied: fcitx/repos/testing-i686/fcitx-gtk2.install (from rev 155924, fcitx/repos/staging-i686/fcitx-gtk2.install)
===================================================================
--- testing-i686/fcitx-gtk2.install	                        (rev 0)
+++ testing-i686/fcitx-gtk2.install	2012-04-09 13:40:40 UTC (rev 155931)
@@ -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
+}

Copied: fcitx/repos/testing-i686/fcitx-gtk3.install (from rev 155924, fcitx/repos/staging-i686/fcitx-gtk3.install)
===================================================================
--- testing-i686/fcitx-gtk3.install	                        (rev 0)
+++ testing-i686/fcitx-gtk3.install	2012-04-09 13:40:40 UTC (rev 155931)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: fcitx/repos/testing-i686/fcitx.install (from rev 155924, fcitx/repos/staging-i686/fcitx.install)
===================================================================
--- testing-i686/fcitx.install	                        (rev 0)
+++ testing-i686/fcitx.install	2012-04-09 13:40:40 UTC (rev 155931)
@@ -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
+}