CVS commit: pkgsrc/inputmethod

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/inputmethod
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Sat, 2 Mar 2019 02:16:32 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Mar  2 02:16:32 UTC 2019

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile Makefile.common PLIST distinfo
        pkgsrc/inputmethod/ibus-python: Makefile
        pkgsrc/inputmethod/ibus/patches: patch-ui_gtk3_Makefile.am
            patch-ui_gtk3_Makefile.in
Removed Files:
        pkgsrc/inputmethod/ibus/patches: patch-configure
            patch-ui_gtk3_panelbinding.vala

Log Message:
ibus, ibus-python: update to 1.5.20.

pkgsrc changes:

- remove patches already applied to the release
- workaround upstream issue #2082
- explicitly require cldr-emoji-annotation >34.0.0.0
  to sync emoji dict files in ibus/PLIST
- remove GConf dependencies as mentioned in 1.5.20 changes

Upstream changes:
 https://github.com/ibus/ibus/releases/tag/1.5.20

1.5.20

* Support Shift-Space to insert a Space on Emojier preedit e6badb4
* Do not add emojis in compose category to emoji variants 8375f39
* Implement mouse click with Hangul in ibus side a40631e 4c40afb c7d8771
  9ae2d46 0fd043c
* Delete Gconf dependencies and migrate intltool to gettext a8e8b69
  74a00cc a671081 aa24a52 3914d3a b608666 a78e7f8 7b9c034 b30eb5d
* Do not delete IBUS_CAP_SURROUNDING_TEXT 7b3b8c8
* Show compose preedit with custom compose file ba41173 28b0744
* Fix Atom and Slack for Flatpak be7fb81 60e246e
* Delete Super-space notification 4d3a8ff
* Fix misc build issues aa0f425 6e31597 c1b5543 3172c3b 4d7c1e0
* Fix misc bugs 7edaefd 28d2217 809d880 1c6565e 0f5084e 6aab10f
* Fix typos in comment lines (ZhaoQiang) 639960a
* use iso 639-3 to have names for more languages (glasseyes) 1cd5254
* introspection: Tell the GI scanner to include the C headers
  (Mathieu Bridon) 4ef976a
* Add Uzbek layouts (bmansurov) 4592ce5
* Allow using non-abstract UNIX domain sockets (Anton Mikhalev) 7a38e4d
* typo: sevrer to server (scootergrisen) 64f4e41


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/ibus/Makefile.common \
    pkgsrc/inputmethod/ibus/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/inputmethod/ibus-python/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/inputmethod/ibus/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panelbinding.vala

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.60 pkgsrc/inputmethod/ibus/Makefile:1.61
--- pkgsrc/inputmethod/ibus/Makefile:1.60       Wed Nov 14 22:21:49 2018
+++ pkgsrc/inputmethod/ibus/Makefile    Sat Mar  2 02:16:32 2019
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.60 2018/11/14 22:21:49 kleink Exp $
+# $NetBSD: Makefile,v 1.61 2019/03/02 02:16:32 tsutsui Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   3
-
 COMMENT=       Intelligent Input Bus
 
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-BUILD_DEPENDS+=        cldr-emoji-annotation>=33.1.0.0:../../textproc/cldr-emoji-annotation
+BUILD_DEPENDS+=        cldr-emoji-annotation>=34.0.0.0:../../textproc/cldr-emoji-annotation
 BUILD_DEPENDS+=        unicode-character-database-[0-9]*:../../textproc/unicode-character-database
 BUILD_DEPENDS+=        unicode-emoji-[0-9]*:../../textproc/unicode-emoji
 
@@ -56,8 +54,6 @@ CONF_FILES+=          ${PREFIX}/share/examples/i
 BUILDLINK_TRANSFORM+=  rm:-Wno-unused-but-set-variable
 .endif
 
-BUILDLINK_API_DEPENDS.GConf+=          GConf>=2.12
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/dconf/database.mk"
 .include "../../devel/dconf/buildlink3.mk"

