Sat Nov 18 07:13:42 2023 UTC ()
ibus: update to 1.5.29.

pkgsrc changes:
- handle -rc2 rename (1.5.29-rc2 is also tagged as 1.5.29)
- remove patches and workaround fixed in the upstream
- regen patches to reset dates and offsets

Upstream changes:
 https://github.com/ibus/ibus/releases/tag/1.5.29
 https://github.com/ibus/ibus/releases/tag/1.5.29-rc1

1.5.29

Changes between 1.5.29-rc1 and 1.5.29 (1.5.29-rc2)

  * Add DeleteSurroundingText to PostProcessKeyEvent 7650080
  * Add preedit D-Bus signals to PostProcessKeyEvent e059536
  * Tab should not be committed by IM 0fc744a
  * Translate keycodes with CapsLock 0c67ff6
  * Update org.freedesktop.ibus.gschema.xml 5bb4353

1.5.29-rc1

  * Implement Plasma Wayland c366736 e379baf 494448b 6ed5e45 3f3f0b6 b0f06ae
    b8ab800 ed552e8 8923456 42be272 281c9ae 7b83a1f 2952035 0251f2c 4a15f66
    2f40eea
  * Distinguish Arabic XKB and Keypad XKB options ad883dc
  * Update simple.xml with xkeyboard-config 2.39 155c584
  * Fix key typing issues 497f0c7 8f706d1 7237fcc 38f09c6 7502abb
  * Fix Emoji and Unicode issues 7c8abbe 310c442
  * Fix build issues 630f3f7 67a0f36 4e644e8 cf3c5c0
  * Fix setup dialog SEGV 4831ed5
  * Fix remote desktop issue 25a2dfc 580ea41
  * Enhance CI 431c72b 3bbec69 cac49dc 5ed9f13 7c61e22 f05c12d d47dc55

 Code Contributors:

  * Enhance man page builds (Emil Velikov) 1a25975 03a486c
  * Fix typo in src/ibusservice.h (Gunnar Hjalmarsson) 98c6ee7
  * Fix BSD build issues (Izumi Tsutsui) ce5e2bb 9553dbf
  * Fix unaligned accesses in different endianness in compose table (Matt
    Turner) b97e666
  * Enhance parallel builds (Matt Turner) be1f1d0 f25c48a 692da97
  * Enhance builds (Matt Turner) 76f2f4a d23bbdd f0492c8
  * Fix cross compiling (oreo639) 18f0d9f
  * Update Emoji shortcut key in ibus-emoji(7) (Sibo Dong) a4007f7
  * use a shell exec in systemd service files for Ubuntu (Simon Deziel) a140924
  * Fix position of candidate popup window with GTK4 applications in Xorg (Peng
    Wu) 86d9bb9

 Translation Contributors:

  * po: Update translation (Danish) (Alan01) 01f9a27
  * po: Update translation (English (United Kingdom)) (Andi Chandler) fbbb76f
  * po: Update translation (Georgian) (Temuri Doghonadze) c2a15bc 96a6850
  * po: Update translation (German) (Mike FABIAN) a474d6e
  * po: Update translation (Japanese) (fujiwarat) 35d7438 e9f59d6 e6c436f
  * po: Update translation (Korean) (simmon) 8d70676
  * po: Update translation (Polish) (Piotr Drag) 2d841c7
  * po: Update translation (Swedish) (Luna Jernberg) 6b62480
  * po: Update translation (Ukrainian) (Yuri Chornoivan) fc59704


