aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrissiom <chaos.proton@gmail.com>2010-06-05 23:37:19 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-06-05 23:37:19 -0500
commitbfe9c28b08e6288beb8bc6086f849ecd8b3af38a (patch)
tree35e8f87dca97205f7c20ebb283fa149f5fc768c8
parent44b7865829008fb8757dd7c4aac85b4941fc50ef (diff)
misc/ibus: Miscellaneous cleanups.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--misc/ibus/README.SBO8
-rw-r--r--misc/ibus/doinst.sh24
-rw-r--r--misc/ibus/ibus.SlackBuild10
-rw-r--r--misc/ibus/ibus.info2
4 files changed, 32 insertions, 12 deletions
diff --git a/misc/ibus/README.SBO b/misc/ibus/README.SBO
index a7c2378f61f75..5521d56cca5a3 100644
--- a/misc/ibus/README.SBO
+++ b/misc/ibus/README.SBO
@@ -25,3 +25,11 @@ chmod +x /etc/profile.d/ibus.{sh,csh} will enable environment variable settings
at login, but if you have ibus-qt installed, you may also prefer to run
qtconfig and set "Default Input Method" to ibus.
+=====================
+integration with KDE4
+=====================
+Add ``--panel=/usr/share/ibus/ui/kimpanel/panel.py`` parameter to ibus when you
+run ibus-daemon. For example, you can append it to the "Exec" entry in
+/etc/xdg/autostart/ibus.desktop or any .desktop file you created for launching
+ibus. Then add "kimpanel" plasmaiod to your panel or dashboard. Restart ibus,
+you will see it shining out there.
diff --git a/misc/ibus/doinst.sh b/misc/ibus/doinst.sh
index b292e6286c41d..81bf0074f40f4 100644
--- a/misc/ibus/doinst.sh
+++ b/misc/ibus/doinst.sh
@@ -11,6 +11,20 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
+
+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
@@ -25,16 +39,6 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
fi
fi
-# Prepare the new configuration files
-for file in etc/profile.d/ibus.sh.new etc/profile.d/ibus.csh.new ; do
- if [ -e $(dirname $file)/$(basename $file .new) -a -x $(dirname $file)/$(basename $file .new) ]; then
- chmod 0755 $file
- else
- chmod 0644 $file
- fi
- config $file
-done
-
# Run gtk-query-immodules so that "ibus" will appear under Input Method
# when you right- click your mouse in a text box.
if [ -x usr/bin/update-gtk-immodules ]; then
diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild
index e0bad2cf54267..143d23c4b3785 100644
--- a/misc/ibus/ibus.SlackBuild
+++ b/misc/ibus/ibus.SlackBuild
@@ -89,6 +89,14 @@ CXXFLAGS="$SLKCFLAGS" \
make
make DESTDIR=$PKG install
+# 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
+cat $CWD/panel.py > $PKG/usr/share/ibus/ui/kimpanel/panel.py
+chmod 0755 $PKG/usr/share/ibus/ui/kimpanel/panel.py
+# link the icon to where kimpanel will look for.
+(cd $PKG/usr/share/ibus/icons;ln -s ../../icons/hicolor/scalable/apps/ibus.svg)
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -103,7 +111,7 @@ chmod 755 $PKG/etc/profile.d/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README \
+ AUTHORS COPYING ChangeLog NEWS README \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/README.SBO > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBO
diff --git a/misc/ibus/ibus.info b/misc/ibus/ibus.info
index 2f9ff08929717..29ad6553850fa 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="Erik Hanson"
+APPROVED="rworkman"