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

Felix Yan fyan at archlinux.org
Thu Sep 18 02:41:39 UTC 2014


    Date: Thursday, September 18, 2014 @ 04:41:39
  Author: fyan
Revision: 119143

archrelease: copy trunk to community-i686, community-x86_64

Added:
  fcitx/repos/community-i686/PKGBUILD
    (from rev 119142, fcitx/trunk/PKGBUILD)
  fcitx/repos/community-i686/add-a-context-variable-to-disable-punc.patch
    (from rev 119142, fcitx/trunk/add-a-context-variable-to-disable-punc.patch)
  fcitx/repos/community-i686/fcitx-gtk2.install
    (from rev 119142, fcitx/trunk/fcitx-gtk2.install)
  fcitx/repos/community-i686/fcitx-gtk3.install
    (from rev 119142, fcitx/trunk/fcitx-gtk3.install)
  fcitx/repos/community-i686/fcitx.install
    (from rev 119142, fcitx/trunk/fcitx.install)
  fcitx/repos/community-x86_64/PKGBUILD
    (from rev 119142, fcitx/trunk/PKGBUILD)
  fcitx/repos/community-x86_64/add-a-context-variable-to-disable-punc.patch
    (from rev 119142, fcitx/trunk/add-a-context-variable-to-disable-punc.patch)
  fcitx/repos/community-x86_64/fcitx-gtk2.install
    (from rev 119142, fcitx/trunk/fcitx-gtk2.install)
  fcitx/repos/community-x86_64/fcitx-gtk3.install
    (from rev 119142, fcitx/trunk/fcitx-gtk3.install)
  fcitx/repos/community-x86_64/fcitx.install
    (from rev 119142, fcitx/trunk/fcitx.install)
Deleted:
  fcitx/repos/community-i686/PKGBUILD
  fcitx/repos/community-i686/add-a-context-variable-to-disable-punc.patch
  fcitx/repos/community-i686/fcitx-gtk2.install
  fcitx/repos/community-i686/fcitx-gtk3.install
  fcitx/repos/community-i686/fcitx.install
  fcitx/repos/community-x86_64/PKGBUILD
  fcitx/repos/community-x86_64/add-a-context-variable-to-disable-punc.patch
  fcitx/repos/community-x86_64/fcitx-gtk2.install
  fcitx/repos/community-x86_64/fcitx-gtk3.install
  fcitx/repos/community-x86_64/fcitx.install

---------------------------------------------------------------+
 /PKGBUILD                                                     |  204 ++++++++++
 /add-a-context-variable-to-disable-punc.patch                 |  118 +++++
 /fcitx-gtk2.install                                           |   22 +
 /fcitx-gtk3.install                                           |   22 +
 /fcitx.install                                                |   28 +
 community-i686/PKGBUILD                                       |  102 -----
 community-i686/add-a-context-variable-to-disable-punc.patch   |   59 --
 community-i686/fcitx-gtk2.install                             |   11 
 community-i686/fcitx-gtk3.install                             |   11 
 community-i686/fcitx.install                                  |   14 
 community-x86_64/PKGBUILD                                     |  102 -----
 community-x86_64/add-a-context-variable-to-disable-punc.patch |   59 --
 community-x86_64/fcitx-gtk2.install                           |   11 
 community-x86_64/fcitx-gtk3.install                           |   11 
 community-x86_64/fcitx.install                                |   14 
 15 files changed, 394 insertions(+), 394 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-i686/PKGBUILD	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: csslayer <wengxt AT gmail com>