Index: pkgsrc/inputmethod/ibus/Makefile.common
diff -u pkgsrc/inputmethod/ibus/Makefile.common:1.13 pkgsrc/inputmethod/ibus/Makefile.common:1.14
--- pkgsrc/inputmethod/ibus/Makefile.common:1.13        Sun Aug 12 10:45:03 2018
+++ pkgsrc/inputmethod/ibus/Makefile.common     Sat Mar  2 02:16:32 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2018/08/12 10:45:03 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/03/02 02:16:32 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=      ibus-1.5.19
+DISTNAME=      ibus-1.5.20
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
Index: pkgsrc/inputmethod/ibus/PLIST
diff -u pkgsrc/inputmethod/ibus/PLIST:1.13 pkgsrc/inputmethod/ibus/PLIST:1.14
--- pkgsrc/inputmethod/ibus/PLIST:1.13  Sat Sep 29 12:08:46 2018
+++ pkgsrc/inputmethod/ibus/PLIST       Sat Mar  2 02:16:32 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/09/29 12:08:46 tnn Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/03/02 02:16:32 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -50,7 +50,6 @@ lib/pkgconfig/ibus-1.0.pc
 libexec/ibus-dconf
 libexec/ibus-engine-simple
 libexec/ibus-extension-gtk3
-libexec/ibus-gconf
 libexec/ibus-portal
 libexec/ibus-ui-emojier
 libexec/ibus-ui-gtk3
@@ -62,15 +61,14 @@ man/man5/00-upstream-settings.5
 man/man5/ibus.5
 man/man7/ibus-emoji.7
 share/GConf/gsettings/ibus.convert
-share/applications/ibus-setup.desktop
 share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
 share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
+share/applications/org.freedesktop.IBus.Setup.desktop
 share/bash-completion/completions/ibus.bash
 share/dbus-1/services/org.freedesktop.IBus.service
 share/dbus-1/services/org.freedesktop.portal.IBus.service
 share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
 share/examples/ibus/dconf/profile/ibus
-share/gconf/schemas/ibus.schemas
 share/gir-1.0/IBus-1.0.gir
 share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
 share/gtk-doc/html/ibus/IBusAttrList.html
@@ -126,13 +124,13 @@ share/gtk-doc/html/ibus/style.css
 share/gtk-doc/html/ibus/up-insensitive.png
 share/gtk-doc/html/ibus/up.png
 share/ibus/component/dconf.xml
-share/ibus/component/gconf.xml
 share/ibus/component/gtkextension.xml
 share/ibus/component/gtkpanel.xml
 share/ibus/component/simple.xml
 share/ibus/dicts/emoji-af.dict
 share/ibus/dicts/emoji-am.dict
 share/ibus/dicts/emoji-ar.dict
+share/ibus/dicts/emoji-ar_SA.dict
 share/ibus/dicts/emoji-as.dict
 share/ibus/dicts/emoji-ast.dict
 share/ibus/dicts/emoji-az.dict
@@ -176,6 +174,7 @@ share/ibus/dicts/emoji-hi.dict
 share/ibus/dicts/emoji-hr.dict
 share/ibus/dicts/emoji-hu.dict
 share/ibus/dicts/emoji-hy.dict
+share/ibus/dicts/emoji-ia.dict
 share/ibus/dicts/emoji-id.dict
 share/ibus/dicts/emoji-is.dict
 share/ibus/dicts/emoji-it.dict
@@ -186,6 +185,7 @@ share/ibus/dicts/emoji-kk.dict
 share/ibus/dicts/emoji-km.dict
 share/ibus/dicts/emoji-kn.dict
 share/ibus/dicts/emoji-ko.dict
+share/ibus/dicts/emoji-ku.dict
 share/ibus/dicts/emoji-ky.dict
 share/ibus/dicts/emoji-lo.dict
 share/ibus/dicts/emoji-lt.dict
@@ -206,6 +206,7 @@ share/ibus/dicts/emoji-pl.dict
 share/ibus/dicts/emoji-ps.dict
 share/ibus/dicts/emoji-pt.dict
 share/ibus/dicts/emoji-pt_PT.dict
+share/ibus/dicts/emoji-qu.dict
 share/ibus/dicts/emoji-ro.dict
 share/ibus/dicts/emoji-root.dict
 share/ibus/dicts/emoji-ru.dict
@@ -217,6 +218,7 @@ share/ibus/dicts/emoji-sq.dict
 share/ibus/dicts/emoji-sr.dict
 share/ibus/dicts/emoji-sr_Cyrl_BA.dict
 share/ibus/dicts/emoji-sr_Latn.dict
+share/ibus/dicts/emoji-sr_Latn_BA.dict
 share/ibus/dicts/emoji-sv.dict
 share/ibus/dicts/emoji-sw.dict
 share/ibus/dicts/emoji-ta.dict

Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.20 pkgsrc/inputmethod/ibus/distinfo:1.21
--- pkgsrc/inputmethod/ibus/distinfo:1.20       Sun Aug 12 10:45:03 2018
+++ pkgsrc/inputmethod/ibus/distinfo    Sat Mar  2 02:16:32 2019
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.20 2018/08/12 10:45:03 tsutsui Exp $
+$NetBSD: distinfo,v 1.21 2019/03/02 02:16:32 tsutsui Exp $
 
