Mon Mar 1 11:13:20 2021 UTC ()
(inputmethod/fcitx5) Fix build,  with work around patches for gcc7 bug

It is explained as gcc-7 bug, and we need patch until it is fixed, I'm afraid
See:
https://github.com/fcitx/fcitx5/issues/174
https://build.opensuse.org/package/show/M17N/fcitx5


(mef)
diff -r1.2 -r1.3 pkgsrc/inputmethod/fcitx5/distinfo
diff -r0 -r1.1 pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp
diff -r0 -r1.1 pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/fcitx5/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/fcitx5/distinfo 2021/02/27 19:30:57 1.2
+++ pkgsrc/inputmethod/fcitx5/distinfo 2021/03/01 11:13:20 1.3
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.2 2021/02/27 19:30:57 ryoon Exp $ 1$NetBSD: distinfo,v 1.3 2021/03/01 11:13:20 mef Exp $
2 2
3SHA1 (en_dict-20121020.tar.gz) = 3d6b85cbede261b3703b916e6a1a3303f6cba9a6 3SHA1 (en_dict-20121020.tar.gz) = 3d6b85cbede261b3703b916e6a1a3303f6cba9a6
4RMD160 (en_dict-20121020.tar.gz) = ae6a1fcf214b9ba1b9d300edeec4d61ad62caf18 4RMD160 (en_dict-20121020.tar.gz) = ae6a1fcf214b9ba1b9d300edeec4d61ad62caf18
5SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 5SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
6Size (en_dict-20121020.tar.gz) = 630491 bytes 6Size (en_dict-20121020.tar.gz) = 630491 bytes
7SHA1 (fcitx5-5.0.5.tar.xz) = 9b1657de47063da210b9eaf50213313552eb51ce 7SHA1 (fcitx5-5.0.5.tar.xz) = 9b1657de47063da210b9eaf50213313552eb51ce
8RMD160 (fcitx5-5.0.5.tar.xz) = 2418279e2e76cdc98310cf00b3af1d9ec48f914a 8RMD160 (fcitx5-5.0.5.tar.xz) = 2418279e2e76cdc98310cf00b3af1d9ec48f914a
9SHA512 (fcitx5-5.0.5.tar.xz) = 3bc1a51119c9ee0c62a7112b520f88bdc6afe10b6a7d61c97d4b7b69556716a15815b9523eb9aa566918217ad299285116a60a60978cd8297225e6f4b856785a 9SHA512 (fcitx5-5.0.5.tar.xz) = 3bc1a51119c9ee0c62a7112b520f88bdc6afe10b6a7d61c97d4b7b69556716a15815b9523eb9aa566918217ad299285116a60a60978cd8297225e6f4b856785a
10Size (fcitx5-5.0.5.tar.xz) = 1294560 bytes 10Size (fcitx5-5.0.5.tar.xz) = 1294560 bytes
 11SHA1 (patch-src_frontend_ibusfrontend_ibusfrontend.cpp) = 06d009f2d3977f5f72ca727a41e6aeb15aa257a2
11SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26 12SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26
12SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66 13SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66
 14SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462
File Added: pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp
$NetBSD: patch-src_frontend_ibusfrontend_ibusfrontend.cpp,v 1.1 2021/03/01 11:13:20 mef Exp $

https://build.opensuse.org/package/view_file/M17N/fcitx5/fcitx5-gcc7.patch?expand=1

--- src/frontend/ibusfrontend/ibusfrontend.cpp.orig	2021-01-28 23:35:42.465005200 +0900
+++ src/frontend/ibusfrontend/ibusfrontend.cpp	2021-03-01 19:17:18.090095671 +0900
@@ -577,14 +577,23 @@ private:
         ([]() -> dbus::DBusStruct<uint32_t, uint32_t> {
             return {0, 0};
         }),
+#if __GNUC__ < 8
+        ([&](dbus::DBusStruct<uint32_t, uint32_t> type) {
+#else
         ([this](dbus::DBusStruct<uint32_t, uint32_t> type) {
+#endif
             setContentType(std::get<0>(type), std::get<1>(type));
         }),
         dbus::PropertyOption::Hidden);
     FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
         clientCommitPreedit, "ClientCommitPreedit", "(b)",
+#if __GNUC__ < 8
+        ([&]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
+        ([&](dbus::DBusStruct<bool> value) {
+#else
         ([this]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
         ([this](dbus::DBusStruct<bool> value) {
+#endif
             clientCommitPreedit_ = std::get<0>(value);
         }),
         dbus::PropertyOption::Hidden);
File Added: pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp
$NetBSD: patch-test_testdbus.cpp,v 1.1 2021/03/01 11:13:20 mef Exp $

https://build.opensuse.org/package/view_file/M17N/fcitx5/fcitx5-gcc7.patch?expand=1

--- fcitx5-5.0.3.orig/test/testdbus.cpp
+++ test/testdbus.cpp
@@ -67,7 +67,11 @@ private:
                                  []() { return 5; });
     FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
         testProperty2, "testProperty2", "i", [this]() { return prop2; },
+#if __GNUC__  < 8
+        [&](int32_t v) { prop2 = v; });
+#else
         [this](int32_t v) { prop2 = v; });
+#endif
 };
 
 #define TEST_SERVICE "org.fcitx.Fcitx.TestDBus"