diff --git a/FTBFS-fcitx5-5.0.23-fmt.patch b/FTBFS-fcitx5-5.0.23-fmt.patch new file mode 100644 index 0000000..d8f3163 --- /dev/null +++ b/FTBFS-fcitx5-5.0.23-fmt.patch @@ -0,0 +1,13 @@ +Index: fcitx5-5.0.23/src/modules/dbus/dbusmodule.cpp +=================================================================== +--- fcitx5-5.0.23.orig/src/modules/dbus/dbusmodule.cpp ++++ fcitx5-5.0.23/src/modules/dbus/dbusmodule.cpp +@@ -571,7 +571,7 @@ public: + } + ss << "] program:" << ic->program() + << " frontend:" << ic->frontend() +- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) ++ << " cap:" << fmt::format("{:x}", static_cast(ic->capabilityFlags())) + << " focus:" << ic->hasFocus() << std::endl; + return true; + }); diff --git a/fcitx5-5.0.21_dict.tar.xz b/fcitx5-5.0.21_dict.tar.xz deleted file mode 100644 index bbd5f44..0000000 --- a/fcitx5-5.0.21_dict.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0748dfeb50c036881b5517e8840c2266dfd40c1f59d708576a3d191bc820c82 -size 7438648 diff --git a/fcitx5-5.0.23_dict.tar.xz b/fcitx5-5.0.23_dict.tar.xz new file mode 100644 index 0000000..f7a0a7a --- /dev/null +++ b/fcitx5-5.0.23_dict.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17f008e58f3d4821cfb39005151433d5f329c822e0d579a943fb478c14d846f0 +size 7455892 diff --git a/fcitx5.changes b/fcitx5.changes index fbd5f2e..dc46e43 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon May 22 09:45:48 UTC 2023 - Marguerite Su + +- Update to 5.0.23 + * fix a regression in certain Super(Win key) related +hotkey handling +- Changes in 5.0.22 + * implement application name detection on wayland for text-input +client when using KDE / wlroots. + * fix xkb rule parsing + * fix SNI tray menu radio icon + * avoid forwarding key in certain cases. + * support xkb rule defined in ~/.config/xkb ~/.xkb + * fcitx5-configtool now use "command" instead of "which" + * Improve commit preedit behavior when focus out +- Add FTBFS-fcitx5-5.0.23-fmt.patch + ------------------------------------------------------------------- Thu Nov 24 14:22:12 UTC 2022 - Fusion Future diff --git a/fcitx5.spec b/fcitx5.spec index 349ef05..997c45b 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx5 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,11 @@ %if ! %{defined _distconfdir} %define _distconfdir %{_sysconfdir} %endif - %if ! %{defined _environmentdir} %define _environmentdir %{_prefix}/lib/environment.d %endif - Name: fcitx5 -Version: 5.0.21 +Version: 5.0.23 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later @@ -38,17 +36,14 @@ Source4: macros.fcitx5 Source102: fcitx5.service Patch1: fcitx5-gcc7.patch Patch2: fcitx5-5.0.13-memfd.patch +Patch3: FTBFS-fcitx5-5.0.23-fmt.patch BuildRequires: cmake BuildRequires: dbus-1-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: ninja -%if 0%{?suse_version} >= 1550 -BuildRequires: gcc-c++ -%else -BuildRequires: gcc8-c++ -%endif BuildRequires: hicolor-icon-theme +BuildRequires: ninja +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xcb-util-wm-devel BuildRequires: xkeyboard-config @@ -73,18 +68,23 @@ BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkbfile) -%if 0%{?suse_version} <= 1520 -BuildRequires: appstream-glib-devel -%endif Provides: fcitx = %{version} Obsoletes: fcitx < 5 Provides: inputmethod +%systemd_requires +%if 0%{?suse_version} >= 1550 +BuildRequires: gcc-c++ +%else +BuildRequires: gcc8-c++ +%endif +%if 0%{?suse_version} <= 1520 +BuildRequires: appstream-glib-devel +%endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse} BuildRequires: rsvg-convert %else BuildRequires: rsvg-view %endif -%systemd_requires %description Fcitx 5 is a generic input method framework. @@ -200,24 +200,24 @@ install -Dm 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/macros.d/macros.fcitx %else %pre -if [ -x /usr/bin/systemctl ]; then - if [ ! -e "/usr/lib/systemd/user/%{name}.service" ]; then +if [ -x %{_bindir}/systemctl ]; then + if [ ! -e "%{_prefix}/lib/systemd/user/%{name}.service" ]; then mkdir -p /run/systemd/rpm/needs-user-preset touch "/run/systemd/rpm/needs-user-preset/%{name}.service" fi fi %post -if [ -x /usr/bin/systemctl ]; then +if [ -x %{_bindir}/systemctl ]; then if [ -e "/run/systemd/rpm/needs-user-preset/%{name}.service" ]; then - /usr/bin/systemctl --global preset "%{name}.service" || : + %{_bindir}/systemctl --global preset "%{name}.service" || : rm "/run/systemd/rpm/needs-user-preset/%{name}.service" || : fi fi %preun -if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then - /usr/bin/systemctl --global disable %{name}.service || : +if [ $1 -eq 0 -a -x %{_bindir}/systemctl ]; then + %{_bindir}/systemctl --global disable %{name}.service || : fi %endif