Fri May 18 11:12:25 2012 UTC ()
Update patches to upstream changes for non UTF-8 locales.

Bump PKGREVISION.


(obache)
diff -r1.15 -r1.16 pkgsrc/inputmethod/ibus/Makefile
diff -r1.5 -r1.6 pkgsrc/inputmethod/ibus/distinfo
diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus/patches/patch-setup_i18n.py
cvs diff -r1.15 -r1.16 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2012/05/02 09:11:43 1.15
+++ pkgsrc/inputmethod/ibus/Makefile 2012/05/18 11:12:24 1.16
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2012/05/02 09:11:43 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2012/05/18 11:12:24 obache Exp $
2# 2#
3 3
4DISTNAME= ibus-1.4.1 4DISTNAME= ibus-1.4.1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= inputmethod 6CATEGORIES= inputmethod
7MASTER_SITES= http://ibus.googlecode.com/files/ 7MASTER_SITES= http://ibus.googlecode.com/files/
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://code.google.com/p/ibus/ 10HOMEPAGE= http://code.google.com/p/ibus/
11COMMENT= Intelligent Input Bus 11COMMENT= Intelligent Input Bus
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg 16DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
17DEPENDS+= ${PYPKGPREFIX}-notify>=0.1.1nb3:../../sysutils/py-notify 17DEPENDS+= ${PYPKGPREFIX}-notify>=0.1.1nb3:../../sysutils/py-notify
18 18
cvs diff -r1.5 -r1.6 pkgsrc/inputmethod/ibus/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2012/05/02 09:11:44 1.5
+++ pkgsrc/inputmethod/ibus/distinfo 2012/05/18 11:12:24 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2012/05/02 09:11:44 obache Exp $ 1$NetBSD: distinfo,v 1.6 2012/05/18 11:12:24 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 6SHA1 (patch-setup_i18n.py) = 0069b00b83a9348cca73c85adddf554733356544
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus/patches/Attic/patch-setup_i18n.py (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/Attic/patch-setup_i18n.py 2012/05/02 09:11:44 1.1
+++ pkgsrc/inputmethod/ibus/patches/Attic/patch-setup_i18n.py 2012/05/18 11:12:25 1.2
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: patch-setup_i18n.py,v 1.1 2012/05/02 09:11:44 obache Exp $ 1$NetBSD: patch-setup_i18n.py,v 1.2 2012/05/18 11:12:25 obache Exp $
2 2
3* fix translations fail 3* fix translations fail
4 http://code.google.com/p/ibus/issues/detail?id=1453 4 http://code.google.com/p/ibus/issues/detail?id=1453
5 5
6--- setup/i18n.py.orig 2012-02-02 04:54:54.000000000 +0000 6--- setup/i18n.py.orig 2012-02-02 04:54:54.000000000 +0000
7+++ setup/i18n.py 7+++ setup/i18n.py
8@@ -20,6 +20,7 @@ 8@@ -20,6 +20,7 @@
9 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, 9 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
10 # Boston, MA 02111-1307 USA 10 # Boston, MA 02111-1307 USA
11  11
12+import locale 12+import locale
13 import gettext 13 import gettext
14 import os 14 import os
15  15
16@@ -30,5 +31,12 @@ N_ = lambda a: a 16@@ -30,5 +31,13 @@ N_ = lambda a: a
17  17
18 def init(): 18 def init():
19 localedir = os.getenv("IBUS_LOCALEDIR") 19 localedir = os.getenv("IBUS_LOCALEDIR")
20+ # Python's locale module doesn't provide all methods on some 20+ # Python's locale module doesn't provide all methods on some
21+ # operating systems like FreeBSD 21+ # operating systems like FreeBSD
22+ try: 22+ try:
23+ # for non-standard localedir 23+ # for non-standard localedir
24+ locale.bindtextdomain(DOMAINNAME, localedir) 24+ locale.bindtextdomain(DOMAINNAME, localedir)
 25+ locale.bind_textdomain_codeset(DOMAINNAME, "UTF-8")
25+ except AttributeError: 26+ except AttributeError:
26+ pass 27+ pass
27 gettext.bindtextdomain(DOMAINNAME, localedir) 28 gettext.bindtextdomain(DOMAINNAME, localedir)
28 gettext.bind_textdomain_codeset(DOMAINNAME, "UTF-8") 29 gettext.bind_textdomain_codeset(DOMAINNAME, "UTF-8")