From db00cfe5f1c7e6b9db0e837018f0f128e6faf06a Mon Sep 17 00:00:00 2001
From: Grissiom <chaos.proton@gmail.com>
Date: Sun, 17 Oct 2010 10:14:30 -0400
Subject: misc/ibus: Use GConf by default.

  # Updated by crocket (crockabiscuit@yahoo.com)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 misc/ibus/README          | 7 +++++--
 misc/ibus/ibus.SlackBuild | 9 ++++-----
 misc/ibus/ibus.info       | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'misc/ibus')

diff --git a/misc/ibus/README b/misc/ibus/README
index 6eec7a2ddf..14b78bff92 100644
--- a/misc/ibus/README
+++ b/misc/ibus/README
@@ -6,10 +6,13 @@ 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 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.
+This requires pyxdg. By default, it uses GConf. But you can let it
+use memconf instead of GConf explicitly by setting USE_GCONF=no.
+GConf can be found in SBo.
 If you use qt applications, then you probably want ibus-qt as well.
 
+Thus, this requires GConf unless you choose to use memconf instead.
+
 After installing, ibus will automatically be started in an xdg-compliant
 desktop environment; if this behavior is undesirable, you can disable it
 using your DE's session and/or startup management utility.
diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild
index aa64dffe0f..77dd74611a 100644
--- a/misc/ibus/ibus.SlackBuild
+++ b/misc/ibus/ibus.SlackBuild
@@ -29,7 +29,7 @@
 
 PRGNAM=ibus
 VERSION=${VERSION:-1.3.7}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-USE_GCONF=${USE_GCONF:-"no"}
+USE_GCONF=${USE_GCONF:-"yes"}
 if [ "$USE_GCONF" = "yes" ]; then
   conf_opt="--enable-gconf"
 else
@@ -87,7 +87,6 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-memconf \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-html-dir=/usr/share/gtk-doc/html \
@@ -97,12 +96,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-# add kimpanel support, panel.py is harvested from
+# Add kimpanel support, panel.py is harvested from
 # http://websvn.kde.org/tags/KDE/4.4.3/kdeplasma-addons/applets/kimpanel/backend/ibus/panel.py
 mkdir $PKG/usr/share/ibus/ui/kimpanel
 cp $CWD/panel.py $PKG/usr/share/ibus/ui/kimpanel
 chmod 0755 $PKG/usr/share/ibus/ui/kimpanel/panel.py
-# link the icon to where kimpanel will look for.
+# Link the icon to where kimpanel will look for.
 ( cd $PKG/usr/share/ibus/icons
   ln -s ../../icons/hicolor/scalable/apps/ibus.svg .
 )
diff --git a/misc/ibus/ibus.info b/misc/ibus/ibus.info
index 89aa092336..cedd3389d0 100644
--- a/misc/ibus/ibus.info
+++ b/misc/ibus/ibus.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grissiom"
 EMAIL="chaos.proton@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
-- 
cgit v1.2.3