From 7d4d482d412004a33e48be8eb89a7577b133dfe4 Mon Sep 17 00:00:00 2001
From: Grissiom <chaos.proton@gmail.com>
Date: Tue, 10 Aug 2010 01:26:57 +0100
Subject: misc/ibus: updated for version 1.3.7.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
---
 misc/ibus/README          |  3 ++-
 misc/ibus/doinst.sh       | 12 +++++++++---
 misc/ibus/ibus.SlackBuild | 11 ++++++++++-
 misc/ibus/ibus.info       |  6 +++---
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'misc')

diff --git a/misc/ibus/README b/misc/ibus/README
index de0d5b5115..6eec7a2ddf 100644
--- a/misc/ibus/README
+++ b/misc/ibus/README
@@ -6,7 +6,8 @@ After installing at least one engine (e.g. PinYin engine) and enabling it
 in ibus-setup, ibus itself should be fully functional.  If you want to use
 ibus as your primary input method, you should remove the scim package.
 
-This requires GConf and pyxdg.
+This requires pyxdg. By default, it does not need GConf. But you can let it
+use GConf explicitly by setting USE_GCONF=yes. GConf can be found in SBo.
 If you use qt applications, then you probably want ibus-qt as well.
 
 After installing, ibus will automatically be started in an xdg-compliant
diff --git a/misc/ibus/doinst.sh b/misc/ibus/doinst.sh
index d41d97e260..0b35924e3b 100644
--- a/misc/ibus/doinst.sh
+++ b/misc/ibus/doinst.sh
@@ -25,9 +25,15 @@ preserve_perms() {
 preserve_perms etc/profile.d/ibus.sh.new
 preserve_perms etc/profile.d/ibus.csh.new
 
-GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-chroot . gconftool-2 --makefile-install-rule \
-  /etc/gconf/schemas/ibus.schemas 1>/dev/null
+schema_install() {
+  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+  chroot . gconftool-2 --makefile-install-rule "$1" 1>/dev/null
+}
+
+SCHEMA_FILE="/etc/gconf/schemas/ibus.schemas"
+if [ -r "$SCHEMA_FILE" ]; then
+  schema_install "$SCHEMA_FILE"
+fi
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild
index 4d03ae9d63..aa64dffe0f 100644
--- a/misc/ibus/ibus.SlackBuild
+++ b/misc/ibus/ibus.SlackBuild
@@ -28,7 +28,7 @@
 # Feedback (especially improvements) is encouraged!  :-)
 
 PRGNAM=ibus
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.3.7}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -60,6 +60,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+USE_GCONF=${USE_GCONF:-"no"}
+if [ "$USE_GCONF" = "yes" ]; then
+  conf_opt="--enable-gconf"
+else
+  conf_opt="--disable-gconf --enable-memconf"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -80,9 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-memconf \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-html-dir=/usr/share/gtk-doc/html \
+  $conf_opt \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/misc/ibus/ibus.info b/misc/ibus/ibus.info
index f67eae675f..89aa092336 100644
--- a/misc/ibus/ibus.info
+++ b/misc/ibus/ibus.info
@@ -1,8 +1,8 @@
 PRGNAM="ibus"
-VERSION="1.3.5"
+VERSION="1.3.7"
 HOMEPAGE="http://code.google.com/p/ibus/"
-DOWNLOAD="http://ibus.googlecode.com/files/ibus-1.3.5.tar.gz"
-MD5SUM="9f92b8e47d2c0bee67cf3e25f7b8c52d"
+DOWNLOAD="http://ibus.googlecode.com/files/ibus-1.3.7.tar.gz"
+MD5SUM="5a2acbda6cad23f6403c88347ac60e2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grissiom"
-- 
cgit v1.2.3