misc/fcitx: Updated for version 4.2.6.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 37 insertions, 29 deletions

diff --git a/misc/fcitx/README b/misc/fcitx/README
index 7936f838b7..9711a34f45 100644
--- a/misc/fcitx/README
+++ b/misc/fcitx/README
@@ -1,7 +1,10 @@
-Fcitx(Free Chinese Input Toy for X) is a collection of Simplified
-Chinese input methods for Linux. It supports Pinyin, QuWei and
-Table-based input methods.
+Fcitx [ˈfaɪtɪks] is an input method framework with extension support.
+Currently it supports linux and Unix system, like freebsd. It has three
+builtin Input Method Engine, Pinyin, QuWei and Table-based input methods.
 
-If you have installed Gtk3 or OpenCC, you may run as below to make
-fcitx support them:
-$ GTK3=On OPENCC=On ./fcitx.SlackBuild
+By default, this slackbuild will build IM module support for GTK2, GTK3
+and Qt.
+
+If you have installed OpenCC, you may run as below to make fcitx
+support them:
+# OPENCC=On ./fcitx.SlackBuild
diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index b61ae0a7e0..711c80476a 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -1,23 +1,39 @@
 #!/bin/sh
 
-# Slackware build script for fcitx
-
-# Written by vvoody <vvoodywang@gmail.com>
+# Slackware build script for fcitx.
+
+# Copyright 2012 vvoody <vvoodywang@gmail.com>
+#
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fcitx
-VERSION=${VERSION:-4.1.2}
+VERSION=${VERSION:-4.2.6.1}
 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
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -47,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -56,21 +72,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cp -a $CWD/pinyin.tar.gz data/
-cp -a $CWD/table.tar.gz data/table/
-
 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_GTK3_IM_MODULE=On \
         -DENABLE_QT_IM_MODULE=On \
         -DENABLE_OPENCC=${OPENCC} \
         ..
diff --git a/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info
index 4572f74201..e61ae63833 100644
--- a/misc/fcitx/fcitx.info
+++ b/misc/fcitx/fcitx.info
@@ -1,12 +1,8 @@
 PRGNAM="fcitx"
-VERSION="4.1.2"
+VERSION="4.2.6.1"
 HOMEPAGE="http://code.google.com/p/fcitx/"
-DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-4.1.2.tar.bz2 \
-          http://fcitx.googlecode.com/files/pinyin.tar.gz \
-          http://fcitx.googlecode.com/files/table.tar.gz"
-MD5SUM="f72460f46e50f82c3738aa1f0d9b3125 \
-        34dcb1b5209c28baa4e87f6a2773bfd0 \
-        acb0b112423474ab2c1a22cee590d636"
+DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-4.2.6.1_dict.tar.xz"
+MD5SUM="7dc57dbe41702ec8be856ce3de434f2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""