forked from pool/fcitx5
f169659e74
- add fcitx5-gcc7.patch: fix build on openSUSE Leap 15.1 with gcc7 OBS-URL: https://build.opensuse.org/request/show/854763 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=12
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
Index: fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
===================================================================
|
|
--- fcitx5-5.0.3.orig/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
+++ fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
@@ -594,14 +594,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);
|
|
Index: fcitx5-5.0.3/test/testdbus.cpp
|
|
===================================================================
|
|
--- fcitx5-5.0.3.orig/test/testdbus.cpp
|
|
+++ fcitx5-5.0.3/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"
|