Accepting request 1088339 from home:MargueriteSu:branches:M17N
- 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 OBS-URL: https://build.opensuse.org/request/show/1088339 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=47
This commit is contained in:
parent
b06fa6f769
commit
0a77381f61
13
FTBFS-fcitx5-5.0.23-fmt.patch
Normal file
13
FTBFS-fcitx5-5.0.23-fmt.patch
Normal file
@ -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<uint64_t>(ic->capabilityFlags()))
|
||||||
|
<< " focus:" << ic->hasFocus() << std::endl;
|
||||||
|
return true;
|
||||||
|
});
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c0748dfeb50c036881b5517e8840c2266dfd40c1f59d708576a3d191bc820c82
|
|
||||||
size 7438648
|
|
3
fcitx5-5.0.23_dict.tar.xz
Normal file
3
fcitx5-5.0.23_dict.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:17f008e58f3d4821cfb39005151433d5f329c822e0d579a943fb478c14d846f0
|
||||||
|
size 7455892
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 22 09:45:48 UTC 2023 - Marguerite Su <i@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 <qydwhotmail@gmail.com>
|
Thu Nov 24 14:22:12 UTC 2022 - Fusion Future <qydwhotmail@gmail.com>
|
||||||
|
|
||||||
|
40
fcitx5.spec
40
fcitx5.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package fcitx5
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -19,13 +19,11 @@
|
|||||||
%if ! %{defined _distconfdir}
|
%if ! %{defined _distconfdir}
|
||||||
%define _distconfdir %{_sysconfdir}
|
%define _distconfdir %{_sysconfdir}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if ! %{defined _environmentdir}
|
%if ! %{defined _environmentdir}
|
||||||
%define _environmentdir %{_prefix}/lib/environment.d
|
%define _environmentdir %{_prefix}/lib/environment.d
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: fcitx5
|
Name: fcitx5
|
||||||
Version: 5.0.21
|
Version: 5.0.23
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Next generation of fcitx
|
Summary: Next generation of fcitx
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
@ -38,17 +36,14 @@ Source4: macros.fcitx5
|
|||||||
Source102: fcitx5.service
|
Source102: fcitx5.service
|
||||||
Patch1: fcitx5-gcc7.patch
|
Patch1: fcitx5-gcc7.patch
|
||||||
Patch2: fcitx5-5.0.13-memfd.patch
|
Patch2: fcitx5-5.0.13-memfd.patch
|
||||||
|
Patch3: FTBFS-fcitx5-5.0.23-fmt.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: ninja
|
|
||||||
%if 0%{?suse_version} >= 1550
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
%else
|
|
||||||
BuildRequires: gcc8-c++
|
|
||||||
%endif
|
|
||||||
BuildRequires: hicolor-icon-theme
|
BuildRequires: hicolor-icon-theme
|
||||||
|
BuildRequires: ninja
|
||||||
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: xcb-util-wm-devel
|
BuildRequires: xcb-util-wm-devel
|
||||||
BuildRequires: xkeyboard-config
|
BuildRequires: xkeyboard-config
|
||||||
@ -73,18 +68,23 @@ BuildRequires: pkgconfig(xcb-keysyms)
|
|||||||
BuildRequires: pkgconfig(xkbcommon)
|
BuildRequires: pkgconfig(xkbcommon)
|
||||||
BuildRequires: pkgconfig(xkbcommon-x11)
|
BuildRequires: pkgconfig(xkbcommon-x11)
|
||||||
BuildRequires: pkgconfig(xkbfile)
|
BuildRequires: pkgconfig(xkbfile)
|
||||||
%if 0%{?suse_version} <= 1520
|
|
||||||
BuildRequires: appstream-glib-devel
|
|
||||||
%endif
|
|
||||||
Provides: fcitx = %{version}
|
Provides: fcitx = %{version}
|
||||||
Obsoletes: fcitx < 5
|
Obsoletes: fcitx < 5
|
||||||
Provides: inputmethod
|
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}
|
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse}
|
||||||
BuildRequires: rsvg-convert
|
BuildRequires: rsvg-convert
|
||||||
%else
|
%else
|
||||||
BuildRequires: rsvg-view
|
BuildRequires: rsvg-view
|
||||||
%endif
|
%endif
|
||||||
%systemd_requires
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Fcitx 5 is a generic input method framework.
|
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
|
%else
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
if [ -x /usr/bin/systemctl ]; then
|
if [ -x %{_bindir}/systemctl ]; then
|
||||||
if [ ! -e "/usr/lib/systemd/user/%{name}.service" ]; then
|
if [ ! -e "%{_prefix}/lib/systemd/user/%{name}.service" ]; then
|
||||||
mkdir -p /run/systemd/rpm/needs-user-preset
|
mkdir -p /run/systemd/rpm/needs-user-preset
|
||||||
touch "/run/systemd/rpm/needs-user-preset/%{name}.service"
|
touch "/run/systemd/rpm/needs-user-preset/%{name}.service"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%post
|
%post
|
||||||
if [ -x /usr/bin/systemctl ]; then
|
if [ -x %{_bindir}/systemctl ]; then
|
||||||
if [ -e "/run/systemd/rpm/needs-user-preset/%{name}.service" ]; 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" || :
|
rm "/run/systemd/rpm/needs-user-preset/%{name}.service" || :
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then
|
if [ $1 -eq 0 -a -x %{_bindir}/systemctl ]; then
|
||||||
/usr/bin/systemctl --global disable %{name}.service || :
|
%{_bindir}/systemctl --global disable %{name}.service || :
|
||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user