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

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
author: vvoody <vvoodywang@gmail.com> 2011-12-15 11:04:15 -0600
committer: Niels Horn <niels.horn@slackbuilds.org> 2011-12-18 00:07:51 -0200
commit: ee0d9cbd32309d14b3a0368485b0353e60fc7fd6 (patch)
tree: 8b9b1c4032a21878519ef625961b52b05d87f887 /misc/fcitx
parent: 0208d4932e2ad17940e48da746d2c8f14025d6c6 (diff)
8 files changed, 92 insertions, 159 deletions
diff --git a/misc/fcitx/README b/misc/fcitx/README
index 272f23eefc5ce..474052b149700 100644
--- a/misc/fcitx/README
+++ b/misc/fcitx/README
@@ -1,6 +1,11 @@
-fcitx: A very popular Simp Chinese Input Method
-  
-fcitx is a very popular Simp Chinese input method
-developped by some chinese hack guys.
+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 is much simpler than scim
+If you have installed Gtk3 or OpenCC, you may run as below to make
+fcitx support them:
+$ GTK3=On OPENCC=On ./fcitx.SlackBuild
+
+You may need 'fcitx-configtool', a GUI tool for configuring fcitx.
+
+This requires icu4c.
diff --git a/misc/fcitx/doinst.sh b/misc/fcitx/doinst.sh
new file mode 100644
index 0000000000000..9424ce43ff572
--- /dev/null
+++ b/misc/fcitx/doinst.sh
@@ -0,0 +1,13 @@
+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/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index edf856b515e45..b61ae0a7e09ea 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}
diff --git a/misc/fcitx/fcitx.config b/misc/fcitx/fcitx.config
deleted file mode 100644
index 9e49ebd3a9e98..0000000000000
--- a/misc/fcitx/fcitx.config
+++ /dev/null
@@ -1,109 +0,0 @@
-[����]
-��ʾ����(��)=*
-��ʾ����(Ӣ)=Courier New
-��ʾ�����С=12
-�����������С=12
-��������=zh_CN.UTF-8
-ʹ��AA����=1
-ʹ�ô���=1
-ʹ������ͼ��=1
-
-[���]
-���ֺ����Ƿ���=1
-Enter����Ϊ=2
-�ֺż���Ϊ=2
-��д��ĸ����Ӣ��=1
-ת��Ӣ���еı��=1
-���뷽ʽ��ֹ��ҳ=1
-
-[����]
-��ѡ�ʸ���=10
-������ʹ��3D����=0
-������ʹ��3D����=2
-����������ģʽ=0
-��ʾ�������=0
-����������=1
-�״���ʾ������=1
-# �������̶�����(��������������뷨)��0��ʾ���̶�����
-�������̶�����=0
-������ƫ����X=0
-������ƫ����Y=16
-��ź�ӵ�=1
-��ʾ�����ٶ�=1
-��ʾ�汾=1
-���ɫ=92 210 131
-�����ڱ���ɫ=240 255 240
-����������ɫ=150 220 150
-���������뷨����ɫ=170 170 170 150 200 150 0 0 255 
-���봰����ɫ=240 255 240
-���봰��ʾɫ=255 0 0
-���봰�û�����ɫ=0 0 255
-���봰���ɫ=200 0 0
-���봰��һ����ѡ��ɫ=0 150 100
-# ����ɫֵֻ����ƴ���е��û������
-���봰�û�����ɫ=0 0 255
-���봰��ʾ����ɫ=100 100 255
-# ��ʡ�ƴ���ĵ���/ϵͳ�����ʹ�ø���ɫ
-���봰�����ı�ɫ=0 0 0
-���봰����ɫ=90 160 90
-���봰��ͷɫ=255 0 0
-������̴�����ɫ=220 220 220
-������̴���ĸɫ=80 0 0
-������̴�����ɫ=0 0 0
-
-# ���ˡ���Ӣ�Ŀ����л������⣬�������ȼ���������Ϊ�������м��ÿո�ָ�
-[�ȼ�]
-��/�ر����뷨=CTRL_SPACE
-# ��Ӣ�Ŀ����л��� ��������ΪL_CTRL R_CTRL L_SHIFT R_SHIFT L_SUPER R_SUPER
-��Ӣ�Ŀ����л���=L_SHIFT
-˫����Ӣ���л�=0
-����ʱ����=250
-������=CTRL_K
-����������=CTRL_ALT_H
-GBK֧��=CTRL_M
-GBK�����л���=CTRL_ALT_F
-����=CTRL_L
-����ƴ��=CTRL_ALT_E
-ȫ���=SHIFT_SPACE
-���ı��=ALT_SPACE
-��һҳ=PGUP
-��һҳ=PGDN
-�ڶ�����ѡ��ѡ���=CTRL
-
-[���뷨]
-ʹ��ƴ��=1
-ƴ������=����ƴ��
-ʹ��˫ƴ=1
-˫ƴ����=����˫ƴ
-Ĭ��˫ƴ����=��Ȼ��
-ʹ����λ=1
-��λ����=��λ
-ʹ�����=1
-��ʾ�ʿ��еĴ���=1
-�������뷨=
-
-[ƴ��]
-ʹ��ȫƴ=0
-ƴ���Զ����=1
-�����Զ����=0
-����ƴ��������=CTRL_8
-ɾ��ƴ��������=CTRL_7
-ɾ��ƴ���û�����=CTRL_DELETE
-# ƴ���Դʶ��ּ����Ⱥź�����Ӽ�����Ҫ�пո�
-ƴ���Դʶ��ּ�=[]
-# ���������ʽ˵����0-->������  1-->���ٵ���  2-->��Ƶ�ʵ���
-ƴ���������������ʽ=2
-ƴ���������������ʽ=1
-ƴ�����ô����������ʽ=0
-ģ��an��ang=0
-ģ��en��eng=0
-ģ��ian��iang=0
-ģ��in��ing=0
-ģ��ou��u=0
-ģ��uan��uang=0
-ģ��c��ch=0
-ģ��f��h=0
-ģ��l��n=0
-ģ��s��sh=0
-ģ��z��zh=0
-
diff --git a/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info
index b1c37fb2bf7ae..6ecb8c52406a9 100644
--- a/misc/fcitx/fcitx.info
+++ b/misc/fcitx/fcitx.info
@@ -1,10 +1,14 @@
 PRGNAM="fcitx"
