Sat Apr 28 01:40:07 2018 UTC ()
ibus, ibus-python: update to 1.5.18.

pkgsrc changes:
- explicitly specify USE_TOOLS+=gmsgfmt to handle msgfmt --desktop
- pull an upstream change to fix a configure bug in 1.5.18
- use a new unicode character database

Upstream changes (from https://github.com/ibus/ibus/releases):

1.5.18

* tools: Do not change keymaps with 'use-system-keyboard-layout' c360818
* src: Fix GVariant leaks (Carlos Garnacho) 1cbe867
* src: Added some error handlings from a code review f5e0752
* src: Add libgobject.so to LDADD for Debian libtool (Danny) a28fa74
* src: Reintroduce the hex mode keybind with an environment variable
  (Aaron Muir Hamilton) 88b9a93
* ui/gtk3: Translate input method name in ibus (Peng Wu) 0ab0dd3
* Added DBus filtering against malware bfe57d2
* Implement Unicode choice on Emojier e17c998 4cfd5ad d1ebb3d fc54b0c afe60c1
* Implement ibus-extension-gtk3 for the global keybinding fb07f64 c57b7c3
* Disable panel extension for 'gdm' and 'liveuser' user 7ccbd21 ece320b
* ui/gtk3: Set title string in gnome-shell 56c67b1
* Add ISSUE_TEMPLATE ff611a4 9f2699c
* Updated translations 366963d 73b420f


(tsutsui)
diff -r1.52 -r1.53 pkgsrc/inputmethod/ibus/Makefile
diff -r1.11 -r1.12 pkgsrc/inputmethod/ibus/Makefile.common
diff -r1.9 -r1.10 pkgsrc/inputmethod/ibus/PLIST
diff -r1.18 -r1.19 pkgsrc/inputmethod/ibus/distinfo
diff -r1.13 -r1.14 pkgsrc/inputmethod/ibus-python/Makefile
diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus-python/PLIST
diff -r0 -r1.1 pkgsrc/inputmethod/ibus/patches/patch-configure
cvs diff -r1.52 -r1.53 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2018/04/16 14:34:43 1.52
+++ pkgsrc/inputmethod/ibus/Makefile 2018/04/28 01:40:07 1.53
@@ -1,44 +1,45 @@ @@ -1,44 +1,45 @@
1# $NetBSD: Makefile,v 1.52 2018/04/16 14:34:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.53 2018/04/28 01:40:07 tsutsui Exp $
2 2
3PKGREVISION= 4 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6COMMENT= Intelligent Input Bus 5COMMENT= Intelligent Input Bus
7 6
8DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 7DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
9BUILD_DEPENDS+= cldr-emoji-annotation-[0-9]*:../../textproc/cldr-emoji-annotation 8BUILD_DEPENDS+= cldr-emoji-annotation-[0-9]*:../../textproc/cldr-emoji-annotation
 9BUILD_DEPENDS+= unicode-character-database-[0-9]*:../../textproc/unicode-character-database
10BUILD_DEPENDS+= unicode-emoji-[0-9]*:../../textproc/unicode-emoji 10BUILD_DEPENDS+= unicode-emoji-[0-9]*:../../textproc/unicode-emoji
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config intltool msgfmt gmake 14USE_TOOLS+= pkg-config intltool gmsgfmt gmake
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17 17
18GCONF_SCHEMAS+= ibus.schemas 18GCONF_SCHEMAS+= ibus.schemas
19PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in 19PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
20 20
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
22CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 22CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
23CONFIGURE_ARGS+= --enable-dconf 23CONFIGURE_ARGS+= --enable-dconf
24CONFIGURE_ARGS+= --enable-gconf 24CONFIGURE_ARGS+= --enable-gconf
25CONFIGURE_ARGS+= --enable-gtk2 25CONFIGURE_ARGS+= --enable-gtk2
26CONFIGURE_ARGS+= --enable-gtk3 26CONFIGURE_ARGS+= --enable-gtk3
27CONFIGURE_ARGS+= --enable-surrounding-text 27CONFIGURE_ARGS+= --enable-surrounding-text
28CONFIGURE_ARGS+= --enable-introspection=yes 28CONFIGURE_ARGS+= --enable-introspection=yes
29CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 29CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
30CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji 30CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji
31CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations 31CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
 32CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd
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
39MANCOMPRESSED= yes 40MANCOMPRESSED= yes
40 41
41INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus 42INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus
42MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d 43MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d
43MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile 44MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile
44CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \ 45CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \
cvs diff -r1.11 -r1.12 pkgsrc/inputmethod/ibus/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile.common 2017/11/05 04:19:15 1.11
+++ pkgsrc/inputmethod/ibus/Makefile.common 2018/04/28 01:40:07 1.12
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.11 2017/11/05 04:19:15 tsutsui Exp $ 1# $NetBSD: Makefile.common,v 1.12 2018/04/28 01:40:07 tsutsui Exp $
2# 2#
3# used by inputmethod/ibus/Makefile 3# used by inputmethod/ibus/Makefile
4# used by inputmethod/ibus-python/Makefile 4# used by inputmethod/ibus-python/Makefile
5 5
6DISTNAME= ibus-1.5.17 6DISTNAME= ibus-1.5.18
7CATEGORIES= inputmethod 7CATEGORIES= inputmethod
8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/ 8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
9 9
10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches 11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/ibus/ibus/wiki 14HOMEPAGE= https://github.com/ibus/ibus/wiki
15LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1
cvs diff -r1.9 -r1.10 pkgsrc/inputmethod/ibus/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/PLIST 2017/11/05 04:19:15 1.9
+++ pkgsrc/inputmethod/ibus/PLIST 2018/04/28 01:40:07 1.10
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1@comment $NetBSD: PLIST,v 1.9 2017/11/05 04:19:15 tsutsui Exp $ 1@comment $NetBSD: PLIST,v 1.10 2018/04/28 01:40:07 tsutsui Exp $
2bin/ibus 2bin/ibus
3bin/ibus-daemon 3bin/ibus-daemon
4bin/ibus-setup 4bin/ibus-setup
5include/ibus-1.0/ibus.h 5include/ibus-1.0/ibus.h
 6include/ibus-1.0/ibusaccelgroup.h
6include/ibus-1.0/ibusattribute.h 7include/ibus-1.0/ibusattribute.h
7include/ibus-1.0/ibusattrlist.h 8include/ibus-1.0/ibusattrlist.h
8include/ibus-1.0/ibusbus.h 9include/ibus-1.0/ibusbus.h
9include/ibus-1.0/ibuscomponent.h 10include/ibus-1.0/ibuscomponent.h
10include/ibus-1.0/ibusconfig.h 11include/ibus-1.0/ibusconfig.h
11include/ibus-1.0/ibusconfigservice.h 12include/ibus-1.0/ibusconfigservice.h
12include/ibus-1.0/ibusdebug.h 13include/ibus-1.0/ibusdebug.h
13include/ibus-1.0/ibusemoji.h 14include/ibus-1.0/ibusemoji.h
14include/ibus-1.0/ibusengine.h 15include/ibus-1.0/ibusengine.h
15include/ibus-1.0/ibusenginedesc.h 16include/ibus-1.0/ibusenginedesc.h
16include/ibus-1.0/ibusenginesimple.h 17include/ibus-1.0/ibusenginesimple.h
17include/ibus-1.0/ibusenumtypes.h 18include/ibus-1.0/ibusenumtypes.h
18include/ibus-1.0/ibuserror.h 19include/ibus-1.0/ibuserror.h
@@ -26,47 +27,52 @@ include/ibus-1.0/ibuskeysyms.h @@ -26,47 +27,52 @@ include/ibus-1.0/ibuskeysyms.h
26include/ibus-1.0/ibuslookuptable.h 27include/ibus-1.0/ibuslookuptable.h
27include/ibus-1.0/ibusobject.h 28include/ibus-1.0/ibusobject.h
28include/ibus-1.0/ibusobservedpath.h 29include/ibus-1.0/ibusobservedpath.h
29include/ibus-1.0/ibuspanelservice.h 30include/ibus-1.0/ibuspanelservice.h
30include/ibus-1.0/ibusproperty.h 31include/ibus-1.0/ibusproperty.h
31include/ibus-1.0/ibusproplist.h 32include/ibus-1.0/ibusproplist.h
32include/ibus-1.0/ibusproxy.h 33include/ibus-1.0/ibusproxy.h
33include/ibus-1.0/ibusregistry.h 34include/ibus-1.0/ibusregistry.h
34include/ibus-1.0/ibusserializable.h 35include/ibus-1.0/ibusserializable.h
35include/ibus-1.0/ibusservice.h 36include/ibus-1.0/ibusservice.h
36include/ibus-1.0/ibusshare.h 37include/ibus-1.0/ibusshare.h
37include/ibus-1.0/ibustext.h 38include/ibus-1.0/ibustext.h
38include/ibus-1.0/ibustypes.h 39include/ibus-1.0/ibustypes.h
 40include/ibus-1.0/ibusunicode.h
39include/ibus-1.0/ibusutil.h 41include/ibus-1.0/ibusutil.h
40include/ibus-1.0/ibusversion.h 42include/ibus-1.0/ibusversion.h
 43include/ibus-1.0/ibusxevent.h
41include/ibus-1.0/ibusxml.h 44include/ibus-1.0/ibusxml.h
42lib/girepository-1.0/IBus-1.0.typelib 45lib/girepository-1.0/IBus-1.0.typelib
43lib/gtk-2.0/2.10.0/immodules/im-ibus.la 46lib/gtk-2.0/2.10.0/immodules/im-ibus.la
44lib/gtk-3.0/3.0.0/immodules/im-ibus.la 47lib/gtk-3.0/3.0.0/immodules/im-ibus.la
45lib/libibus-1.0.la 48lib/libibus-1.0.la
46lib/pkgconfig/ibus-1.0.pc 49lib/pkgconfig/ibus-1.0.pc
47libexec/ibus-dconf 50libexec/ibus-dconf
48libexec/ibus-engine-simple 51libexec/ibus-engine-simple
 52libexec/ibus-extension-gtk3
49libexec/ibus-gconf 53libexec/ibus-gconf
50libexec/ibus-portal 54libexec/ibus-portal
51libexec/ibus-ui-emojier 55libexec/ibus-ui-emojier
52libexec/ibus-ui-gtk3 56libexec/ibus-ui-gtk3
53libexec/ibus-x11 57libexec/ibus-x11
54man/man1/ibus-daemon.1 58man/man1/ibus-daemon.1
55man/man1/ibus-setup.1 59man/man1/ibus-setup.1
56man/man1/ibus.1 60man/man1/ibus.1
57man/man7/ibus-emoji.7 61man/man7/ibus-emoji.7
58share/GConf/gsettings/ibus.convert 62share/GConf/gsettings/ibus.convert
59share/applications/ibus-setup.desktop 63share/applications/ibus-setup.desktop
 64share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
 65share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
60share/bash-completion/completions/ibus.bash 66share/bash-completion/completions/ibus.bash
61share/dbus-1/services/org.freedesktop.IBus.service 67share/dbus-1/services/org.freedesktop.IBus.service
62share/dbus-1/services/org.freedesktop.portal.IBus.service 68share/dbus-1/services/org.freedesktop.portal.IBus.service
63share/examples/ibus/dconf/db/ibus.d/00-upstream-settings 69share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
64share/examples/ibus/dconf/profile/ibus 70share/examples/ibus/dconf/profile/ibus
65share/gconf/schemas/ibus.schemas 71share/gconf/schemas/ibus.schemas
66share/gir-1.0/IBus-1.0.gir 72share/gir-1.0/IBus-1.0.gir
67share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml 73share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
68share/gtk-doc/html/ibus/IBusAttrList.html 74share/gtk-doc/html/ibus/IBusAttrList.html
69share/gtk-doc/html/ibus/IBusAttribute.html 75share/gtk-doc/html/ibus/IBusAttribute.html
70share/gtk-doc/html/ibus/IBusBus.html 76share/gtk-doc/html/ibus/IBusBus.html
71share/gtk-doc/html/ibus/IBusComponent.html 77share/gtk-doc/html/ibus/IBusComponent.html
72share/gtk-doc/html/ibus/IBusConfig.html 78share/gtk-doc/html/ibus/IBusConfig.html
@@ -109,26 +115,27 @@ share/gtk-doc/html/ibus/ibus-ibusutil.ht @@ -109,26 +115,27 @@ share/gtk-doc/html/ibus/ibus-ibusutil.ht
109share/gtk-doc/html/ibus/ibus-ibusversion.html 115share/gtk-doc/html/ibus/ibus-ibusversion.html
110share/gtk-doc/html/ibus/ibus-ibusxml.html 116share/gtk-doc/html/ibus/ibus-ibusxml.html
111share/gtk-doc/html/ibus/ibus.devhelp2 117share/gtk-doc/html/ibus/ibus.devhelp2
112share/gtk-doc/html/ibus/index.html 118share/gtk-doc/html/ibus/index.html
113share/gtk-doc/html/ibus/left-insensitive.png 119share/gtk-doc/html/ibus/left-insensitive.png
114share/gtk-doc/html/ibus/left.png 120share/gtk-doc/html/ibus/left.png
115share/gtk-doc/html/ibus/right-insensitive.png 121share/gtk-doc/html/ibus/right-insensitive.png
116share/gtk-doc/html/ibus/right.png 122share/gtk-doc/html/ibus/right.png
117share/gtk-doc/html/ibus/style.css 123share/gtk-doc/html/ibus/style.css
118share/gtk-doc/html/ibus/up-insensitive.png 124share/gtk-doc/html/ibus/up-insensitive.png
119share/gtk-doc/html/ibus/up.png 125share/gtk-doc/html/ibus/up.png
120share/ibus/component/dconf.xml 126share/ibus/component/dconf.xml
121share/ibus/component/gconf.xml 127share/ibus/component/gconf.xml
 128share/ibus/component/gtkextension.xml
122share/ibus/component/gtkpanel.xml 129share/ibus/component/gtkpanel.xml
123share/ibus/component/simple.xml 130share/ibus/component/simple.xml
124share/ibus/dicts/emoji-af.dict 131share/ibus/dicts/emoji-af.dict
125share/ibus/dicts/emoji-am.dict 132share/ibus/dicts/emoji-am.dict
126share/ibus/dicts/emoji-ar.dict 133share/ibus/dicts/emoji-ar.dict
127share/ibus/dicts/emoji-as.dict 134share/ibus/dicts/emoji-as.dict
128share/ibus/dicts/emoji-az.dict 135share/ibus/dicts/emoji-az.dict
129share/ibus/dicts/emoji-be.dict 136share/ibus/dicts/emoji-be.dict
130share/ibus/dicts/emoji-bg.dict 137share/ibus/dicts/emoji-bg.dict
131share/ibus/dicts/emoji-bn.dict 138share/ibus/dicts/emoji-bn.dict
132share/ibus/dicts/emoji-bs.dict 139share/ibus/dicts/emoji-bs.dict
133share/ibus/dicts/emoji-ca.dict 140share/ibus/dicts/emoji-ca.dict
134share/ibus/dicts/emoji-cs.dict 141share/ibus/dicts/emoji-cs.dict
@@ -194,26 +201,28 @@ share/ibus/dicts/emoji-sr_Latn.dict @@ -194,26 +201,28 @@ share/ibus/dicts/emoji-sr_Latn.dict
194share/ibus/dicts/emoji-sv.dict 201share/ibus/dicts/emoji-sv.dict
195share/ibus/dicts/emoji-sw.dict 202share/ibus/dicts/emoji-sw.dict
196share/ibus/dicts/emoji-ta.dict 203share/ibus/dicts/emoji-ta.dict
197share/ibus/dicts/emoji-te.dict 204share/ibus/dicts/emoji-te.dict
198share/ibus/dicts/emoji-th.dict 205share/ibus/dicts/emoji-th.dict
199share/ibus/dicts/emoji-tr.dict 206share/ibus/dicts/emoji-tr.dict
200share/ibus/dicts/emoji-uk.dict 207share/ibus/dicts/emoji-uk.dict
201share/ibus/dicts/emoji-ur.dict 208share/ibus/dicts/emoji-ur.dict
202share/ibus/dicts/emoji-uz.dict 209share/ibus/dicts/emoji-uz.dict
203share/ibus/dicts/emoji-vi.dict 210share/ibus/dicts/emoji-vi.dict
204share/ibus/dicts/emoji-zh.dict 211share/ibus/dicts/emoji-zh.dict
205share/ibus/dicts/emoji-zh_Hant.dict 212share/ibus/dicts/emoji-zh_Hant.dict
206share/ibus/dicts/emoji-zu.dict 213share/ibus/dicts/emoji-zu.dict
 214share/ibus/dicts/unicode-blocks.dict
 215share/ibus/dicts/unicode-names.dict
207share/ibus/keymaps/common 216share/ibus/keymaps/common
208share/ibus/keymaps/in 217share/ibus/keymaps/in
209share/ibus/keymaps/jp 218share/ibus/keymaps/jp
210share/ibus/keymaps/kr 219share/ibus/keymaps/kr
211share/ibus/keymaps/modifiers 220share/ibus/keymaps/modifiers
212share/ibus/keymaps/us 221share/ibus/keymaps/us
213share/ibus/setup/emojilang.py 222share/ibus/setup/emojilang.py
214share/ibus/setup/emojilang.pyc 223share/ibus/setup/emojilang.pyc
215share/ibus/setup/emojilang.pyo 224share/ibus/setup/emojilang.pyo
216share/ibus/setup/engineabout.py 225share/ibus/setup/engineabout.py
217share/ibus/setup/engineabout.pyc 226share/ibus/setup/engineabout.pyc
218share/ibus/setup/engineabout.pyo 227share/ibus/setup/engineabout.pyo
219share/ibus/setup/enginecombobox.py 228share/ibus/setup/enginecombobox.py
cvs diff -r1.18 -r1.19 pkgsrc/inputmethod/ibus/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2017/11/05 04:19:15 1.18
+++ pkgsrc/inputmethod/ibus/distinfo 2018/04/28 01:40:07 1.19
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.18 2017/11/05 04:19:15 tsutsui Exp $ 1$NetBSD: distinfo,v 1.19 2018/04/28 01:40:07 tsutsui Exp $
2 2
3SHA1 (ibus-1.5.17.tar.gz) = 2e2039757d7e8e60f4101b8d197b6fb972f2e787 3SHA1 (ibus-1.5.18.tar.gz) = fad8dbc99f5bc55e03c7d9693cbbc6c1a211ae09
4RMD160 (ibus-1.5.17.tar.gz) = cc622a536cc3cce572c16f751203f87c8ed5ba08 4RMD160 (ibus-1.5.18.tar.gz) = 457d97552256b7d8245c961ea84e5dc7cde737c6
5SHA512 (ibus-1.5.17.tar.gz) = 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c 5SHA512 (ibus-1.5.18.tar.gz) = 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
6Size (ibus-1.5.17.tar.gz) = 2522960 bytes 6Size (ibus-1.5.18.tar.gz) = 2760121 bytes
7SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd 7SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
8SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005 8SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
 9SHA1 (patch-configure) = 4e41d54014a752e4aec7d995676f77d025b22448
cvs diff -r1.13 -r1.14 pkgsrc/inputmethod/ibus-python/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-python/Makefile 2018/04/14 12:24:31 1.13
+++ pkgsrc/inputmethod/ibus-python/Makefile 2018/04/28 01:40:07 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2018/04/14 12:24:31 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2018/04/28 01:40:07 tsutsui Exp $
2 2
3.include "../../inputmethod/ibus/Makefile.common" 3.include "../../inputmethod/ibus/Makefile.common"
4 4
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/ibus/ibus-python/} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/ibus/ibus-python/}
6 6
7COMMENT= Python library for Intelligent Input Bus 7COMMENT= Python library for Intelligent Input Bus
8LICENSE= gnu-lgpl-v2.1 8LICENSE= gnu-lgpl-v2.1
9 9
10USE_LANGUAGES= c c++ 10USE_LANGUAGES= c c++
11USE_LIBTOOL= yes 11USE_LIBTOOL= yes
12USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
13USE_TOOLS+= pkg-config intltool msgfmt gmake 13USE_TOOLS+= pkg-config intltool msgfmt gmake
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -17,26 +17,27 @@ DEPENDS+= ibus>=${PKGVERSION_NOREV}:../. @@ -17,26 +17,27 @@ DEPENDS+= ibus>=${PKGVERSION_NOREV}:../.
17DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 17DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
18DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 18DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
19 19
20PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in 20PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
21 21
22CONFIGURE_ARGS+= --disable-gtk2 22CONFIGURE_ARGS+= --disable-gtk2
23CONFIGURE_ARGS+= --disable-gtk3 23CONFIGURE_ARGS+= --disable-gtk3
24CONFIGURE_ARGS+= --disable-xim 24CONFIGURE_ARGS+= --disable-xim
25CONFIGURE_ARGS+= --disable-nls 25CONFIGURE_ARGS+= --disable-nls
26CONFIGURE_ARGS+= --disable-libnotify 26CONFIGURE_ARGS+= --disable-libnotify
27CONFIGURE_ARGS+= --disable-engine 27CONFIGURE_ARGS+= --disable-engine
28CONFIGURE_ARGS+= --disable-surround-text 28CONFIGURE_ARGS+= --disable-surround-text
29CONFIGURE_ARGS+= --disable-emoji-dict 29CONFIGURE_ARGS+= --disable-emoji-dict
 30CONFIGURE_ARGS+= --disable-unicode-dict
