summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorvvoody <vvoodywang@gmail.com>2012-09-14 14:50:08 +0000
committerRobby Workman <rworkman@slackbuilds.org>2012-09-14 16:40:35 -0500
commit65dad92448b6b50c7a7e6ae367a32688a33f86b8 (patch)
treea9c068cd2a20d9298c00f8029eb96c2ac6d3308e /misc
parent923e4089dd486601bc1f9ba562010e978d5efdfe (diff)
downloadslackbuilds-65dad92448b6b50c7a7e6ae367a32688a33f86b8.tar.gz
misc/fcitx-configtool: Fixed build errors due to new glib2
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/fcitx-configtool/fcitx-configtool-0.3.1-glib.patch37
-rw-r--r--misc/fcitx-configtool/fcitx-configtool.SlackBuild5
2 files changed, 41 insertions, 1 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
new file mode 100644
index 0000000000..cd665e7cab
--- /dev/null
+++ b/misc/fcitx-configtool/fcitx-configtool-0.3.1-glib.patch
@@ -0,0 +1,37 @@
+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 442b8bc792..d46cec4556 100644
--- a/misc/fcitx-configtool/fcitx-configtool.SlackBuild
+++ b/misc/fcitx-configtool/fcitx-configtool.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=fcitx-configtool
VERSION=${VERSION:-0.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -53,6 +53,9 @@ 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} \