-SHA1 (ibus-1.5.19.tar.gz) = fdda025d81247e40ad7acf953c2a0a606d18e965
-RMD160 (ibus-1.5.19.tar.gz) = 78f4511723e590cf2bfd906d3956780c951433d6
-SHA512 (ibus-1.5.19.tar.gz) = ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
-Size (ibus-1.5.19.tar.gz) = 2842274 bytes
+SHA1 (ibus-1.5.20.tar.gz) = 3d4e919bc9a2d4aa3e68570cf55647167c6be560
+RMD160 (ibus-1.5.20.tar.gz) = 51c290b2e52235988c0ad4831d581d884dc42f2a
+SHA512 (ibus-1.5.20.tar.gz) = 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
+Size (ibus-1.5.20.tar.gz) = 3393487 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
 SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
-SHA1 (patch-configure) = 1fcb5684d91836f7b5daf5034d2836acb1589ba2
-SHA1 (patch-ui_gtk3_Makefile.am) = 0a8f2b05f5f392dc9c8c4e997680f5f822a6a62b
-SHA1 (patch-ui_gtk3_Makefile.in) = bc84d28327fd851b800ebe2652913ebdb0ed264c
-SHA1 (patch-ui_gtk3_panelbinding.vala) = 3ce9a90a0a3558ab283bae866f561956a4407581
+SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
+SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4

Index: pkgsrc/inputmethod/ibus-python/Makefile
diff -u pkgsrc/inputmethod/ibus-python/Makefile:1.15 pkgsrc/inputmethod/ibus-python/Makefile:1.16
--- pkgsrc/inputmethod/ibus-python/Makefile:1.15        Tue Jul  3 05:03:21 2018
+++ pkgsrc/inputmethod/ibus-python/Makefile     Sat Mar  2 02:16:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/03 05:03:21 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/03/02 02:16:32 tsutsui Exp $
 
 .include "../../inputmethod/ibus/Makefile.common"
 
@@ -38,7 +38,6 @@ NO_BUILD=     yes
 INSTALL_DIRS=  bindings ibus
 
 CONFIGURE_ARGS+=       --disable-dconf
-CONFIGURE_ARGS+=       --disable-gconf
 CONFIGURE_ARGS+=       --enable-python-library
 CONFIGURE_ENV+=                PYTHON2=${PYTHONBIN}
 

Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
diff -u pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.1 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.2
--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.1       Sun Aug 12 10:45:03 2018
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am   Sat Mar  2 02:16:32 2019
@@ -1,26 +1,16 @@
-$NetBSD: patch-ui_gtk3_Makefile.am,v 1.1 2018/08/12 10:45:03 tsutsui Exp $
+$NetBSD: patch-ui_gtk3_Makefile.am,v 1.2 2019/03/02 02:16:32 tsutsui Exp $
 
-- pull upstream wayland fix:
- https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
+- workaround upstream issue #2082
+ https://github.com/ibus/ibus/issues/2082
 
---- ui/gtk3/Makefile.am.orig   2018-08-08 08:29:14.000000000 +0000
+--- ui/gtk3/Makefile.am.orig   2019-03-01 11:43:45.000000000 +0000
 +++ ui/gtk3/Makefile.am
