misc/fcitx: Updated for version 4.1.2 (+new maintainer)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

1 files changed, 37 insertions, 25 deletions

diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index edf856b515e4..b61ae0a7e09e 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -1,15 +1,17 @@
 #!/bin/sh
 
 # Slackware build script for fcitx
-# Written by luoyi (luoyi.ly@gmail.com)
 
-# Modified by the slackbuilds.org project.  --michiel
+# Written by vvoody <vvoodywang@gmail.com>
+
 PRGNAM=fcitx
-VERSION=${VERSION:-3.6}
-SRCVER=${PKGVER:-3.6}
+VERSION=${VERSION:-4.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+GTK3=${GTK3:-Off}
+OPENCC=${OPENCC:-Off}
+
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,8 +47,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
-cd $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,38 +56,48 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+cp -a $CWD/pinyin.tar.gz data/
+cp -a $CWD/table.tar.gz data/table/
 
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
+        -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+        -DENABLE_DBUS=On \
+        -DENABLE_CAIRO=On \
+        -DENABLE_PANGO=On \
+        -DENABLE_TABLE=On \
+        -DENABLE_GTK2_IM_MODULE=On \
+        -DENABLE_GTK3_IM_MODULE=${GTK3} \
+        -DENABLE_QT_IM_MODULE=On \
+        -DENABLE_OPENCC=${OPENCC} \
+        ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/etc/profile.d
-cat $CWD/fcitx.sh > $PKG/etc/profile.d/fcitx.sh
-chmod 0755 $PKG/etc/profile.d/fcitx.sh
+mv $PKG/usr/share/man $PKG/usr
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-sed -i -e 's/^/#/' $PKG/usr/share/fcitx/data/tables.conf 
-cat $CWD/fcitx.config > $PKG/usr/share/fcitx/data/config
-chmod 644 $PKG/usr/share/fcitx/data/config
+mkdir -p $PKG/etc/profile.d
+cat $CWD/profile.d/fcitx.sh > $PKG/etc/profile.d/fcitx.sh
+cat $CWD/profile.d/fcitx.csh > $PKG/etc/profile.d/fcitx.csh
+chmod 0755 $PKG/etc/profile.d/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc $PKG/usr
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}