From 4a8bebce2e93dacdfcea663177d2d25016904f8e4771f3a8f3a066c05852ff4e Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 6 May 2021 04:29:42 +0000 Subject: [PATCH] Accepting request 890843 from home:MargueriteSu:branches:M17N - 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 --- fcitx5-5.0.5.tar.xz | 3 --- fcitx5-5.0.8.tar.xz | 3 +++ fcitx5-gcc7.patch | 23 ++++++++++++----------- fcitx5.changes | 29 +++++++++++++++++++++++++++++ fcitx5.spec | 10 +++++++++- 5 files changed, 53 insertions(+), 15 deletions(-) delete mode 100644 fcitx5-5.0.5.tar.xz create mode 100644 fcitx5-5.0.8.tar.xz diff --git a/fcitx5-5.0.5.tar.xz b/fcitx5-5.0.5.tar.xz deleted file mode 100644 index 8c589be..0000000 --- a/fcitx5-5.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1d74d4681f56e72a90b6c36e3d10f2efe66f7e745ea44b11cd3925216a128b4 -size 1294560 diff --git a/fcitx5-5.0.8.tar.xz b/fcitx5-5.0.8.tar.xz new file mode 100644 index 0000000..81ab9ce --- /dev/null +++ b/fcitx5-5.0.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ecf6cc763952ff3cbe6bd47d6e40f3f7987a4973547251af3cd1482f33c516f +size 1305204 diff --git a/fcitx5-gcc7.patch b/fcitx5-gcc7.patch index fc504b8..1a23fc9 100644 --- a/fcitx5-gcc7.patch +++ b/fcitx5-gcc7.patch @@ -1,12 +1,12 @@ -Index: fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp +Index: fcitx5-5.0.7/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: +--- 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 { return {0, 0}; }), -+#if __GNUC__ < 8 ++#if __GNUC__ < 9 + ([&](dbus::DBusStruct type) { +#else ([this](dbus::DBusStruct type) { @@ -16,7 +16,7 @@ Index: fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp dbus::PropertyOption::Hidden); FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY( clientCommitPreedit, "ClientCommitPreedit", "(b)", -+#if __GNUC__ < 8 ++#if __GNUC__ < 9 + ([&]() -> dbus::DBusStruct { return {clientCommitPreedit_}; }), + ([&](dbus::DBusStruct value) { +#else @@ -26,18 +26,19 @@ Index: fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp clientCommitPreedit_ = std::get<0>(value); }), dbus::PropertyOption::Hidden); -Index: fcitx5-5.0.3/test/testdbus.cpp +Index: fcitx5-5.0.7/test/testdbus.cpp =================================================================== ---- fcitx5-5.0.3.orig/test/testdbus.cpp -+++ fcitx5-5.0.3/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; }, -+#if __GNUC__ < 8 +- [this](int32_t v) { prop2 = v; }); ++#if __GNUC__ < 9 + [&](int32_t v) { prop2 = v; }); +#else - [this](int32_t v) { prop2 = v; }); ++ [this](int32_t v) { prop2 = v; }); +#endif }; diff --git a/fcitx5.changes b/fcitx5.changes index a201210..24525f0 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed May 5 06:57:39 UTC 2021 - Marguerite Su + +- 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. + +------------------------------------------------------------------- +Thu Apr 22 06:41:09 UTC 2021 - Marguerite Su + +- update version 5.0.7 + * Fix reforwarding event value + +------------------------------------------------------------------- +Thu Apr 22 06:39:14 UTC 2021 - Marguerite Su + +- 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 + ------------------------------------------------------------------- Tue Mar 16 01:18:32 UTC 2021 - Marguerite Su diff --git a/fcitx5.spec b/fcitx5.spec index 72b0cfe..43131a8 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -20,7 +20,7 @@ %endif Name: fcitx5 -Version: 5.0.5 +Version: 5.0.8 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later @@ -43,7 +43,11 @@ BuildRequires: enchant-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: fmt-devel +%if 0%{?suse_version} >= 1550 BuildRequires: gcc-c++ +%else +BuildRequires: gcc8-c++ +%endif BuildRequires: gdk-pixbuf-devel BuildRequires: hicolor-icon-theme BuildRequires: iso-codes-devel @@ -131,6 +135,10 @@ This package provides utility libraries for fcitx5. cp -r %{SOURCE1} src/modules/spell/dict/ %build +%if 0%{?suse_version} < 1550 +export CC=%{_bindir}/gcc-8 +export CXX=%{_bindir}/g++-8 +%endif %cmake -DENABLE_PRESAGE=On -DCMAKE_SKIP_RPATH=OFF -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} %make_build