-
-pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
-pkgver=4.2.8.4
-pkgrel=1
-groups=('fcitx-im')
-arch=('i686' 'x86_64')
-url="http://fcitx-im.org"
-license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
-source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz)
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-}
-
-build() {
-  mkdir -p build
-  cd build
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DFORCE_OPENCC=ON \
-    -DFORCE_PRESAGE=ON \
-    -DFORCE_ENCHANT=ON \
-    -DENABLE_TEST=ON \
-    -DENABLE_GTK2_IM_MODULE=ON \
-    -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4
-  make
-}
-
-check() {
-  cd build
-  make test
-}
-
-package_fcitx() {
-  pkgdesc="Flexible Context-aware Input Tool with eXtension"
-  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
-           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
-           'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support'
-              'opencc: optional engine to do chinese convert'
-              'gettext: for fcitx-po-parser')
-  install=fcitx.install
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
-  rm -r "${pkgdir}/usr/lib/fcitx/qt"
-  rm -r "${pkgdir}/usr/include/fcitx-qt"
-  rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper"
-  rm "${pkgdir}/usr/lib/"libfcitx-qt.so*
-  rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc"
-}
-
-package_fcitx-gtk2() {
-  pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' "fcitx>=$pkgver")
-  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' "fcitx>=$pkgver")
-  install=fcitx-gtk3.install
-
-  cd "${srcdir}/build/src/frontend/gtk3"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-qt4() {
-  pkgdesc='Qt4 IM Module for fcitx'
-  depends=('qt4' "fcitx>=$pkgver")
-  replaces=('fcitx-qt')
-  provides=('fcitx-qt')
-  conflicts=('fcitx-qt')
-
-  cd "${srcdir}/build/src/frontend/qt"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/tools/gui"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/src/lib/fcitx-qt"
-  make DESTDIR="${pkgdir}" install
-}
-
-sha512sums=('39bffcd003aebb4e0714d245c32e839833b8507eaf819d5f6ec100ba2ed35b321f38e9a6052371abf0f5b73bb2828f10ae1bd555a41c30353beaf81bd121d03b')

Copied: fcitx/repos/community-i686/PKGBUILD (from rev 119142, fcitx/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
+pkgver=4.2.8.5
+pkgrel=1
+groups=('fcitx-im')
+arch=('i686' 'x86_64')
+url="http://fcitx-im.org"
+license=('GPL' 'LGPL')
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \
+             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
+source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz)
+sha512sums=('ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+}
+
+build() {
+  mkdir -p build
+  cd build
+
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc \
+    -DFORCE_OPENCC=ON \
+    -DFORCE_PRESAGE=ON \
+    -DFORCE_ENCHANT=ON \
+    -DENABLE_TEST=ON \
+    -DENABLE_GTK2_IM_MODULE=ON \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
+  make
+}
+
+check() {
+  cd build
+  make test
+}
+
+package_fcitx() {
+  pkgdesc="Flexible Context-aware Input Tool with eXtension"
+  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
+           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
+           'libxfixes' 'dbus-core' 'icu')
+  optdepends=('enchant: for word predication support'
+              'opencc: optional engine to do chinese convert'
+              'gettext: for fcitx-po-parser')
+  install=fcitx.install
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
+  rm -r "${pkgdir}/usr/lib/fcitx/qt"
+  rm -r "${pkgdir}/usr/include/fcitx-qt"
+  rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper"
+  rm "${pkgdir}/usr/lib/"libfcitx-qt.so*
+  rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc"
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' "fcitx>=$pkgver")
+  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' "fcitx>=$pkgver")
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}/build/src/frontend/gtk3"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt4() {
+  pkgdesc='Qt4 IM Module for fcitx'
+  depends=('qt4' "fcitx>=$pkgver")
+  replaces=('fcitx-qt')
+  provides=('fcitx-qt')
+  conflicts=('fcitx-qt')
+
+  cd "${srcdir}/build/src/frontend/qt"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/tools/gui"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/src/lib/fcitx-qt"
+  make DESTDIR="${pkgdir}" install
+}
+

