4a8bebce2e
- update version 5.0.8 * Fix key repeating with wayland input method protocol * Workaround SNI gnome extension for "empty icon" or duplicate icon with kimpanel issue. * The Unicode addon trigger key is now configurable. * Fix some BSD build issue * Fix key grab when the input method group is added or removed. - update version 5.0.7 * Fix reforwarding event value - update version 5.0.6 * Improve the build ability on android/ios, more options can be disabled. * xim uses sync mode * Reload new addon at runtime with version check. * Bug fix on rotated screen. * Use fixed line height for classicui. * Fix "Default" value for classicui * Add sub mode label to input method OBS-URL: https://build.opensuse.org/request/show/890843 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=15
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"
|