summaryrefslogtreecommitdiff
path: root/community/ibus
diff options
context:
space:
mode:
Diffstat (limited to 'community/ibus')
-rw-r--r--community/ibus/PKGBUILD22
-rw-r--r--community/ibus/ibus-1389-dbus-address.patch15
2 files changed, 23 insertions, 14 deletions
diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 144c534fd..485e2b61a 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63863 2012-02-06 10:52:08Z ebelanger $
+# $Id: PKGBUILD 73242 2012-07-04 07:56:41Z ebelanger $
# Contributor: Rainy <rainylau(at)gmail(dot)com>
# Contributor: Lee.MaRS <leemars at gmail dot com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,44 +6,38 @@
pkgname=ibus
pkgver=1.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Next Generation Input Bus for Linux"
arch=('i686' 'x86_64')
url="http://ibus.googlecode.com"
license=('LGPL')
-depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \
+depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \
'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme')
makedepends=('intltool' 'gobject-introspection')
optdepends=('notification-daemon')
options=('!libtool')
install=ibus.install
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88ef7dda720cec2de92b8673832a702e')
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1389-dbus-address.patch)
+sha1sums=('4cc045553885d35a118ec4b44c2694910209509e'
+ 'ee4eb1cf900a14d62adae932621ffb2f8d0a549d')
build() {
cd ${pkgname}-${pkgver}
export PYTHON=python2
- sed -i 's|--pkg=ibus-1.0||' src/Makefile.in
+ patch -p1 -i ../ibus-1389-dbus-address.patch
+ sed -i 's|--pkg=ibus-1.0|--pkg-export=ibus-1.0|' src/Makefile.in
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/ibus \
--sysconfdir=/etc \
--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
--enable-gtk3
-
-# python2 fix
- for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
- sed -i 's_exec python_exec python2_' $file
- done
-
make
}
package() {
cd ${pkgname}-${pkgver}
- export PYTHON=python2
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/etc/xdg/autostart"
ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
- find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
}
diff --git a/community/ibus/ibus-1389-dbus-address.patch b/community/ibus/ibus-1389-dbus-address.patch
new file mode 100644
index 000000000..e6b18bdb2
--- /dev/null
+++ b/community/ibus/ibus-1389-dbus-address.patch
@@ -0,0 +1,15 @@
+--- ibus-1.4.99.20120317/src/ibusshare.c.orig 2012-04-26 12:24:55.922072674 +0900
++++ ibus-1.4.99.20120317/src/ibusshare.c 2012-04-26 13:10:44.301421547 +0900
+@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void)
+ if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+ &machine_id,
+ NULL,
+- &error)) {
++ &error) &&
++ !g_file_get_contents ("/etc/machine-id",
++ &machine_id,
++ NULL,
++ NULL)) {
+ g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
+ g_error_free (error);
+ machine_id = "machine-id";