summaryrefslogtreecommitdiff
path: root/inputmethod/ibus
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2012-05-18 11:12:24 +0000
committerobache <obache@pkgsrc.org>2012-05-18 11:12:24 +0000
commit74a63ffe4e0827d94541e5d6677529e331ade5d7 (patch)
treeccd3e2f7678a7118702b2c9a0b16d7ef6533d505 /inputmethod/ibus
parentc353125a85b709f90fbd72f6440f2042b7132baf (diff)
downloadpkgsrc-74a63ffe4e0827d94541e5d6677529e331ade5d7.tar.gz
Update patches to upstream changes for non UTF-8 locales.
Bump PKGREVISION.
Diffstat (limited to 'inputmethod/ibus')
-rw-r--r--inputmethod/ibus/Makefile4
-rw-r--r--inputmethod/ibus/distinfo4
-rw-r--r--inputmethod/ibus/patches/patch-setup_i18n.py5
3 files changed, 7 insertions, 6 deletions
diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index a463a72690d..61d0702c3b1 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/05/02 09:11:43 obache Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/18 11:12:24 obache Exp $
#
DISTNAME= ibus-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index 5017e66bb6a..1f40e99765a 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2012/05/02 09:11:44 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/05/18 11:12:24 obache Exp $
SHA1 (ibus-1.4.1.tar.gz) = 4cc045553885d35a118ec4b44c2694910209509e
RMD160 (ibus-1.4.1.tar.gz) = 4003fc9392c59ce35048689aa50a941cfd151cff
Size (ibus-1.4.1.tar.gz) = 1479412 bytes
-SHA1 (patch-setup_i18n.py) = a132bb392b9b50185fe6e8740e4c74243e730fe6
+SHA1 (patch-setup_i18n.py) = 0069b00b83a9348cca73c85adddf554733356544
diff --git a/inputmethod/ibus/patches/patch-setup_i18n.py b/inputmethod/ibus/patches/patch-setup_i18n.py
index 910980eaba4..4895a03da82 100644
--- a/inputmethod/ibus/patches/patch-setup_i18n.py
+++ b/inputmethod/ibus/patches/patch-setup_i18n.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup_i18n.py,v 1.1 2012/05/02 09:11:44 obache Exp $
+$NetBSD: patch-setup_i18n.py,v 1.2 2012/05/18 11:12:25 obache Exp $
* fix translations fail
http://code.google.com/p/ibus/issues/detail?id=1453
@@ -13,7 +13,7 @@ $NetBSD: patch-setup_i18n.py,v 1.1 2012/05/02 09:11:44 obache Exp $
import gettext
import os
-@@ -30,5 +31,12 @@ N_ = lambda a: a
+@@ -30,5 +31,13 @@ N_ = lambda a: a
def init():
localedir = os.getenv("IBUS_LOCALEDIR")
@@ -22,6 +22,7 @@ $NetBSD: patch-setup_i18n.py,v 1.1 2012/05/02 09:11:44 obache Exp $
+ try:
+ # for non-standard localedir
+ locale.bindtextdomain(DOMAINNAME, localedir)
++ locale.bind_textdomain_codeset(DOMAINNAME, "UTF-8")
+ except AttributeError:
+ pass
gettext.bindtextdomain(DOMAINNAME, localedir)