Deleted: community-i686/add-a-context-variable-to-disable-punc.patch
===================================================================
--- community-i686/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-i686/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,59 +0,0 @@
-From: Xuetian Weng <wengxt at gmail.com>
-Date: Tue, 11 Mar 2014 00:13:43 +0800
-Subject: add a context variable to disable punc
-
----
- src/lib/fcitx/context.h |    2 ++
- src/module/punc/punc.c  |   12 ++++++++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
-index 32115af..05f0f91 100644
---- a/src/lib/fcitx/context.h
-+++ b/src/lib/fcitx/context.h
-@@ -70,6 +70,8 @@ extern "C" {
-     #define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT "CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT"
-     /** disable auto first candidate highlight */
-     #define CONTEXT_DISABLE_FULLWIDTH "CONTEXT_DISABLE_FULLWIDTH"
-+    /** disable punc module */
-+    #define CONTEXT_DISABLE_PUNC "CONTEXT_DISABLE_PUNC"
- 
-     /**
-      * @brief register a new global context variable
-diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
-index be6dec3..3327f9c 100644
---- a/src/module/punc/punc.c
-+++ b/src/module/punc/punc.c
-@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
-                                                   PuncWhichCopy, PuncWhichFree,
-                                                   puncState);
- 
-+    FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC, FCT_Boolean, FCF_ResetOnInputMethodChange);
-+
-     FcitxPuncAddFunctions(instance);
-     return puncState;
- }
-@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned int state,
- {
-     FCITX_UNUSED(retVal);
-     FcitxPuncState *puncState = (FcitxPuncState*)arg;
-+    boolean disablePunc = FcitxInstanceGetContextBoolean(
-+        puncState->owner, CONTEXT_DISABLE_PUNC);
-+    if (disablePunc)
-+        return false;
-+
-     if (FcitxHotkeyIsHotKeySimple(sym, state) &&
-         !FcitxHotkeyIsHotKeyDigit(sym, state) && !IsHotKeyPunc(sym, state))
-         puncState->bLastIsNumber = false;
-@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned int state, INPUT_RETURN
-     if (*retVal != IRV_TO_PROCESS)
-         return false;
- 
-+    boolean disablePunc = FcitxInstanceGetContextBoolean(
-+        puncState->owner, CONTEXT_DISABLE_PUNC);
-+    if (disablePunc)
-+        return false;
-+
-     FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
-     if (FcitxCandidateWordGetListSize(candList) != 0) {
-         if (FcitxCandidateWordGetHasGoneToNextPage(candList) &&

Copied: fcitx/repos/community-i686/add-a-context-variable-to-disable-punc.patch (from rev 119142, fcitx/trunk/add-a-context-variable-to-disable-punc.patch)
===================================================================
--- community-i686/add-a-context-variable-to-disable-punc.patch	                        (rev 0)
+++ community-i686/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,59 @@
+From: Xuetian Weng <wengxt at gmail.com>
+Date: Tue, 11 Mar 2014 00:13:43 +0800
+Subject: add a context variable to disable punc
+
+---
+ src/lib/fcitx/context.h |    2 ++
+ src/module/punc/punc.c  |   12 ++++++++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
+index 32115af..05f0f91 100644
+--- a/src/lib/fcitx/context.h
++++ b/src/lib/fcitx/context.h
+@@ -70,6 +70,8 @@ extern "C" {
+     #define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT "CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT"
+     /** disable auto first candidate highlight */
+     #define CONTEXT_DISABLE_FULLWIDTH "CONTEXT_DISABLE_FULLWIDTH"
++    /** disable punc module */
++    #define CONTEXT_DISABLE_PUNC "CONTEXT_DISABLE_PUNC"
+ 
+     /**
+      * @brief register a new global context variable
+diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
+index be6dec3..3327f9c 100644
+--- a/src/module/punc/punc.c
++++ b/src/module/punc/punc.c
+@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
+                                                   PuncWhichCopy, PuncWhichFree,
+                                                   puncState);
+ 
++    FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC, FCT_Boolean, FCF_ResetOnInputMethodChange);
++
+     FcitxPuncAddFunctions(instance);
+     return puncState;
+ }
+@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned int state,
+ {
+     FCITX_UNUSED(retVal);
+     FcitxPuncState *puncState = (FcitxPuncState*)arg;
++    boolean disablePunc = FcitxInstanceGetContextBoolean(
++        puncState->owner, CONTEXT_DISABLE_PUNC);
++    if (disablePunc)
++        return false;
++
+     if (FcitxHotkeyIsHotKeySimple(sym, state) &&
+         !FcitxHotkeyIsHotKeyDigit(sym, state) && !IsHotKeyPunc(sym, state))
+         puncState->bLastIsNumber = false;
+@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned int state, INPUT_RETURN
+     if (*retVal != IRV_TO_PROCESS)
+         return false;
+ 
++    boolean disablePunc = FcitxInstanceGetContextBoolean(
++        puncState->owner, CONTEXT_DISABLE_PUNC);
++    if (disablePunc)
++        return false;
++
+     FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
+     if (FcitxCandidateWordGetListSize(candList) != 0) {
+         if (FcitxCandidateWordGetHasGoneToNextPage(candList) &&

Deleted: community-i686/fcitx-gtk2.install
===================================================================
--- community-i686/fcitx-gtk2.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-i686/fcitx-gtk2.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-2.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: fcitx/repos/community-i686/fcitx-gtk2.install (from rev 119142, fcitx/trunk/fcitx-gtk2.install)
===================================================================
--- community-i686/fcitx-gtk2.install	                        (rev 0)
+++ community-i686/fcitx-gtk2.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-i686/fcitx-gtk3.install
===================================================================
--- community-i686/fcitx-gtk3.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-i686/fcitx-gtk3.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: fcitx/repos/community-i686/fcitx-gtk3.install (from rev 119142, fcitx/trunk/fcitx-gtk3.install)
===================================================================
--- community-i686/fcitx-gtk3.install	                        (rev 0)
+++ community-i686/fcitx-gtk3.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-i686/fcitx.install
===================================================================
--- community-i686/fcitx.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-i686/fcitx.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,14 +0,0 @@
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_install() {
-  echo "You should at least install one of kcm-fcitx (For Qt/KDE users) or fcitx-configtool (For GTK+ users) to enable Fcitx configuration GUI."
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}

Copied: fcitx/repos/community-i686/fcitx.install (from rev 119142, fcitx/trunk/fcitx.install)
===================================================================
--- community-i686/fcitx.install	                        (rev 0)
+++ community-i686/fcitx.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,14 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_install() {
+  echo "You should at least install one of kcm-fcitx (For Qt/KDE users) or fcitx-configtool (For GTK+ users) to enable Fcitx configuration GUI."
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-x86_64/PKGBUILD	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: csslayer <wengxt AT gmail com>
-
-pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
-pkgver=4.2.8.4
-pkgrel=1
-groups=('fcitx-im')
-arch=('i686' 'x86_64')
-url="http://fcitx-im.org"
-license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
-source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz)
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-}
-
-build() {
-  mkdir -p build
-  cd build
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DFORCE_OPENCC=ON \
-    -DFORCE_PRESAGE=ON \
-    -DFORCE_ENCHANT=ON \
-    -DENABLE_TEST=ON \
-    -DENABLE_GTK2_IM_MODULE=ON \
-    -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4
-  make
-}
-
-check() {
-  cd build
-  make test
-}
-
-package_fcitx() {
-  pkgdesc="Flexible Context-aware Input Tool with eXtension"
-  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
-           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
-           'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support'
-              'opencc: optional engine to do chinese convert'
-              'gettext: for fcitx-po-parser')
-  install=fcitx.install
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
-  rm -r "${pkgdir}/usr/lib/fcitx/qt"
-  rm -r "${pkgdir}/usr/include/fcitx-qt"
-  rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper"
-  rm "${pkgdir}/usr/lib/"libfcitx-qt.so*
-  rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc"
-}
-
-package_fcitx-gtk2() {
-  pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' "fcitx>=$pkgver")
-  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' "fcitx>=$pkgver")
-  install=fcitx-gtk3.install
-
-  cd "${srcdir}/build/src/frontend/gtk3"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-qt4() {
-  pkgdesc='Qt4 IM Module for fcitx'
-  depends=('qt4' "fcitx>=$pkgver")
-  replaces=('fcitx-qt')
-  provides=('fcitx-qt')
-  conflicts=('fcitx-qt')
-
-  cd "${srcdir}/build/src/frontend/qt"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/tools/gui"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/src/lib/fcitx-qt"
-  make DESTDIR="${pkgdir}" install
-}
-
-sha512sums=('39bffcd003aebb4e0714d245c32e839833b8507eaf819d5f6ec100ba2ed35b321f38e9a6052371abf0f5b73bb2828f10ae1bd555a41c30353beaf81bd121d03b')

Copied: fcitx/repos/community-x86_64/PKGBUILD (from rev 119142, fcitx/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
+pkgver=4.2.8.5
+pkgrel=1
+groups=('fcitx-im')
+arch=('i686' 'x86_64')
+url="http://fcitx-im.org"
+license=('GPL' 'LGPL')
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \
+             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
+source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz)
+sha512sums=('ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+}
+
+build() {
+  mkdir -p build
+  cd build
+
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc \
+    -DFORCE_OPENCC=ON \
+    -DFORCE_PRESAGE=ON \
+    -DFORCE_ENCHANT=ON \
+    -DENABLE_TEST=ON \
+    -DENABLE_GTK2_IM_MODULE=ON \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
+  make
+}
+
+check() {
+  cd build
+  make test
+}
+
+package_fcitx() {
+  pkgdesc="Flexible Context-aware Input Tool with eXtension"
+  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
+           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
+           'libxfixes' 'dbus-core' 'icu')
+  optdepends=('enchant: for word predication support'
+              'opencc: optional engine to do chinese convert'
+              'gettext: for fcitx-po-parser')
+  install=fcitx.install
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
+  rm -r "${pkgdir}/usr/lib/fcitx/qt"
+  rm -r "${pkgdir}/usr/include/fcitx-qt"
+  rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper"
+  rm "${pkgdir}/usr/lib/"libfcitx-qt.so*
+  rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc"
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' "fcitx>=$pkgver")
+  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' "fcitx>=$pkgver")
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}/build/src/frontend/gtk3"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt4() {
+  pkgdesc='Qt4 IM Module for fcitx'
+  depends=('qt4' "fcitx>=$pkgver")
+  replaces=('fcitx-qt')
+  provides=('fcitx-qt')
+  conflicts=('fcitx-qt')
+
+  cd "${srcdir}/build/src/frontend/qt"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/tools/gui"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/src/lib/fcitx-qt"
+  make DESTDIR="${pkgdir}" install
+}
+

Deleted: community-x86_64/add-a-context-variable-to-disable-punc.patch
===================================================================
--- community-x86_64/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-x86_64/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,59 +0,0 @@
-From: Xuetian Weng <wengxt at gmail.com>
-Date: Tue, 11 Mar 2014 00:13:43 +0800
-Subject: add a context variable to disable punc
-
----
- src/lib/fcitx/context.h |    2 ++
- src/module/punc/punc.c  |   12 ++++++++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
-index 32115af..05f0f91 100644
---- a/src/lib/fcitx/context.h
-+++ b/src/lib/fcitx/context.h
-@@ -70,6 +70,8 @@ extern "C" {
-     #define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT "CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT"
-     /** disable auto first candidate highlight */
-     #define CONTEXT_DISABLE_FULLWIDTH "CONTEXT_DISABLE_FULLWIDTH"
-+    /** disable punc module */
-+    #define CONTEXT_DISABLE_PUNC "CONTEXT_DISABLE_PUNC"
- 
-     /**
-      * @brief register a new global context variable
-diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
-index be6dec3..3327f9c 100644
---- a/src/module/punc/punc.c
-+++ b/src/module/punc/punc.c
-@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
-                                                   PuncWhichCopy, PuncWhichFree,
-                                                   puncState);
- 
-+    FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC, FCT_Boolean, FCF_ResetOnInputMethodChange);
-+
-     FcitxPuncAddFunctions(instance);
-     return puncState;
- }
-@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned int state,
- {
-     FCITX_UNUSED(retVal);
-     FcitxPuncState *puncState = (FcitxPuncState*)arg;
-+    boolean disablePunc = FcitxInstanceGetContextBoolean(
-+        puncState->owner, CONTEXT_DISABLE_PUNC);
-+    if (disablePunc)
-+        return false;
-+
-     if (FcitxHotkeyIsHotKeySimple(sym, state) &&
-         !FcitxHotkeyIsHotKeyDigit(sym, state) && !IsHotKeyPunc(sym, state))
-         puncState->bLastIsNumber = false;
-@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned int state, INPUT_RETURN
-     if (*retVal != IRV_TO_PROCESS)
-         return false;
- 
-+    boolean disablePunc = FcitxInstanceGetContextBoolean(
-+        puncState->owner, CONTEXT_DISABLE_PUNC);
-+    if (disablePunc)
-+        return false;
-+
-     FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
-     if (FcitxCandidateWordGetListSize(candList) != 0) {
-         if (FcitxCandidateWordGetHasGoneToNextPage(candList) &&

Copied: fcitx/repos/community-x86_64/add-a-context-variable-to-disable-punc.patch (from rev 119142, fcitx/trunk/add-a-context-variable-to-disable-punc.patch)
===================================================================
--- community-x86_64/add-a-context-variable-to-disable-punc.patch	                        (rev 0)
+++ community-x86_64/add-a-context-variable-to-disable-punc.patch	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,59 @@
+From: Xuetian Weng <wengxt at gmail.com>
+Date: Tue, 11 Mar 2014 00:13:43 +0800
+Subject: add a context variable to disable punc
+
+---
+ src/lib/fcitx/context.h |    2 ++
+ src/module/punc/punc.c  |   12 ++++++++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
+index 32115af..05f0f91 100644
+--- a/src/lib/fcitx/context.h
++++ b/src/lib/fcitx/context.h
+@@ -70,6 +70,8 @@ extern "C" {
+     #define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT "CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT"
+     /** disable auto first candidate highlight */
+     #define CONTEXT_DISABLE_FULLWIDTH "CONTEXT_DISABLE_FULLWIDTH"
++    /** disable punc module */
++    #define CONTEXT_DISABLE_PUNC "CONTEXT_DISABLE_PUNC"
+ 
+     /**
+      * @brief register a new global context variable
+diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
+index be6dec3..3327f9c 100644
+--- a/src/module/punc/punc.c
++++ b/src/module/punc/punc.c
+@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
+                                                   PuncWhichCopy, PuncWhichFree,
+                                                   puncState);
+ 
++    FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC, FCT_Boolean, FCF_ResetOnInputMethodChange);
++
+     FcitxPuncAddFunctions(instance);
+     return puncState;
+ }
+@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned int state,
+ {
+     FCITX_UNUSED(retVal);
+     FcitxPuncState *puncState = (FcitxPuncState*)arg;
++    boolean disablePunc = FcitxInstanceGetContextBoolean(
++        puncState->owner, CONTEXT_DISABLE_PUNC);
++    if (disablePunc)
++        return false;
++
+     if (FcitxHotkeyIsHotKeySimple(sym, state) &&
+         !FcitxHotkeyIsHotKeyDigit(sym, state) && !IsHotKeyPunc(sym, state))
+         puncState->bLastIsNumber = false;
+@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned int state, INPUT_RETURN
+     if (*retVal != IRV_TO_PROCESS)
+         return false;
+ 
++    boolean disablePunc = FcitxInstanceGetContextBoolean(
++        puncState->owner, CONTEXT_DISABLE_PUNC);
++    if (disablePunc)
++        return false;
++
+     FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
+     if (FcitxCandidateWordGetListSize(candList) != 0) {
+         if (FcitxCandidateWordGetHasGoneToNextPage(candList) &&

Deleted: community-x86_64/fcitx-gtk2.install
===================================================================
--- community-x86_64/fcitx-gtk2.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-x86_64/fcitx-gtk2.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-2.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: fcitx/repos/community-x86_64/fcitx-gtk2.install (from rev 119142, fcitx/trunk/fcitx-gtk2.install)
===================================================================
--- community-x86_64/fcitx-gtk2.install	                        (rev 0)
+++ community-x86_64/fcitx-gtk2.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/fcitx-gtk3.install
===================================================================
--- community-x86_64/fcitx-gtk3.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-x86_64/fcitx-gtk3.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: fcitx/repos/community-x86_64/fcitx-gtk3.install (from rev 119142, fcitx/trunk/fcitx-gtk3.install)
===================================================================
--- community-x86_64/fcitx-gtk3.install	                        (rev 0)
+++ community-x86_64/fcitx-gtk3.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/fcitx.install
===================================================================
--- community-x86_64/fcitx.install	2014-09-18 02:40:30 UTC (rev 119142)
+++ community-x86_64/fcitx.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -1,14 +0,0 @@
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_install() {
-  echo "You should at least install one of kcm-fcitx (For Qt/KDE users) or fcitx-configtool (For GTK+ users) to enable Fcitx configuration GUI."
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}

Copied: fcitx/repos/community-x86_64/fcitx.install (from rev 119142, fcitx/trunk/fcitx.install)
===================================================================
--- community-x86_64/fcitx.install	                        (rev 0)
+++ community-x86_64/fcitx.install	2014-09-18 02:41:39 UTC (rev 119143)
@@ -0,0 +1,14 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_install() {
+  echo "You should at least install one of kcm-fcitx (For Qt/KDE users) or fcitx-configtool (For GTK+ users) to enable Fcitx configuration GUI."
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}




More information about the arch-commits mailing list