30 31
31.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
32.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*) 33.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
33BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable 34BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
34.endif 35.endif
35 36
36NO_BUILD= yes 37NO_BUILD= yes
37INSTALL_DIRS= bindings ibus 38INSTALL_DIRS= bindings ibus
38 39
39CONFIGURE_ARGS+= --disable-dconf 40CONFIGURE_ARGS+= --disable-dconf
40CONFIGURE_ARGS+= --disable-gconf 41CONFIGURE_ARGS+= --disable-gconf
41CONFIGURE_ARGS+= --enable-python-library 42CONFIGURE_ARGS+= --enable-python-library
42CONFIGURE_ENV+= PYTHON2=${PYTHONBIN} 43CONFIGURE_ENV+= PYTHON2=${PYTHONBIN}
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus-python/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-python/PLIST 2013/10/23 11:56:21 1.1
+++ pkgsrc/inputmethod/ibus-python/PLIST 2018/04/28 01:40:07 1.2
@@ -1,17 +1,14 @@ @@ -1,17 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2013/10/23 11:56:21 obache Exp $ 1@comment $NetBSD: PLIST,v 1.2 2018/04/28 01:40:07 tsutsui Exp $
2${PYSITELIB}/gi/overrides/IBus.py 
3${PYSITELIB}/gi/overrides/IBus.pyc 
4${PYSITELIB}/gi/overrides/IBus.pyo 
5${PYSITELIB}/ibus/__init__.py 2${PYSITELIB}/ibus/__init__.py
6${PYSITELIB}/ibus/__init__.pyc 3${PYSITELIB}/ibus/__init__.pyc
7${PYSITELIB}/ibus/__init__.pyo 4${PYSITELIB}/ibus/__init__.pyo
8${PYSITELIB}/ibus/_config.py 5${PYSITELIB}/ibus/_config.py
9${PYSITELIB}/ibus/_config.pyc 6${PYSITELIB}/ibus/_config.pyc
10${PYSITELIB}/ibus/_config.pyo 7${PYSITELIB}/ibus/_config.pyo
11${PYSITELIB}/ibus/_gtk.py 8${PYSITELIB}/ibus/_gtk.py
12${PYSITELIB}/ibus/_gtk.pyc 9${PYSITELIB}/ibus/_gtk.pyc
13${PYSITELIB}/ibus/_gtk.pyo 10${PYSITELIB}/ibus/_gtk.pyo
14${PYSITELIB}/ibus/application.py 11${PYSITELIB}/ibus/application.py
15${PYSITELIB}/ibus/application.pyc 12${PYSITELIB}/ibus/application.pyc
16${PYSITELIB}/ibus/application.pyo 13${PYSITELIB}/ibus/application.pyo
17${PYSITELIB}/ibus/ascii.py 14${PYSITELIB}/ibus/ascii.py
File Added: pkgsrc/inputmethod/ibus/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2018/04/28 01:40:07 tsutsui Exp $

* pull upstream fix:
 https://github.com/ibus/ibus/commit/5788be80685f397c3db3bdf4e672d67cfb9b3433#diff-67e997bcfdac55191033d57a16d1408a

--- configure.orig	2018-03-02 08:24:44.000000000 +0000
+++ configure
@@ -20218,7 +20218,7 @@ fi
 
 # Check whether --with-ucd-dir was given.
 if test "${with_ucd_dir+set}" = set; then :
-  withval=$with_ucd_dir; UCD_DIR=$with_emoji_annotation_dir
+  withval=$with_ucd_dir; UCD_DIR=$with_ucd_dir
 else
   UCD_DIR="/usr/share/unicode/ucd"