-VERSION="3.6.0"
-HOMEPAGE="http://www.fcitx.org/"
-DOWNLOAD="http://www.fcitx.org/download/fcitx-3.6.tar.bz2"
-MD5SUM="fe2091474392413408991c4d677e135a"
+VERSION="4.1.2"
+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_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="luoyi"
-EMAIL="luoyi.ly@gmail.com"
-APPROVED="michiel"
+MAINTAINER="vvoody"
+EMAIL="vvoodywang@gmail.com"
+APPROVED="rworkman"
diff --git a/misc/fcitx/profile.d/fcitx.csh b/misc/fcitx/profile.d/fcitx.csh
new file mode 100644
index 0000000000000..ab1b455593e46
--- /dev/null
+++ b/misc/fcitx/profile.d/fcitx.csh
@@ -0,0 +1,7 @@
+#!/bin/csh
+
+setenv XMODIFIERS "@im=fcitx"
+setenv XIM fcitx
+setenv XIM_PROGRAM fcitx
+setenv GTK_IM_MODULE fcitx
+setenv QT_IM_MODULE fcitx
diff --git a/misc/fcitx/fcitx.sh b/misc/fcitx/profile.d/fcitx.sh
index 2845a17b074ce..b4a54895171f6 100644
--- a/misc/fcitx/fcitx.sh
+++ b/misc/fcitx/profile.d/fcitx.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-export GTK_IM_MODULE=xim
+
 export XMODIFIERS="@im=fcitx"
 export XIM=fcitx
 export XIM_PROGRAM=fcitx
-
+export GTK_IM_MODULE=fcitx  #=xim
+export QT_IM_MODULE=fcitx   #=xim
+\ No newline at end of file
diff --git a/misc/fcitx/slack-desc b/misc/fcitx/slack-desc
index dfec06f0b8d7e..c1ecfbb640d37 100644
--- a/misc/fcitx/slack-desc
+++ b/misc/fcitx/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-	|-----handy-ruler------------------------------------------------------|
+     |-----handy-ruler------------------------------------------------------|
 fcitx: fcitx (Free Chinese Input Toy for X)
-fcitx:   
-fcitx: fcitx is a simple and lightweight chinese input method 
-fcitx: for the X Windows System. 
-fcitx: 
-fcitx: It can only work under en_US.utf8 or zh_CN.GBK
-fcitx: 
-fcitx: 
-fcitx: 
-fcitx: See: http://www.fcitx.org
-fcitx: 
+fcitx:
+fcitx: Fcitx(Free Chinese Input Toy for X) is a collection of
+fcitx: Simplified Chinese input methods for Linux. It supports Pinyin,
+fcitx: QuWei and Table-based input methods.
+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:
author	vvoody <vvoodywang@gmail.com>	2011-12-15 11:04:15 -0600
committer	Niels Horn <niels.horn@slackbuilds.org>	2011-12-18 00:07:51 -0200
commit	ee0d9cbd32309d14b3a0368485b0353e60fc7fd6 (patch)
tree	8b9b1c4032a21878519ef625961b52b05d87f887 /misc/fcitx
parent	0208d4932e2ad17940e48da746d2c8f14025d6c6 (diff)