[arch-commits] Commit in fcitx/trunk (PKGBUILD)

Antonio Rojas arojas at archlinux.org
Tue Apr 30 21:15:25 UTC 2019


    Date: Tuesday, April 30, 2019 @ 21:15:24
  Author: arojas
Revision: 457223

Drop qt4 support, fix enchant detection

Modified:
  fcitx/trunk/PKGBUILD

----------+
 PKGBUILD |   36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-30 20:54:06 UTC (rev 457222)
+++ PKGBUILD	2019-04-30 21:15:24 UTC (rev 457223)
@@ -3,14 +3,14 @@
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3')
 pkgver=4.2.9.6
-pkgrel=1
+pkgrel=2
 groups=('fcitx-im')
 arch=('x86_64')
 url="http://fcitx-im.org"
 license=('GPL' 'LGPL')
-makedepends=('extra-cmake-modules' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \
+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=('dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0'
@@ -19,6 +19,8 @@
 
 prepare() {
   mkdir build
+
+  sed -e 's|enchant/enchant.h|enchant-2/enchant.h|' -i $pkgbase-$pkgver/cmake/FindEnchant.cmake
 }
 
 build() {
@@ -25,7 +27,6 @@
   cd build
 
   cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
     -DFORCE_OPENCC=ON \
@@ -32,9 +33,11 @@
     -DFORCE_PRESAGE=ON \
     -DFORCE_ENCHANT=ON \
     -DENABLE_TEST=ON \
+    -DENABLE_QT=OFF \
     -DENABLE_GTK2_IM_MODULE=ON \
     -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON
+    -DENCHANT_INCLUDE_DIR=/usr/include/enchant-2/ \
+    -DENCHANT_LIBRARIES=/usr/lib/libenchant-2.so
   make
 }
 
@@ -56,11 +59,7 @@
   cd build
   make DESTDIR="$pkgdir" install
 
-  rm -r "$pkgdir"/usr/lib/{gtk-2.0,gtk-3.0,qt4}
-  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
+  rm -r "$pkgdir"/usr/lib/{gtk-2.0,gtk-3.0}
 }
 
 package_fcitx-gtk2() {
@@ -80,20 +79,3 @@
   cd 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
-}


More information about the arch-commits mailing list