3 files changed, 29 insertions, 51 deletions
diff --git a/misc/fcitx-configtool/fcitx-configtool-0.3.1-glib.patch b/misc/fcitx-configtool/fcitx-configtool-0.3.1-glib.patch
deleted file mode 100644
index cd665e7cabdee..0000000000000
--- a/misc/fcitx-configtool/fcitx-configtool-0.3.1-glib.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur fcitx-configtool-0.3.1/gtk/config_widget.h fcitx-configtool-0.3.1_fixed/gtk/config_widget.h
---- fcitx-configtool-0.3.1/gtk/config_widget.h	2011-09-09 03:55:49.000000000 +0000
-+++ fcitx-configtool-0.3.1_fixed/gtk/config_widget.h	2012-09-14 14:40:24.016046036 +0000
-@@ -23,7 +23,7 @@
- #define _FCITX_CONFIG_WIDGET
- 
- #include <gtk/gtkwidget.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <fcitx-config/fcitx-config.h>
- #include <gtk/gtkvbox.h>
- #include "sub_config_parser.h"
-diff -ur fcitx-configtool-0.3.1/gtk/sub_config_parser.c fcitx-configtool-0.3.1_fixed/gtk/sub_config_parser.c
---- fcitx-configtool-0.3.1/gtk/sub_config_parser.c	2011-09-09 03:55:49.000000000 +0000
-+++ fcitx-configtool-0.3.1_fixed/gtk/sub_config_parser.c	2012-09-14 14:32:49.512156233 +0000
-@@ -22,8 +22,7 @@
- #include <dirent.h>
- #include <string.h>
- #include <sys/stat.h>
--#include <glib/gstrfuncs.h>
--#include <glib/gpattern.h>
-+#include <glib.h>
- 
- #include <fcitx-config/xdg.h>
- #include <fcitx-utils/log.h>
-diff -ur fcitx-configtool-0.3.1/gtk/sub_config_parser.h fcitx-configtool-0.3.1_fixed/gtk/sub_config_parser.h
---- fcitx-configtool-0.3.1/gtk/sub_config_parser.h	2011-09-09 03:55:49.000000000 +0000
-+++ fcitx-configtool-0.3.1_fixed/gtk/sub_config_parser.h	2012-09-14 14:33:05.738265415 +0000
-@@ -19,7 +19,7 @@
- 
- #ifndef _SUB_CONFIG_PARSER_H
- #define _SUB_CONFIG_PARSER_H
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- typedef enum
- {
diff --git a/misc/fcitx-configtool/fcitx-configtool.SlackBuild b/misc/fcitx-configtool/fcitx-configtool.SlackBuild
index d46cec45566ee..404642fd019ee 100644
--- a/misc/fcitx-configtool/fcitx-configtool.SlackBuild
+++ b/misc/fcitx-configtool/fcitx-configtool.SlackBuild
@@ -2,19 +2,36 @@
 
 # Slackware build script for fcitx-configtool
 
-# Written by vvoody <vvoodywang@gmail.com>
+# 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-configtool
-VERSION=${VERSION:-0.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.5.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# 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
@@ -44,7 +61,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.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -53,14 +70,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for compiling error under Slackware 14.0's glib
-patch -p1 < $CWD/fcitx-configtool-0.3.1-glib.patch
-
 mkdir build
 cd build
   cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
         -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
         -DCMAKE_INSTALL_PREFIX=/usr \
+        -DENABLE_GTK2=On \
         ..
   make
   make install DESTDIR=$PKG
diff --git a/misc/fcitx-configtool/fcitx-configtool.info b/misc/fcitx-configtool/fcitx-configtool.info
index 91b70512e8d24..56114c8a86f1a 100644
--- a/misc/fcitx-configtool/fcitx-configtool.info
+++ b/misc/fcitx-configtool/fcitx-configtool.info
@@ -1,10 +1,10 @@
 PRGNAM="fcitx-configtool"
-VERSION="0.3.1"
+VERSION="0.4.5.1"
 HOMEPAGE="http://code.google.com/p/fcitx/"
-DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-configtool-0.3.1.tar.bz2"
-MD5SUM="b806c53d4370738d95f37685fa3f44a3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-configtool-0.4.5.1.tar.xz"
+MD5SUM="6787dedcb57e6147553ef755c51bb46b"
+DOWNLOAD_x86_64="http://fcitx.googlecode.com/files/fcitx-configtool-0.4.5.1.tar.xz"
+MD5SUM_x86_64="6787dedcb57e6147553ef755c51bb46b"
 REQUIRES="fcitx"
 MAINTAINER="vvoody"
 EMAIL="vvoodywang@gmail.com"