Wed May 2 09:11:44 2012 UTC ()
Add a patch to fix translations fail of ibus-setup.

Bump PKGREVISION.


(obache)
diff -r1.14 -r1.15 pkgsrc/inputmethod/ibus/Makefile
diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/distinfo
diff -r0 -r1.1 pkgsrc/inputmethod/ibus/patches/patch-setup_i18n.py
cvs diff -r1.14 -r1.15 pkgsrc/inputmethod/ibus/Makefile (switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2012/04/22 13:57:30 1.14
+++ pkgsrc/inputmethod/ibus/Makefile 2012/05/02 09:11:43 1.15
@@ -1,56 +1,57 @@ @@ -1,56 +1,57 @@
1# $NetBSD: Makefile,v 1.14 2012/04/22 13:57:30 obache Exp $ 1# $NetBSD: Makefile,v 1.15 2012/05/02 09:11:43 obache Exp $
2# 2#
3 3
4DISTNAME= ibus-1.4.1 4DISTNAME= ibus-1.4.1
 5PKGREVISION= 1
5CATEGORIES= inputmethod 6CATEGORIES= inputmethod
6MASTER_SITES= http://ibus.googlecode.com/files/ 7MASTER_SITES= http://ibus.googlecode.com/files/
7 8
8MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://code.google.com/p/ibus/ 10HOMEPAGE= http://code.google.com/p/ibus/
10COMMENT= Intelligent Input Bus 11COMMENT= Intelligent Input Bus
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg 16DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
16DEPENDS+= ${PYPKGPREFIX}-notify>=0.1.1nb3:../../sysutils/py-notify 17DEPENDS+= ${PYPKGPREFIX}-notify>=0.1.1nb3:../../sysutils/py-notify
17 18
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config intltool msgfmt gmake 21USE_TOOLS+= pkg-config intltool msgfmt gmake
21USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
22USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
23 24
24GCONF_SCHEMAS+= ibus.schemas 25GCONF_SCHEMAS+= ibus.schemas
25PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in 26PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
26 27
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
28CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 29CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
29CONFIGURE_ARGS+= --enable-gtk2 30CONFIGURE_ARGS+= --enable-gtk2
30CONFIGURE_ARGS+= --disable-gtk3 31CONFIGURE_ARGS+= --disable-gtk3
31CONFIGURE_ARGS+= --enable-surrounding-text 32CONFIGURE_ARGS+= --enable-surrounding-text
32 33
33SUBST_CLASSES+= dbus 34SUBST_CLASSES+= dbus
34SUBST_STAGE.dbus= post-configure 35SUBST_STAGE.dbus= post-configure
35SUBST_FILES.dbus= src/ibusshare.c 36SUBST_FILES.dbus= src/ibusshare.c
36SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/db/dbus/machine-id,g' 37SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/db/dbus/machine-id,g'
37 38
38BUILD_DEFS+= PKG_SYSCONFBASE VARBASE 39BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
39 40
40BUILDLINK_API_DEPENDS.GConf+= GConf>=2.12 41BUILDLINK_API_DEPENDS.GConf+= GConf>=2.12
41.include "../../devel/GConf/schemas.mk" 42.include "../../devel/GConf/schemas.mk"
42.include "../../devel/gettext-lib/buildlink3.mk" 43.include "../../devel/gettext-lib/buildlink3.mk"
43BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0 44BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
44.include "../../devel/glib2/buildlink3.mk" 45.include "../../devel/glib2/buildlink3.mk"
45.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 46.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
46PY_PATCHPLIST= yes 47PY_PATCHPLIST= yes
47.include "../../lang/python/extension.mk" 48.include "../../lang/python/extension.mk"
48BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0 49BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0
49.include "../../sysutils/py-dbus/buildlink3.mk" 50.include "../../sysutils/py-dbus/buildlink3.mk"
50.include "../../textproc/iso-codes/buildlink3.mk" 51.include "../../textproc/iso-codes/buildlink3.mk"
51GTK2_IMMODULES= yes 52GTK2_IMMODULES= yes
52.include "../../x11/gtk2/modules.mk" 53.include "../../x11/gtk2/modules.mk"
53.include "../../x11/py-gtk2/buildlink3.mk" 54.include "../../x11/py-gtk2/buildlink3.mk"
54.include "../../x11/libX11/buildlink3.mk" 55.include "../../x11/libX11/buildlink3.mk"
55.include "../../sysutils/desktop-file-utils/desktopdb.mk" 56.include "../../sysutils/desktop-file-utils/desktopdb.mk"
56.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/distinfo (switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2012/04/22 13:57:30 1.4
+++ pkgsrc/inputmethod/ibus/distinfo 2012/05/02 09:11:44 1.5
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.4 2012/04/22 13:57:30 obache Exp $ 1$NetBSD: distinfo,v 1.5 2012/05/02 09:11:44 obache Exp $
2 2
3SHA1 (ibus-1.4.1.tar.gz) = 4cc045553885d35a118ec4b44c2694910209509e 3SHA1 (ibus-1.4.1.tar.gz) = 4cc045553885d35a118ec4b44c2694910209509e
4RMD160 (ibus-1.4.1.tar.gz) = 4003fc9392c59ce35048689aa50a941cfd151cff 4RMD160 (ibus-1.4.1.tar.gz) = 4003fc9392c59ce35048689aa50a941cfd151cff
5Size (ibus-1.4.1.tar.gz) = 1479412 bytes 5Size (ibus-1.4.1.tar.gz) = 1479412 bytes
 6SHA1 (patch-setup_i18n.py) = a132bb392b9b50185fe6e8740e4c74243e730fe6
File Added: pkgsrc/inputmethod/ibus/patches/Attic/patch-setup_i18n.py
$NetBSD: patch-setup_i18n.py,v 1.1 2012/05/02 09:11:44 obache Exp $

* fix translations fail
 http://code.google.com/p/ibus/issues/detail?id=1453

--- setup/i18n.py.orig	2012-02-02 04:54:54.000000000 +0000
+++ setup/i18n.py
@@ -20,6 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+import locale
 import gettext
 import os
 
@@ -30,5 +31,12 @@ N_ = lambda a: a
 
 def init():
     localedir = os.getenv("IBUS_LOCALEDIR")
+    # Python's locale module doesn't provide all methods on some
+    # operating systems like FreeBSD
+    try:
+        # for non-standard localedir
+        locale.bindtextdomain(DOMAINNAME, localedir)
+    except AttributeError:
+        pass
     gettext.bindtextdomain(DOMAINNAME, localedir)
     gettext.bind_textdomain_codeset(DOMAINNAME, "UTF-8")