From d528a6b7ec9002823c020f288f6257d06c934d514e4e9247d3382c5a704e2c97 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 27 Jan 2022 15:02:29 +0000 Subject: [PATCH] Accepting request 949472 from home:MargueriteSu:branches:M17N - update version 5.0.13 * bug fix release - change in 5.0.12 * A lot of fixes in zwp_input_method_v1 to make it ready to be used with future Plasma 5.24 native wayland input method support. With the next Plasma release (not out yet as of today), you should be able to directly select fcitx in the "Virtual keyboard KCM" (it was designed for on screen keyboard so the naming is a little bit confusing at this point) and use it with native wayland input method protocols. This allows some non-gtk/qt text-input-v{2,3} applications to be used with the input method under kwin. - add fcitx5-5.0.13-memfd.patch OBS-URL: https://build.opensuse.org/request/show/949472 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=21 --- fcitx5-5.0.11.tar.xz | 3 --- fcitx5-5.0.13-memfd.patch | 12 +++++++++++ fcitx5-5.0.13.tar.xz | 3 +++ fcitx5.changes | 16 +++++++++++++++ fcitx5.spec | 43 ++++++++++++++++++++++++++++++++------- input-method.py3 | 2 +- 6 files changed, 68 insertions(+), 11 deletions(-) delete mode 100644 fcitx5-5.0.11.tar.xz create mode 100644 fcitx5-5.0.13-memfd.patch create mode 100644 fcitx5-5.0.13.tar.xz diff --git a/fcitx5-5.0.11.tar.xz b/fcitx5-5.0.11.tar.xz deleted file mode 100644 index a484eda..0000000 --- a/fcitx5-5.0.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14208907f9d43e2d06257d28edf825380acd7288e6d4275138781c8cbe4d395d -size 1953703 diff --git a/fcitx5-5.0.13-memfd.patch b/fcitx5-5.0.13-memfd.patch new file mode 100644 index 0000000..2cd3806 --- /dev/null +++ b/fcitx5-5.0.13-memfd.patch @@ -0,0 +1,12 @@ +Index: fcitx5-5.0.13/src/ui/classic/buffer.cpp +=================================================================== +--- fcitx5-5.0.13.orig/src/ui/classic/buffer.cpp ++++ fcitx5-5.0.13/src/ui/classic/buffer.cpp +@@ -23,6 +23,7 @@ + #include "wl_shm.h" + #include "wl_shm_pool.h" + #include "wl_surface.h" ++#include + + namespace fcitx::wayland { + diff --git a/fcitx5-5.0.13.tar.xz b/fcitx5-5.0.13.tar.xz new file mode 100644 index 0000000..1d57a09 --- /dev/null +++ b/fcitx5-5.0.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:946aa6dff2d513b09adc061fcec0803a180c481adf5ea5d07e0be0a059f5b2ab +size 1320896 diff --git a/fcitx5.changes b/fcitx5.changes index c2a7695..7f96a2f 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Jan 23 05:01:56 UTC 2022 - Marguerite Su + +- update version 5.0.13 + * bug fix release +- change in 5.0.12 + * A lot of fixes in zwp_input_method_v1 to make it ready to be used + with future Plasma 5.24 native wayland input method support. With + the next Plasma release (not out yet as of today), you should be + able to directly select fcitx in the "Virtual keyboard KCM" (it was + designed for on screen keyboard so the naming is a little bit + confusing at this point) and use it with native wayland input + method protocols. This allows some non-gtk/qt text-input-v{2,3} + applications to be used with the input method under kwin. +- add fcitx5-5.0.13-memfd.patch + ------------------------------------------------------------------- Thu Jan 20 08:06:20 CET 2022 - tiwai@suse.de diff --git a/fcitx5.spec b/fcitx5.spec index e4506ab..c43c1f9 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -19,8 +19,12 @@ %define _distconfdir %{_sysconfdir} %endif +%if ! %{defined _environmentdir} +%define _environmentdir %{_prefix}/lib/environment.d +%endif + Name: fcitx5 -Version: 5.0.11 +Version: 5.0.13 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later @@ -37,6 +41,7 @@ Source101: 99-fcitx5.conf Source102: fcitx5.service Patch0: fcitx5-no-download.patch Patch1: fcitx5-gcc7.patch +Patch2: fcitx5-5.0.13-memfd.patch BuildRequires: Mesa-libEGL-devel BuildRequires: cairo-devel BuildRequires: cldr-emoji-annotation-devel @@ -90,6 +95,9 @@ Fcitx 5 is a generic input method framework. Summary: Development files for fcitx5 Group: Development/Libraries/C and C++ Requires: fcitx5 = %{version} +Requires: libFcitx5Config6 = %{version} +Requires: libFcitx5Core7 = %{version} +Requires: libFcitx5Utils2 = %{version} Provides: fcitx-devel = %{version} Obsoletes: fcitx-devel <= 4.2.9.8 @@ -129,6 +137,7 @@ This package provides utility libraries for fcitx5. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp -r %{SOURCE1} src/modules/spell/dict/ %build @@ -175,27 +184,47 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/app # install desktop files %suse_update_desktop_file %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop Utility DesktopUtility -%suse_update_desktop_file -r fcitx5-configtool System X-SuSE-SystemSetup +%suse_update_desktop_file -r fcitx5-configtool Settings DesktopSettings # own directories mkdir -p %{buildroot}%{_datadir}/fcitx5/inputmethod mkdir -p %{buildroot}%{_libdir}/fcitx5/qt5 # install macros.fcitx5 -install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 +install -Dm 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/macros.d/macros.fcitx5 %find_lang fcitx5 %fdupes %{buildroot} +%if 0%{?suse_version} >= 1550 %systemd_user_pre fcitx5.service %systemd_user_post fcitx5.service %systemd_user_preun fcitx5.service %systemd_user_postun fcitx5.service -%post -p /sbin/ldconfig +%else +%pre +if [ -x /usr/bin/systemctl ]; then + if [ ! -e "/usr/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 [ -e "/run/systemd/rpm/needs-user-preset/%{name}.service" ]; then + /usr/bin/systemctl --global preset "%{name}.service" || : + rm "/run/systemd/rpm/needs-user-preset/%{name}.service" || : + fi +fi +%preun +if [ %{name}.service -eq 0 -a -x /usr/bin/systemctl ]; then + /usr/bin/systemctl --global disable fcitx5.service || : +fi +%endif + %post -n libFcitx5Config6 -p /sbin/ldconfig %post -n libFcitx5Core7 -p /sbin/ldconfig %post -n libFcitx5Utils2 -p /sbin/ldconfig -%postun -p /sbin/ldconfig %postun -n libFcitx5Config6 -p /sbin/ldconfig %postun -n libFcitx5Core7 -p /sbin/ldconfig %postun -n libFcitx5Utils2 -p /sbin/ldconfig @@ -224,7 +253,7 @@ install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %{_datadir}/metainfo/org.fcitx.Fcitx5.metainfo.xml %files devel -%{_sysconfdir}/rpm/macros.fcitx5 +%{_prefix}/lib/rpm/macros.d/macros.fcitx5 %{_includedir}/Fcitx5 %{_libdir}/cmake/Fcitx5* %{_libdir}/libFcitx5Config.so @@ -244,4 +273,4 @@ install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %{_libdir}/libFcitx5Utils.so.2 %{_libdir}/libFcitx5Utils.so.%{version} -%changelog +%changelog \ No newline at end of file diff --git a/input-method.py3 b/input-method.py3 index 4864595..3b3d717 100644 --- a/input-method.py3 +++ b/input-method.py3 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 from os import listdir from os.path import isdir, isfile, join