(tsutsui)
diff -r1.101 -r1.102 pkgsrc/inputmethod/ibus/Makefile
diff -r1.21 -r1.22 pkgsrc/inputmethod/ibus/Makefile.common
diff -r1.22 -r1.23 pkgsrc/inputmethod/ibus/PLIST
diff -r1.31 -r1.32 pkgsrc/inputmethod/ibus/distinfo
diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
diff -r1.6 -r0 pkgsrc/inputmethod/ibus/patches/patch-configure
diff -r1.3 -r0 pkgsrc/inputmethod/ibus/patches/patch-configure.ac
diff -r1.2 -r1.3 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
diff -r1.2 -r1.3 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
Sat Nov 18 16:13:42 2023
Mon Jun 26 19:38:53 2023
pkgsrc/inputmethod/ibus/patches/patch-configure,v
anoncvs not yet been updated
Sat Nov 18 16:13:42 2023
Mon Jun 26 19:38:53 2023
pkgsrc/inputmethod/ibus/patches/patch-configure.ac,v
anoncvs not yet been updated
cvs diff -r1.101 -r1.102 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2023/11/14 14:02:17 1.101
+++ pkgsrc/inputmethod/ibus/Makefile 2023/11/18 07:13:42 1.102
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.101 2023/11/14 14:02:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.102 2023/11/18 07:13:42 tsutsui Exp $
2 2
3PKGREVISION= 5 
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
9TOOL_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation 8TOOL_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
10TOOL_DEPENDS+= unicode-character-database>=15.0.0:../../textproc/unicode-character-database 9TOOL_DEPENDS+= unicode-character-database>=15.0.0:../../textproc/unicode-character-database
11TOOL_DEPENDS+= unicode-emoji>=15.0:../../textproc/unicode-emoji 10TOOL_DEPENDS+= unicode-emoji>=15.0:../../textproc/unicode-emoji
12 11
13PYTHON_VERSIONS_INCOMPATIBLE= 27 12PYTHON_VERSIONS_INCOMPATIBLE= 27
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
@@ -24,38 +23,28 @@ PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in @@ -24,38 +23,28 @@ PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
25CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 24CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
26CONFIGURE_ARGS+= --enable-dconf 25CONFIGURE_ARGS+= --enable-dconf
27CONFIGURE_ARGS+= --enable-gtk2 26CONFIGURE_ARGS+= --enable-gtk2
28CONFIGURE_ARGS+= --enable-gtk3 27CONFIGURE_ARGS+= --enable-gtk3
29CONFIGURE_ARGS+= --enable-surrounding-text 28CONFIGURE_ARGS+= --enable-surrounding-text
30CONFIGURE_ARGS+= --enable-introspection=yes 29CONFIGURE_ARGS+= --enable-introspection=yes
31CONFIGURE_ARGS+= --disable-systemd-services 30CONFIGURE_ARGS+= --disable-systemd-services
32CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 31CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
33CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji 32CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji
34CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations 33CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
35CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd 34CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd
36 35
37.include "../../mk/bsd.prefs.mk" 36# XXX lack of dbusmenu-glib
38 37CONFIGURE_ARGS+= --disable-appindicator
39# Workaround X11_LOCALEDATADIR for NetBSD etc. 
40# https://github.com/ibus/ibus/pull/2478 
41.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" 
42SUBST_CLASSES+= xlocale 
43SUBST_STAGE.xlocale= pre-configure 
44SUBST_FILES.xlocale= src/gencomposetable.c \ 
45 src/ibuscomposetable.c \ 
46 src/ibusenginesimple.c src/tests/ibus-compose.c 
47SUBST_SED.xlocale= -e 's,/share/X11/locale,/lib/X11/locale,g' 
48.endif 
49 38
50SUBST_CLASSES+= dbus 39SUBST_CLASSES+= dbus
51SUBST_STAGE.dbus= post-configure 40SUBST_STAGE.dbus= post-configure
52SUBST_FILES.dbus= src/ibusshare.c 41SUBST_FILES.dbus= src/ibusshare.c
53SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g' 42SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g'
54 43
55BUILD_DEFS+= PKG_SYSCONFBASE VARBASE 44BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
56MANCOMPRESSED= yes 45MANCOMPRESSED= yes
57 46
58INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus 47INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus
59MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d 48MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d
60MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile 49MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile
61CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \ 50CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \
cvs diff -r1.21 -r1.22 pkgsrc/inputmethod/ibus/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile.common 2023/02/23 15:01:00 1.21
+++ pkgsrc/inputmethod/ibus/Makefile.common 2023/11/18 07:13:42 1.22
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile.common,v 1.21 2023/02/23 15:01:00 tsutsui Exp $ 1# $NetBSD: Makefile.common,v 1.22 2023/11/18 07:13:42 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.28 6DISTNAME= ibus-1.5.29-rc2
 7PKGNAME= ${DISTNAME:S/-rc2//}
7CATEGORIES= inputmethod 8CATEGORIES= inputmethod
8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
9 10
10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo 11DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches 12PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
12 13
13MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/ibus/ibus/wiki 15HOMEPAGE= https://github.com/ibus/ibus/wiki
15LICENSE= gnu-lgpl-v2.1 16LICENSE= gnu-lgpl-v2.1
cvs diff -r1.22 -r1.23 pkgsrc/inputmethod/ibus/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/PLIST 2023/02/23 15:01:00 1.22
+++ pkgsrc/inputmethod/ibus/PLIST 2023/11/18 07:13:42 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2023/02/23 15:01:00 tsutsui Exp $ 1@comment $NetBSD: PLIST,v 1.23 2023/11/18 07:13:42 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/ibusaccelgroup.h
7include/ibus-1.0/ibusattribute.h 7include/ibus-1.0/ibusattribute.h
8include/ibus-1.0/ibusattrlist.h 8include/ibus-1.0/ibusattrlist.h
9include/ibus-1.0/ibusbus.h 9include/ibus-1.0/ibusbus.h
10include/ibus-1.0/ibuscomponent.h 10include/ibus-1.0/ibuscomponent.h
11include/ibus-1.0/ibusconfig.h 11include/ibus-1.0/ibusconfig.h
12include/ibus-1.0/ibusconfigservice.h 12include/ibus-1.0/ibusconfigservice.h
13include/ibus-1.0/ibusdebug.h 13include/ibus-1.0/ibusdebug.h
14include/ibus-1.0/ibusemoji.h 14include/ibus-1.0/ibusemoji.h
@@ -43,36 +43,38 @@ include/ibus-1.0/ibusversion.h @@ -43,36 +43,38 @@ include/ibus-1.0/ibusversion.h
43include/ibus-1.0/ibusxevent.h 43include/ibus-1.0/ibusxevent.h
44include/ibus-1.0/ibusxml.h 44include/ibus-1.0/ibusxml.h
45lib/girepository-1.0/IBus-1.0.typelib 45lib/girepository-1.0/IBus-1.0.typelib
46lib/gtk-2.0/2.10.0/immodules/im-ibus.la 46lib/gtk-2.0/2.10.0/immodules/im-ibus.la
47lib/gtk-3.0/3.0.0/immodules/im-ibus.la 47lib/gtk-3.0/3.0.0/immodules/im-ibus.la
48lib/libibus-1.0.la 48lib/libibus-1.0.la
49lib/pkgconfig/ibus-1.0.pc 49lib/pkgconfig/ibus-1.0.pc
50libexec/ibus-dconf 50libexec/ibus-dconf
51libexec/ibus-engine-simple 51libexec/ibus-engine-simple
52libexec/ibus-extension-gtk3 52libexec/ibus-extension-gtk3
53libexec/ibus-portal 53libexec/ibus-portal
54libexec/ibus-ui-emojier 54libexec/ibus-ui-emojier
55libexec/ibus-ui-gtk3 55libexec/ibus-ui-gtk3
 56libexec/ibus-wayland
56libexec/ibus-x11 57libexec/ibus-x11
57man/man1/ibus-daemon.1 58man/man1/ibus-daemon.1
58man/man1/ibus-setup.1 59man/man1/ibus-setup.1
59man/man1/ibus.1 60man/man1/ibus.1
60man/man5/00-upstream-settings.5 61man/man5/00-upstream-settings.5
61man/man5/ibus.5 62man/man5/ibus.5
62man/man7/ibus-emoji.7 63man/man7/ibus-emoji.7
63share/GConf/gsettings/ibus.convert 64share/GConf/gsettings/ibus.convert
64share/applications/org.freedesktop.IBus.Panel.Emojier.desktop 65share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
65share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop 66share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
 67share/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop
66share/applications/org.freedesktop.IBus.Setup.desktop 68share/applications/org.freedesktop.IBus.Setup.desktop
67share/bash-completion/completions/ibus.bash 69share/bash-completion/completions/ibus.bash
68share/dbus-1/services/org.freedesktop.IBus.service 70share/dbus-1/services/org.freedesktop.IBus.service
69share/dbus-1/services/org.freedesktop.portal.IBus.service 71share/dbus-1/services/org.freedesktop.portal.IBus.service
70share/examples/ibus/dconf/db/ibus.d/00-upstream-settings 72share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
71share/examples/ibus/dconf/profile/ibus 73share/examples/ibus/dconf/profile/ibus
72share/examples/ibus/xdg/Xwayland-session.d/10-ibus-x11 74share/examples/ibus/xdg/Xwayland-session.d/10-ibus-x11
73share/gettext/its/ibus.its 75share/gettext/its/ibus.its
74share/gettext/its/ibus.loc 76share/gettext/its/ibus.loc
75share/gir-1.0/IBus-1.0.gir 77share/gir-1.0/IBus-1.0.gir
76share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml 78share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
77share/gtk-doc/html/ibus/IBusAttrList.html 79share/gtk-doc/html/ibus/IBusAttrList.html
78share/gtk-doc/html/ibus/IBusAttribute.html 80share/gtk-doc/html/ibus/IBusAttribute.html
cvs diff -r1.31 -r1.32 pkgsrc/inputmethod/ibus/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2023/02/23 15:01:00 1.31
+++ pkgsrc/inputmethod/ibus/distinfo 2023/11/18 07:13:42 1.32
@@ -1,11 +1,9 @@ @@ -1,11 +1,9 @@
1$NetBSD: distinfo,v 1.31 2023/02/23 15:01:00 tsutsui Exp $ 1$NetBSD: distinfo,v 1.32 2023/11/18 07:13:42 tsutsui Exp $
2 2
3BLAKE2s (ibus-1.5.28.tar.gz) = e3015b374c1f966694b96f72a92202e999c45bcadf45a7fff80bdb68eaf0d610 3BLAKE2s (ibus-1.5.29-rc2.tar.gz) = 645fbfb3f779426119a276520486df7f594cfc9a41a91e1b02ff4ad0a931df6f
4SHA512 (ibus-1.5.28.tar.gz) = 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247 4SHA512 (ibus-1.5.29-rc2.tar.gz) = 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
5Size (ibus-1.5.28.tar.gz) = 3871246 bytes 5Size (ibus-1.5.29-rc2.tar.gz) = 3991416 bytes
6SHA1 (patch-client_gtk2_ibusimcontext.c) = bb957fb47fa7144f0a6cdd0252653aeb0da9ad92 6SHA1 (patch-client_gtk2_ibusimcontext.c) = 8dcbb38404e599618891de6a406bc1a07db634d4
7SHA1 (patch-client_gtk3_ibusimcontext.c) = c3fff3e8d7431ae4b7302026e9fd9f092ec46d88 7SHA1 (patch-client_gtk3_ibusimcontext.c) = 105a2560014f8bd9699393bef3dda00a6c925c6a
8SHA1 (patch-configure) = 26a73d9572f4f5a933c6ddc67fa4e4e394ac6bc4 8SHA1 (patch-ui_gtk3_Makefile.am) = e0b74afa665b395bb5ac5da678c57e8646bbb71a
9SHA1 (patch-configure.ac) = e06f2b295562c7ec53d719e3960cceadbcdeaf76 9SHA1 (patch-ui_gtk3_Makefile.in) = e52d7d60e975bbc8d1c2807deaef8f0d09b46548
10SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650 
11SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4 
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c 2022/09/03 14:14:41 1.4
+++ pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c 2023/11/18 07:13:42 1.5
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $ 1$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.5 2023/11/18 07:13:42 tsutsui Exp $
2 2
3NetBSD 6.99.25's gcc says: 3NetBSD 6.99.25's gcc says:
4 error: #pragma GCC diagnostic not allowed inside functions 4 error: #pragma GCC diagnostic not allowed inside functions
5 5
6--- client/gtk2/ibusimcontext.c.orig 2022-08-22 15:32:16.000000000 +0000 6--- client/gtk2/ibusimcontext.c.orig 2023-11-09 06:08:27.000000000 +0000
7+++ client/gtk2/ibusimcontext.c 7+++ client/gtk2/ibusimcontext.c
8@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c 8@@ -870,6 +870,9 @@ daemon_name_vanished (GDBusConnection *c
9 _daemon_is_running = FALSE; 9 _daemon_is_running = FALSE;
10 } 10 }
11  11
12+#pragma GCC diagnostic push 12+#pragma GCC diagnostic push
13+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 13+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
14+ 14+
15 static void 15 static void
16 ibus_im_context_class_init (IBusIMContextClass *class) 16 ibus_im_context_class_init (IBusIMContextClass *class)
17 { 17 {
18@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex 18@@ -1038,10 +1041,7 @@ ibus_im_context_class_init (IBusIMContex
19 #if !GTK_CHECK_VERSION (3, 98, 4) 19 #if !GTK_CHECK_VERSION (3, 98, 4)
20 /* always install snooper */ 20 /* always install snooper */
21 if (_key_snooper_id == 0) { 21 if (_key_snooper_id == 0) {
22-#pragma GCC diagnostic push 22-#pragma GCC diagnostic push
23-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 23-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
24 _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); 24 _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
25-#pragma GCC diagnostic pop 25-#pragma GCC diagnostic pop
26 } 26 }
27 #endif 27 #endif
28  28
29@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex 29@@ -1053,23 +1053,24 @@ ibus_im_context_class_init (IBusIMContex
30 NULL, 30 NULL,
31 NULL); 31 NULL);
32 } 32 }
33+#pragma GCC diagnostic pop 33+#pragma GCC diagnostic pop
34  34
35+#pragma GCC diagnostic push 35+#pragma GCC diagnostic push
36+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 36+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
37 static void 37 static void
38 ibus_im_context_class_fini (IBusIMContextClass *class) 38 ibus_im_context_class_fini (IBusIMContextClass *class)
39 { 39 {
40 #if !GTK_CHECK_VERSION (3, 98, 4) 40 #if !GTK_CHECK_VERSION (3, 98, 4)
41 if (_key_snooper_id != 0) { 41 if (_key_snooper_id != 0) {
42 IDEBUG ("snooper is terminated."); 42 IDEBUG ("snooper is terminated.");
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c 2022/09/03 14:14:41 1.4
+++ pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c 2023/11/18 07:13:42 1.5
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $ 1$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.5 2023/11/18 07:13:42 tsutsui Exp $
2 2
3NetBSD 6.99.25's gcc says: 3NetBSD 6.99.25's gcc says:
4 error: #pragma GCC diagnostic not allowed inside functions 4 error: #pragma GCC diagnostic not allowed inside functions
5 5
6--- client/gtk3/ibusimcontext.c.orig 2022-08-22 15:32:16.000000000 +0000 6--- client/gtk3/ibusimcontext.c.orig 2023-11-09 06:08:27.000000000 +0000
7+++ client/gtk3/ibusimcontext.c 7+++ client/gtk3/ibusimcontext.c
8@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c 8@@ -870,6 +870,9 @@ daemon_name_vanished (GDBusConnection *c
9 _daemon_is_running = FALSE; 9 _daemon_is_running = FALSE;
10 } 10 }
11  11
12+#pragma GCC diagnostic push 12+#pragma GCC diagnostic push
13+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 13+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
14+ 14+
15 static void 15 static void
16 ibus_im_context_class_init (IBusIMContextClass *class) 16 ibus_im_context_class_init (IBusIMContextClass *class)
17 { 17 {
18@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex 18@@ -1038,10 +1041,7 @@ ibus_im_context_class_init (IBusIMContex
19 #if !GTK_CHECK_VERSION (3, 98, 4) 19 #if !GTK_CHECK_VERSION (3, 98, 4)
20 /* always install snooper */ 20 /* always install snooper */
21 if (_key_snooper_id == 0) { 21 if (_key_snooper_id == 0) {
22-#pragma GCC diagnostic push 22-#pragma GCC diagnostic push
23-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 23-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
24 _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); 24 _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
25-#pragma GCC diagnostic pop 25-#pragma GCC diagnostic pop
26 } 26 }
27 #endif 27 #endif
28  28
29@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex 29@@ -1053,23 +1053,24 @@ ibus_im_context_class_init (IBusIMContex
30 NULL, 30 NULL,
31 NULL); 31 NULL);
32 } 32 }
33+#pragma GCC diagnostic pop 33+#pragma GCC diagnostic pop
34  34
35+#pragma GCC diagnostic push 35+#pragma GCC diagnostic push
36+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 36+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
37 static void 37 static void
38 ibus_im_context_class_fini (IBusIMContextClass *class) 38 ibus_im_context_class_fini (IBusIMContextClass *class)
39 { 39 {
40 #if !GTK_CHECK_VERSION (3, 98, 4) 40 #if !GTK_CHECK_VERSION (3, 98, 4)
41 if (_key_snooper_id != 0) { 41 if (_key_snooper_id != 0) {
42 IDEBUG ("snooper is terminated."); 42 IDEBUG ("snooper is terminated.");
File Deleted: pkgsrc/inputmethod/ibus/patches/patch-configure
File Deleted: pkgsrc/inputmethod/ibus/patches/patch-configure.ac
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am 2019/03/02 02:16:32 1.2
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am 2023/11/18 07:13:42 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ui_gtk3_Makefile.am,v 1.2 2019/03/02 02:16:32 tsutsui Exp $ 1$NetBSD: patch-ui_gtk3_Makefile.am,v 1.3 2023/11/18 07:13:42 tsutsui Exp $
2 2
3- workaround upstream issue #2082 3- workaround upstream issue #2082
4 https://github.com/ibus/ibus/issues/2082 4 https://github.com/ibus/ibus/issues/2082
5 5
6--- ui/gtk3/Makefile.am.orig 2019-03-01 11:43:45.000000000 +0000 6--- ui/gtk3/Makefile.am.orig 2023-11-09 06:08:27.000000000 +0000
7+++ ui/gtk3/Makefile.am 7+++ ui/gtk3/Makefile.am
8@@ -229,7 +229,7 @@ extension.o: $(srcdir)/extension.c 8@@ -293,7 +293,7 @@ extension.o: $(srcdir)/extension.c
9 $(AM_V_CC_no)$(COMPILE) -c -o $@ $< 9 $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
10 $(NULL) 10 $(NULL)
11 # of emojier.c: emojier.vala 11 # of emojier.c: emojier.vala
12-panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) 12-panelbinding.c: $(ibus_extension_gtk3_VALASOURCES)
13+panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile 13+panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile
14 $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \ 14 $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
15 $(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES) 15 $(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
16 $(NULL) 16 $(NULL)
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in 2019/03/02 02:16:32 1.2
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in 2023/11/18 07:13:42 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ui_gtk3_Makefile.in,v 1.2 2019/03/02 02:16:32 tsutsui Exp $ 1$NetBSD: patch-ui_gtk3_Makefile.in,v 1.3 2023/11/18 07:13:42 tsutsui Exp $
2 2
3- workaround upstream issue #2082 3- workaround upstream issue #2082
4 https://github.com/ibus/ibus/issues/2082 4 https://github.com/ibus/ibus/issues/2082
5 5
6--- ui/gtk3/Makefile.in.orig 2019-03-01 11:52:50.000000000 +0000 6--- ui/gtk3/Makefile.in.orig 2023-11-09 06:08:51.000000000 +0000
7+++ ui/gtk3/Makefile.in 7+++ ui/gtk3/Makefile.in
8@@ -1330,7 +1330,7 @@ gen-%.xml.c: %.xml 8@@ -1464,7 +1464,7 @@ gen-%.xml.c: %.xml
9 @ENABLE_EMOJI_DICT_TRUE@ $(AM_V_CC_no)$(COMPILE) -c -o $@ $< 9 @ENABLE_EMOJI_DICT_TRUE@ $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
10 @ENABLE_EMOJI_DICT_TRUE@ $(NULL) 10 @ENABLE_EMOJI_DICT_TRUE@ $(NULL)
11 # of emojier.c: emojier.vala 11 # of emojier.c: emojier.vala
12-@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) 12-@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES)
13+@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile 13+@ENABLE_EMOJI_DICT_TRUE@panelbinding.c: $(ibus_extension_gtk3_VALASOURCES) Makefile
14 @ENABLE_EMOJI_DICT_TRUE@ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \ 14 @ENABLE_EMOJI_DICT_TRUE@ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
15 @ENABLE_EMOJI_DICT_TRUE@$(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES) 15 @ENABLE_EMOJI_DICT_TRUE@$(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
16 @ENABLE_EMOJI_DICT_TRUE@ $(NULL) 16 @ENABLE_EMOJI_DICT_TRUE@ $(NULL)