forked from pool/fcitx5
4e0b3c87a9
* New candidate action API, planned to be used for mac/android port.
* There was an issue between fcitx 5.1.9 and the wayland compositor that
uses zwp_input_method_v2. For now the relevant change in fcitx5
was reverted.
* There is also a crash due to a bug on fcitx's wayland frontend. The
crash may be triggered when the system is slow.
* There is a design flaw in StandardPath::multiOpen API that may open
too many files and exhaust the fd that it can open. Alternative API is
implemented and engines are adapted to the new API in this release.
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=57
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
Index: fcitx5-5.0.7/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
===================================================================
|
|
--- fcitx5-5.0.7.orig/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
+++ fcitx5-5.0.7/src/frontend/ibusfrontend/ibusfrontend.cpp
|
|
@@ -580,14 +580,23 @@ private:
|
|
([]() -> dbus::DBusStruct<uint32_t, uint32_t> {
|
|
return {0, 0};
|
|
}),
|
|
+#if __GNUC__ < 9
|
|
+ ([&](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__ < 9
|
|
+ ([&]() -> 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.7/test/testdbus.cpp
|
|
===================================================================
|
|
--- fcitx5-5.0.7.orig/test/testdbus.cpp
|
|
+++ fcitx5-5.0.7/test/testdbus.cpp
|
|
@@ -67,7 +67,11 @@ private:
|
|
[]() { return 5; });
|
|
FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
|
|
testProperty2, "testProperty2", "i", [this]() { return prop2; },
|
|
- [this](int32_t v) { prop2 = v; });
|
|
+#if __GNUC__ < 9
|
|
+ [&](int32_t v) { prop2 = v; });
|
|
+#else
|
|
+ [this](int32_t v) { prop2 = v; });
|
|
+#endif
|
|
};
|
|
|
|
#define TEST_SERVICE "org.fcitx.Fcitx.TestDBus"
|