[arch-commits] Commit in fcitx/repos/community-x86_64 (5 files)

Felix Yan felixonmars at archlinux.org
Thu Mar 19 16:45:54 UTC 2020


    Date: Thursday, March 19, 2020 @ 16:45:52
  Author: felixonmars
Revision: 600934

archrelease: copy trunk to community-x86_64

Added:
  fcitx/repos/community-x86_64/PKGBUILD
    (from rev 600933, fcitx/trunk/PKGBUILD)
Deleted:
  fcitx/repos/community-x86_64/PKGBUILD
  fcitx/repos/community-x86_64/fcitx-gtk2.install
  fcitx/repos/community-x86_64/fcitx-gtk3.install
  fcitx/repos/community-x86_64/fcitx.install

--------------------+
 PKGBUILD           |  144 ++++++++++++++++++++++-----------------------------
 fcitx-gtk2.install |   11 ---
 fcitx-gtk3.install |   11 ---
 fcitx.install      |    4 -
 4 files changed, 63 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-19 16:45:19 UTC (rev 600933)
+++ PKGBUILD	2020-03-19 16:45:52 UTC (rev 600934)
@@ -1,81 +0,0 @@
-# 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')
-pkgver=4.2.9.7
-pkgrel=1
-groups=('fcitx-im')
-arch=('x86_64')
-url="https://fcitx-im.org"
-license=('GPL' 'LGPL')
-makedepends=('extra-cmake-modules' 'doxygen' 'gtk2' 'gtk3' 'icu' 'mesa' 'opencc' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant' 'python2')
-source=("https://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz"{,.sig})
-sha512sums=('b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b'
-            'SKIP')
-validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
-
-prepare() {
-  mkdir build
-
-  sed -e 's|enchant/enchant.h|enchant-2/enchant.h|' -i $pkgbase-$pkgver/cmake/FindEnchant.cmake
-}
-
-build() {
-  cd build
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DFORCE_OPENCC=ON \
-    -DFORCE_PRESAGE=ON \
-    -DFORCE_ENCHANT=ON \
-    -DENABLE_TEST=ON \
-    -DENABLE_QT=OFF \
-    -DENABLE_GTK2_IM_MODULE=ON \
-    -DENABLE_GTK3_IM_MODULE=ON \
-    -DENCHANT_INCLUDE_DIR=/usr/include/enchant-2/ \
-    -DENCHANT_LIBRARIES=/usr/lib/libenchant-2.so
-  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' 'icu' 'libxkbcommon')
-  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}
-}
-
-package_fcitx-gtk2() {
-  pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' "fcitx>=$pkgver")
-  install=fcitx-gtk2.install
-
-  cd 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 build/src/frontend/gtk3
-  make DESTDIR="$pkgdir" install
-}

Copied: fcitx/repos/community-x86_64/PKGBUILD (from rev 600933, fcitx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-19 16:45:52 UTC (rev 600934)
@@ -0,0 +1,63 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgname=fcitx
+pkgdesc="Flexible Context-aware Input Tool with eXtension"
+pkgver=4.2.9.7
+pkgrel=2
+groups=('fcitx-im')
+arch=('x86_64')
+url="https://fcitx-im.org"
+license=('GPL' 'LGPL')
+provides=('fcitx-gtk2' 'fcitx-gtk3')
+conflicts=('fcitx-gtk2' 'fcitx-gtk3')
+replaces=('fcitx-gtk2' 'fcitx-gtk3')
+depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info'
+          'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile'
+          'libxfixes' 'dbus' 'icu' 'libxkbcommon')
+optdepends=('enchant: for word predication support'
+            'opencc: optional engine to do chinese convert'
+            'gettext: for fcitx-po-parser'
+            'fcitx-configtool: for configuration (GTK based)'
+            'kcm-fcitx: for configuration under KDE')
+makedepends=('extra-cmake-modules' 'doxygen' 'gtk2' 'gtk3' 'mesa' 'opencc'
+             'iso-codes' 'gobject-introspection' 'enchant' 'python')
+source=("https://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz"{,.sig})
+sha512sums=('b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b'
+            'SKIP')
+validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
+
+prepare() {
+  mkdir build
+
+  sed -e 's|enchant/enchant.h|enchant-2/enchant.h|' -i $pkgname-$pkgver/cmake/FindEnchant.cmake
+}
+
+build() {
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc \
+    -DFORCE_OPENCC=ON \
+    -DFORCE_PRESAGE=ON \
+    -DFORCE_ENCHANT=ON \
+    -DENABLE_TEST=ON \
+    -DENABLE_QT=OFF \
+    -DENABLE_GTK2_IM_MODULE=ON \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENCHANT_INCLUDE_DIR=/usr/include/enchant-2/ \
+    -DENCHANT_LIBRARIES=/usr/lib/libenchant-2.so
+  make
+}
+
+check() {
+  cd build
+  make test
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: fcitx-gtk2.install
===================================================================
--- fcitx-gtk2.install	2020-03-19 16:45:19 UTC (rev 600933)
+++ fcitx-gtk2.install	2020-03-19 16:45:52 UTC (rev 600934)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-2.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Deleted: fcitx-gtk3.install
===================================================================
--- fcitx-gtk3.install	2020-03-19 16:45:19 UTC (rev 600933)
+++ fcitx-gtk3.install	2020-03-19 16:45:52 UTC (rev 600934)
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Deleted: fcitx.install
===================================================================
--- fcitx.install	2020-03-19 16:45:19 UTC (rev 600933)
+++ fcitx.install	2020-03-19 16:45:52 UTC (rev 600934)
@@ -1,4 +0,0 @@
-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."
-}
-



More information about the arch-commits mailing list