-@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
-       --pkg=ibus-1.0 \
-       --pkg=config \
-       --pkg=xi \
--      --pkg=gdk-wayland \
-       --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
+@@ -229,7 +229,7 @@ extension.o: $(srcdir)/extension.c
+       $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
+       $(NULL)
+ # of emojier.c: emojier.vala
+-panelbinding.c: $(ibus_extension_gtk3_VALASOURCES)
++panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile
+       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
+ $(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
        $(NULL)
- 
-@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
- AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
- endif
- 
-+if ENABLE_GDK3_WAYLAND
-+AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
-+endif
-+
- libexec_PROGRAMS = ibus-ui-gtk3
- 
- ibus_ui_gtk3_SOURCES = \
Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
diff -u pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.1 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.2
--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.1       Sun Aug 12 10:45:03 2018
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in   Sat Mar  2 02:16:32 2019
@@ -1,56 +1,16 @@
-$NetBSD: patch-ui_gtk3_Makefile.in,v 1.1 2018/08/12 10:45:03 tsutsui Exp $
+$NetBSD: patch-ui_gtk3_Makefile.in,v 1.2 2019/03/02 02:16:32 tsutsui Exp $
 
-- pull upstream wayland fix:
- https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
+- workaround upstream issue #2082
+ https://github.com/ibus/ibus/issues/2082
 
---- ui/gtk3/Makefile.in.orig   2018-08-08 08:31:04.000000000 +0000
+--- ui/gtk3/Makefile.in.orig   2019-03-01 11:52:50.000000000 +0000
 +++ ui/gtk3/Makefile.in
-@@ -127,12 +127,13 @@ host_triplet = @host@
- 
- @ENABLE_APPINDICATOR_TRUE@am__append_4 = --define=INDICATOR
- @ENABLE_APPINDICATOR_ENGINE_ICON_TRUE@am__append_5 = --define=INDICATOR_ENGINE_ICON
-+@ENABLE_GDK3_WAYLAND_TRUE@am__append_6 = --pkg=gdk-wayland --define=USE_GDK_WAYLAND
- libexec_PROGRAMS = ibus-ui-gtk3$(EXEEXT) $(am__EXEEXT_1)
--@ENABLE_EMOJI_DICT_TRUE@am__append_6 = --define=EMOJI_DICT
--@ENABLE_EMOJI_DICT_TRUE@am__append_7 = ibus-ui-emojier \
-+@ENABLE_EMOJI_DICT_TRUE@am__append_7 = --define=EMOJI_DICT
-+@ENABLE_EMOJI_DICT_TRUE@am__append_8 = ibus-ui-emojier \
- @ENABLE_EMOJI_DICT_TRUE@      ibus-extension-gtk3
--@ENABLE_EMOJI_DICT_TRUE@am__append_8 = gtkextension.xml
--@ENABLE_EMOJI_DICT_TRUE@am__append_9 = gtkextension.xml \
-+@ENABLE_EMOJI_DICT_TRUE@am__append_9 = gtkextension.xml
-+@ENABLE_EMOJI_DICT_TRUE@am__append_10 = gtkextension.xml \
- @ENABLE_EMOJI_DICT_TRUE@      $(desktop_DATA) $(desktop_in_files) \
- @ENABLE_EMOJI_DICT_TRUE@      $(man_seven_DATA) $(man_seven_files) \
+@@ -1330,7 +1330,7 @@ gen-%.xml.c: %.xml
+ @ENABLE_EMOJI_DICT_TRUE@      $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
+ @ENABLE_EMOJI_DICT_TRUE@      $(NULL)
+ # of emojier.c: emojier.vala
+-@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES)
++@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile
+ @ENABLE_EMOJI_DICT_TRUE@      $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
+ @ENABLE_EMOJI_DICT_TRUE@$(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
  @ENABLE_EMOJI_DICT_TRUE@      $(NULL)
-@@ -577,7 +578,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- NULL = 
- libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
--component_DATA = gtkpanel.xml $(NULL) $(am__append_8)
-+component_DATA = gtkpanel.xml $(NULL) $(am__append_9)
- componentdir = $(pkgdatadir)/component
- 
- # force include config.h before gi18n.h.
-@@ -598,10 +599,9 @@ AM_LDADD = @GOBJECT2_LIBS@ @GLIB2_LIBS@ 
- AM_VALAFLAGS = --vapidir=$(top_builddir)/bindings/vala \
-       --vapidir=$(top_srcdir)/bindings/vala --pkg=posix \
-       --pkg=gtk+-3.0 --pkg=gdk-x11-3.0 --pkg=ibus-1.0 --pkg=config \
--      --pkg=xi --pkg=gdk-wayland \
--      --target-glib="$(VALA_TARGET_GLIB_VERSION)" $(NULL) \
-+      --pkg=xi --target-glib="$(VALA_TARGET_GLIB_VERSION)" $(NULL) \
-       $(am__append_3) $(am__append_4) $(am__append_5) \
--      $(am__append_6)
-+      $(am__append_6) $(am__append_7)
- ibus_ui_gtk3_SOURCES = \
-       application.vala \
-       bindingcommon.vala \
-@@ -627,7 +627,7 @@ ibus_ui_gtk3_LDADD = \
-       $(AM_LDADD) \
-       $(NULL)
- 
--CLEANFILES = gtkpanel.xml $(NULL) $(am__append_9)
-+CLEANFILES = gtkpanel.xml $(NULL) $(am__append_10)
- emoji_headers = \
-     ibusemojidialog.h   \
-     $(NULL)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index