misc/fcitx: Updated for version 4.2.8.6.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 22 insertions, 13 deletions

diff --git a/misc/fcitx/doinst.sh b/misc/fcitx/doinst.sh
index 9424ce43ff..a37b27518a 100644
--- a/misc/fcitx/doinst.sh
+++ b/misc/fcitx/doinst.sh
@@ -2,6 +2,14 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/gtk-query-immodules-2.0 ]; then
+  /usr/bin/gtk-query-immodules-2.0 --update-cache
+fi
+
+if [ -x /usr/bin/gtk-query-immodules-3.0 ]; then
+  /usr/bin/gtk-query-immodules-3.0 --update-cache
+fi
+
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index c3136c5241..4e054725fb 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fcitx
-VERSION=${VERSION:-4.2.6.1}
+VERSION=${VERSION:-4.2.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,16 +67,18 @@ tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir build
 cd build
   cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
         -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
+	-DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
+	-DSYSCONFDIR=/etc \
         -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
         -DENABLE_GTK2_IM_MODULE=On \
         -DENABLE_GTK3_IM_MODULE=On \
@@ -87,7 +89,7 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr
@@ -100,8 +102,7 @@ chmod 0755 $PKG/etc/profile.d/*
 
 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
+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
diff --git a/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info
index f84de57997..fd5a7f986a 100644
--- a/misc/fcitx/fcitx.info
+++ b/misc/fcitx/fcitx.info
@@ -1,8 +1,8 @@
 PRGNAM="fcitx"
-VERSION="4.2.6.1"
-HOMEPAGE="http://code.google.com/p/fcitx/"
-DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-4.2.6.1_dict.tar.xz"
-MD5SUM="7dc57dbe41702ec8be856ce3de434f2b"
+VERSION="4.2.8.6"
+HOMEPAGE="https://fcitx-im.org"
+DOWNLOAD="http://download.fcitx-im.org/fcitx/fcitx-4.2.8.6_dict.tar.xz"
+MD5SUM="8dce1a0d65bf19f2a99b456458f8ac41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/fcitx/slack-desc b/misc/fcitx/slack-desc
index a18a054d7c..d56560b5aa 100644
--- a/misc/fcitx/slack-desc
+++ b/misc/fcitx/slack-desc
@@ -15,5 +15,5 @@ fcitx:
 fcitx: There are some good modules you can choose, like fcitx-config,
 fcitx: fcitx-{googlepinyin,sunpinyin,cloudpinyin}, fcitx-fbterm, etc.
 fcitx:
-fcitx: Homepage: http://code.google.com/p/fcitx/
+fcitx: Homepage: https://fcitx-im.org
 fcitx: