Received: by mail.netbsd.org (Postfix, from userid 605) id 6A5FE84D75; Mon, 1 Mar 2021 11:13:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A43DF84CEF for ; Mon, 1 Mar 2021 11:13:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ZcjNZ80z7a1Y for ; Mon, 1 Mar 2021 11:13:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0D1C384CE0 for ; Mon, 1 Mar 2021 11:13:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 04659FA95; Mon, 1 Mar 2021 11:13:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161459720014370" MIME-Version: 1.0 Date: Mon, 1 Mar 2021 11:13:20 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/inputmethod/fcitx5 To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20210301111321.04659FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161459720014370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Mon Mar 1 11:13:20 UTC 2021 Modified Files: pkgsrc/inputmethod/fcitx5: distinfo Added Files: pkgsrc/inputmethod/fcitx5/patches: patch-src_frontend_ibusfrontend_ibusfrontend.cpp patch-test_testdbus.cpp Log Message: (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 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/fcitx5/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp \ pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161459720014370 Content-Disposition: inline Content-Length: 3813 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/inputmethod/fcitx5/distinfo diff -u pkgsrc/inputmethod/fcitx5/distinfo:1.2 pkgsrc/inputmethod/fcitx5/distinfo:1.3 --- pkgsrc/inputmethod/fcitx5/distinfo:1.2 Sat Feb 27 19:30:57 2021 +++ pkgsrc/inputmethod/fcitx5/distinfo Mon Mar 1 11:13:20 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2021/02/27 19:30:57 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2021/03/01 11:13:20 mef Exp $ SHA1 (en_dict-20121020.tar.gz) = 3d6b85cbede261b3703b916e6a1a3303f6cba9a6 RMD160 (en_dict-20121020.tar.gz) = ae6a1fcf214b9ba1b9d300edeec4d61ad62caf18 @@ -8,5 +8,7 @@ SHA1 (fcitx5-5.0.5.tar.xz) = 9b1657de470 RMD160 (fcitx5-5.0.5.tar.xz) = 2418279e2e76cdc98310cf00b3af1d9ec48f914a SHA512 (fcitx5-5.0.5.tar.xz) = 3bc1a51119c9ee0c62a7112b520f88bdc6afe10b6a7d61c97d4b7b69556716a15815b9523eb9aa566918217ad299285116a60a60978cd8297225e6f4b856785a Size (fcitx5-5.0.5.tar.xz) = 1294560 bytes +SHA1 (patch-src_frontend_ibusfrontend_ibusfrontend.cpp) = 06d009f2d3977f5f72ca727a41e6aeb15aa257a2 SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26 SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66 +SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462 Added files: Index: pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp:1.1 --- /dev/null Mon Mar 1 11:13:20 2021 +++ pkgsrc/inputmethod/fcitx5/patches/patch-src_frontend_ibusfrontend_ibusfrontend.cpp Mon Mar 1 11:13:20 2021 @@ -0,0 +1,30 @@ +$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 { + return {0, 0}; + }), ++#if __GNUC__ < 8 ++ ([&](dbus::DBusStruct type) { ++#else + ([this](dbus::DBusStruct 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 { return {clientCommitPreedit_}; }), ++ ([&](dbus::DBusStruct value) { ++#else + ([this]() -> dbus::DBusStruct { return {clientCommitPreedit_}; }), + ([this](dbus::DBusStruct value) { ++#endif + clientCommitPreedit_ = std::get<0>(value); + }), + dbus::PropertyOption::Hidden); Index: pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp diff -u /dev/null pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp:1.1 --- /dev/null Mon Mar 1 11:13:20 2021 +++ pkgsrc/inputmethod/fcitx5/patches/patch-test_testdbus.cpp Mon Mar 1 11:13:20 2021 @@ -0,0 +1,18 @@ +$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" --_----------=_161459720014370--