From 5f7670e209408c8579d13ab1092cfc4ccee408ca Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Wed, 30 Aug 2017 21:05:50 +0200
Subject: misc/fcitx: Updated for version 4.2.9.4.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 misc/fcitx/fcitx.SlackBuild | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'misc/fcitx/fcitx.SlackBuild')

diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index 4e054725fb..53824c26b3 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fcitx.
 
 # Copyright 2012 vvoody <vvoodywang@gmail.com>
+# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands
 #
 # All rights reserved.
 #
@@ -24,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fcitx
-VERSION=${VERSION:-4.2.8.6}
+VERSION=${VERSION:-4.2.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,37 +73,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch fcitx-autostart to only start when fcitx is the configured input method
+patch -p0 -d data/script/ -i $CWD/fcitx-autostart.patch
+
 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 \
-        -DENABLE_QT_IM_MODULE=On \
-        -DENABLE_OPENCC=${OPENCC} \
-        ..
+  cmake \
+    -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
+    -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONFDIR=/etc \
+    -DENABLE_GTK2_IM_MODULE=On \
+    -DENABLE_GTK3_IM_MODULE=On \
+    -DENABLE_QT_IM_MODULE=On \
+    -DENABLE_OPENCC=${OPENCC} \
+    ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-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
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-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/*
-
 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
-- 
cgit v1.2.3