2021-05-06 06:29:42 +02:00
|
|
|
Index: fcitx5-5.0.7/src/frontend/ibusfrontend/ibusfrontend.cpp
|
2020-12-10 01:38:11 +01:00
|
|
|
===================================================================
|
2021-05-06 06:29:42 +02:00
|
|
|
--- fcitx5-5.0.7.orig/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
|
|
+++ fcitx5-5.0.7/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
|
|
@@ -580,14 +580,23 @@ private:
|
2020-12-10 01:38:11 +01:00
|
|
|
([]() -> dbus::DBusStruct<uint32_t, uint32_t> {
|
|
|
|
return {0, 0};
|
|
|
|
}),
|
2021-05-06 06:29:42 +02:00
|
|
|
+#if __GNUC__ < 9
|
2020-12-10 01:38:11 +01:00
|
|
|
+ ([&](dbus::DBusStruct<uint32_t, uint32_t> type) {
|
2020-12-11 08:15:21 +01:00
|
|
|
+#else
|
|
|
|
([this](dbus::DBusStruct<uint32_t, uint32_t> type) {
|
|
|
|
+#endif
|
2020-12-10 01:38:11 +01:00
|
|
|
setContentType(std::get<0>(type), std::get<1>(type));
|
|
|
|
}),
|
|
|
|
dbus::PropertyOption::Hidden);
|
|
|
|
FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
|
|
|
|
clientCommitPreedit, "ClientCommitPreedit", "(b)",
|
2021-05-06 06:29:42 +02:00
|
|
|
+#if __GNUC__ < 9
|
2020-12-10 01:38:11 +01:00
|
|
|
+ ([&]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
|
|
|
|
+ ([&](dbus::DBusStruct<bool> value) {
|
2020-12-11 08:15:21 +01:00
|
|
|
+#else
|
|
|
|
([this]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
|
|
|
|
([this](dbus::DBusStruct<bool> value) {
|
|
|
|
+#endif
|
2020-12-10 01:38:11 +01:00
|
|
|
clientCommitPreedit_ = std::get<0>(value);
|
|
|
|
}),
|
|
|
|
dbus::PropertyOption::Hidden);
|
2021-05-06 06:29:42 +02:00
|
|
|
Index: fcitx5-5.0.7/test/testdbus.cpp
|
2020-12-11 08:15:21 +01:00
|
|
|
===================================================================
|
2021-05-06 06:29:42 +02:00
|
|
|
--- fcitx5-5.0.7.orig/test/testdbus.cpp
|
|
|
|
+++ fcitx5-5.0.7/test/testdbus.cpp
|
2020-12-11 08:15:21 +01:00
|
|
|
@@ -67,7 +67,11 @@ private:
|
|
|
|
[]() { return 5; });
|
|
|
|
FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
|
|
|
|
testProperty2, "testProperty2", "i", [this]() { return prop2; },
|
2021-05-06 06:29:42 +02:00
|
|
|
- [this](int32_t v) { prop2 = v; });
|
|
|
|
+#if __GNUC__ < 9
|
2020-12-11 08:15:21 +01:00
|
|
|
+ [&](int32_t v) { prop2 = v; });
|
|
|
|
+#else
|
2021-05-06 06:29:42 +02:00
|
|
|
+ [this](int32_t v) { prop2 = v; });
|
2020-12-11 08:15:21 +01:00
|
|
|
+#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
#define TEST_SERVICE "org.fcitx.Fcitx.TestDBus"
|