CVS commit: pkgsrc/inputmethod/ibus

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/inputmethod/ibus
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Sat, 18 Nov 2023 07:13:42 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Nov 18 07:13:42 UTC 2023

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile Makefile.common PLIST distinfo
        pkgsrc/inputmethod/ibus/patches: patch-client_gtk2_ibusimcontext.c
            patch-client_gtk3_ibusimcontext.c patch-ui_gtk3_Makefile.am
            patch-ui_gtk3_Makefile.in
Removed Files:
        pkgsrc/inputmethod/ibus/patches: patch-configure patch-configure.ac

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/ibus/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/ibus/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c \
    pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
cvs rdiff -u -r1.6 -r0 pkgsrc/inputmethod/ibus/patches/patch-configure
cvs rdiff -u -r1.3 -r0 pkgsrc/inputmethod/ibus/patches/patch-configure.ac
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in

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.101 pkgsrc/inputmethod/ibus/Makefile:1.102
--- pkgsrc/inputmethod/ibus/Makefile:1.101      Tue Nov 14 14:02:17 2023
+++ pkgsrc/inputmethod/ibus/Makefile    Sat Nov 18 07:13:42 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.101 2023/11/14 14:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2023/11/18 07:13:42 tsutsui Exp $
 
-PKGREVISION= 5
 .include "Makefile.common"
 
 COMMENT=       Intelligent Input Bus
@@ -34,18 +33,8 @@ CONFIGURE_ARGS+=     --with-unicode-emoji-di
 CONFIGURE_ARGS+=       --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
 CONFIGURE_ARGS+=       --with-ucd-dir=${PREFIX}/share/unicode/ucd
 
-.include "../../mk/bsd.prefs.mk"
-
-# Workaround X11_LOCALEDATADIR for NetBSD etc.
-#  https://github.com/ibus/ibus/pull/2478
-.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
-SUBST_CLASSES+=                xlocale
-SUBST_STAGE.xlocale=   pre-configure
-SUBST_FILES.xlocale=   src/gencomposetable.c \
-                       src/ibuscomposetable.c \
-                       src/ibusenginesimple.c src/tests/ibus-compose.c
-SUBST_SED.xlocale=     -e 's,/share/X11/locale,/lib/X11/locale,g'
-.endif
+# XXX lack of dbusmenu-glib
+CONFIGURE_ARGS+=       --disable-appindicator
 
 SUBST_CLASSES+=                dbus
 SUBST_STAGE.dbus=      post-configure

