CVS commit: pkgsrc/inputmethod/ibus

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Oct 17 05:25:46 UTC 2020

Modified Files:
        pkgsrc/inputmethod/ibus: distinfo
Added Files:
        pkgsrc/inputmethod/ibus/patches: patch-ui_gtk3_application.vala
            patch-ui_gtk3_extension.vala

Log Message:
(inputmethod/ibus) Fix recent bulkbuild error, Cannot convert from `void Extension...

extension.vala:54.37-54.56: error: Argument 7:
Cannot convert from `void ExtensionGtk.bus_name_acquired_cb
(GLib.DBusConnection, string, string, string, string, GLib.Variant)'
to `void GLib.DBusSignalCallback
(GLib.DBusConnection, string?, string, string, string, GLib.Variant)'
                                    bus_name_acquired_cb);

See
    3  2020-10-17 13:37  git clone https://github.com/ibus/ibus.git
    4  2020-10-17 13:38  cd ibus/
    5  2020-10-17 13:38  git show dd4cc5b028c35f9bb8f

Information provided from @tristelo of Twitter, thanks


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_application.vala \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_extension.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/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.24 pkgsrc/inputmethod/ibus/distinfo:1.25
--- pkgsrc/inputmethod/ibus/distinfo:1.24       Sat Oct  3 16:43:17 2020
+++ pkgsrc/inputmethod/ibus/distinfo    Sat Oct 17 05:25:46 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2020/10/03 16:43:17 tsutsui Exp $
+$NetBSD: distinfo,v 1.25 2020/10/17 05:25:46 mef Exp $
 
 SHA1 (ibus-1.5.23.tar.gz) = 99f093568588b3c7695230768560eb1645ed80de
 RMD160 (ibus-1.5.23.tar.gz) = c3500c682257fb0699dbba429670e895f058846e
@@ -8,3 +8,5 @@ SHA1 (patch-client_gtk2_ibusimcontext.c)
 SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
 SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
 SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4
+SHA1 (patch-ui_gtk3_application.vala) = 29ad7b1b44a7eb7888a263515c49335da42e62ec
+SHA1 (patch-ui_gtk3_extension.vala) = 276f9ffea8cb9b1fa39321e47fddf941757b2d8d

Added files:

Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_application.vala
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_application.vala:1.1
--- /dev/null   Sat Oct 17 05:25:46 2020
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_application.vala      Sat Oct 17 05:25:46 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-ui_gtk3_application.vala,v 1.1 2020/10/17 05:25:46 mef Exp $
+
+ Fix Build Error:
+
+   git clone https://github.com/ibus/ibus.git
+   git show dd4cc5b028c35f9bb8f
+
+   Info provided by @tristelo of Twitter, thanks
+
+--- ui/gtk3/application.vala.orig      2020-10-17 05:12:46.065207466 +0000
++++ ui/gtk3/application.vala
+@@ -69,7 +69,7 @@ class Application {
+     }
+ 
+     private void bus_name_acquired_cb(DBusConnection connection,
+-                                      string sender_name,
++                                      string? sender_name,
+                                       string object_path,
+                                       string interface_name,
+                                       string signal_name,
+@@ -80,7 +80,7 @@ class Application {
+     }
+ 
+     private void bus_name_lost_cb(DBusConnection connection,
+-                                  string sender_name,
++                                  string? sender_name,
+                                   string object_path,
+                                   string interface_name,
+                                   string signal_name,
Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_extension.vala
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_extension.vala:1.1
--- /dev/null   Sat Oct 17 05:25:46 2020
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_extension.vala        Sat Oct 17 05:25:46 2020
@@ -0,0 +1,31 @@
+$NetBSD: patch-ui_gtk3_extension.vala,v 1.1 2020/10/17 05:25:46 mef Exp $
+
+ Fix Error: 
+extension.vala:54.37-54.56: error: Argument 7: Cannot convert from `void ExtensionGtk.bus_name_acquired_cb (GLib.DBusConnection, string, string, string, string, GLib.Variant)' to `void 
GLib.DBusSignalCallback (GLib.DBusConnection, string?, string, string, string, GLib.Variant)'
+                                    bus_name_acquired_cb);
+                                    ^^^^^^^^^^^^^^^^^^^^
+   git clone https://github.com/ibus/ibus.git
+   git show dd4cc5b028c35f9bb8f
+ 
+   Info provided by @tristelo of Twitter, thanks
+
+--- ui/gtk3/extension.vala.orig        2020-10-17 05:13:08.696559322 +0000
++++ ui/gtk3/extension.vala
+@@ -67,7 +67,7 @@ class ExtensionGtk : Gtk.Application {
+ 
+ 
+     private void bus_name_acquired_cb(DBusConnection connection,
+-                                      string sender_name,
++                                      string? sender_name,
+                                       string object_path,
+                                       string interface_name,
+                                       string signal_name,
+@@ -78,7 +78,7 @@ class ExtensionGtk : Gtk.Application {
+     }
+ 
+     private void bus_name_lost_cb(DBusConnection connection,
+-                                  string sender_name,
++                                  string? sender_name,
+                                   string object_path,
+                                   string interface_name,
+                                   string signal_name,