Index: pkgsrc/inputmethod/ibus/Makefile.common
diff -u pkgsrc/inputmethod/ibus/Makefile.common:1.21 pkgsrc/inputmethod/ibus/Makefile.common:1.22
--- pkgsrc/inputmethod/ibus/Makefile.common:1.21        Thu Feb 23 15:01:00 2023
+++ pkgsrc/inputmethod/ibus/Makefile.common     Sat Nov 18 07:13:42 2023
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.21 2023/02/23 15:01:00 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.22 2023/11/18 07:13:42 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=      ibus-1.5.28
+DISTNAME=      ibus-1.5.29-rc2
+PKGNAME=       ${DISTNAME:S/-rc2//}
 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.22 pkgsrc/inputmethod/ibus/PLIST:1.23
--- pkgsrc/inputmethod/ibus/PLIST:1.22  Thu Feb 23 15:01:00 2023
+++ pkgsrc/inputmethod/ibus/PLIST       Sat Nov 18 07:13:42 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2023/02/23 15:01:00 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.23 2023/11/18 07:13:42 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -53,6 +53,7 @@ libexec/ibus-extension-gtk3
 libexec/ibus-portal
 libexec/ibus-ui-emojier
 libexec/ibus-ui-gtk3
+libexec/ibus-wayland
 libexec/ibus-x11
 man/man1/ibus-daemon.1
 man/man1/ibus-setup.1
@@ -63,6 +64,7 @@ man/man7/ibus-emoji.7
 share/GConf/gsettings/ibus.convert
 share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
 share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
+share/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop
 share/applications/org.freedesktop.IBus.Setup.desktop
 share/bash-completion/completions/ibus.bash
 share/dbus-1/services/org.freedesktop.IBus.service

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

Index: pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
diff -u pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c:1.4 pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c:1.5
--- pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c:1.4       Sat Sep  3 14:14:41 2022
+++ pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c   Sat Nov 18 07:13:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $
+$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.5 2023/11/18 07:13:42 tsutsui Exp $
 
 NetBSD 6.99.25's gcc says:
    error: #pragma GCC diagnostic not allowed inside functions
 
---- client/gtk2/ibusimcontext.c.orig   2022-08-22 15:32:16.000000000 +0000
+--- client/gtk2/ibusimcontext.c.orig   2023-11-09 06:08:27.000000000 +0000
 +++ client/gtk2/ibusimcontext.c
-@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -870,6 +870,9 @@ daemon_name_vanished (GDBusConnection *c
      _daemon_is_running = FALSE;
  }
  
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
  static void
  ibus_im_context_class_init (IBusIMContextClass *class)
  {
-@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -1038,10 +1041,7 @@ ibus_im_context_class_init (IBusIMContex
  #if !GTK_CHECK_VERSION (3, 98, 4)
      /* always install snooper */
      if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
      }
  #endif
  
-@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex
+@@ -1053,23 +1053,24 @@ ibus_im_context_class_init (IBusIMContex
                                                NULL,
                                                NULL);
  }
Index: pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
diff -u pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c:1.4 pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c:1.5
--- pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c:1.4       Sat Sep  3 14:14:41 2022
+++ pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c   Sat Nov 18 07:13:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $
+$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.5 2023/11/18 07:13:42 tsutsui Exp $
 
 NetBSD 6.99.25's gcc says:
    error: #pragma GCC diagnostic not allowed inside functions
 
---- client/gtk3/ibusimcontext.c.orig   2022-08-22 15:32:16.000000000 +0000
+--- client/gtk3/ibusimcontext.c.orig   2023-11-09 06:08:27.000000000 +0000
 +++ client/gtk3/ibusimcontext.c
-@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -870,6 +870,9 @@ daemon_name_vanished (GDBusConnection *c
      _daemon_is_running = FALSE;
  }
  
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
  static void
  ibus_im_context_class_init (IBusIMContextClass *class)
  {
-@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -1038,10 +1041,7 @@ ibus_im_context_class_init (IBusIMContex
  #if !GTK_CHECK_VERSION (3, 98, 4)
      /* always install snooper */
      if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
      }
  #endif
  
-@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex
+@@ -1053,23 +1053,24 @@ ibus_im_context_class_init (IBusIMContex
                                                NULL,
                                                NULL);
  }

Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
diff -u pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.2 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.3
--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am:1.2       Sat Mar  2 02:16:32 2019
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am   Sat Nov 18 07:13:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-ui_gtk3_Makefile.am,v 1.2 2019/03/02 02:16:32 tsutsui Exp $
+$NetBSD: patch-ui_gtk3_Makefile.am,v 1.3 2023/11/18 07:13:42 tsutsui Exp $
 
 - workaround upstream issue #2082
  https://github.com/ibus/ibus/issues/2082
 
---- ui/gtk3/Makefile.am.orig   2019-03-01 11:43:45.000000000 +0000
+--- ui/gtk3/Makefile.am.orig   2023-11-09 06:08:27.000000000 +0000
 +++ ui/gtk3/Makefile.am
-@@ -229,7 +229,7 @@ extension.o: $(srcdir)/extension.c
+@@ -293,7 +293,7 @@ extension.o: $(srcdir)/extension.c
        $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
        $(NULL)
  # of emojier.c: emojier.vala
Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
diff -u pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.2 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.3
--- pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in:1.2       Sat Mar  2 02:16:32 2019
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in   Sat Nov 18 07:13:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-ui_gtk3_Makefile.in,v 1.2 2019/03/02 02:16:32 tsutsui Exp $
+$NetBSD: patch-ui_gtk3_Makefile.in,v 1.3 2023/11/18 07:13:42 tsutsui Exp $
 
 - workaround upstream issue #2082
  https://github.com/ibus/ibus/issues/2082
 
---- ui/gtk3/Makefile.in.orig   2019-03-01 11:52:50.000000000 +0000
+--- ui/gtk3/Makefile.in.orig   2023-11-09 06:08:51.000000000 +0000
 +++ ui/gtk3/Makefile.in
-@@ -1330,7 +1330,7 @@ gen-%.xml.c: %.xml
+@@ -1464,7 +1464,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

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