diff --git a/0001-Remove-unused-xkbcommon-headers.patch b/0001-Remove-unused-xkbcommon-headers.patch new file mode 100644 index 0000000..1aa9568 --- /dev/null +++ b/0001-Remove-unused-xkbcommon-headers.patch @@ -0,0 +1,26 @@ +From 8ab4581ca7142636cb8178cfa1ecf97d5a73afc6 Mon Sep 17 00:00:00 2001 +From: Weng Xuetian +Date: Tue, 5 Jul 2022 07:52:50 -0700 +Subject: [PATCH] Remove unused xkbcommon headers. + +Fix #538 +--- + src/im/keyboard/keyboard.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/im/keyboard/keyboard.h b/src/im/keyboard/keyboard.h +index 9a4d2f3..e16db96 100644 +--- a/src/im/keyboard/keyboard.h ++++ b/src/im/keyboard/keyboard.h +@@ -7,8 +7,6 @@ + #ifndef _FCITX_IM_KEYBOARD_KEYBOARD_H_ + #define _FCITX_IM_KEYBOARD_KEYBOARD_H_ + +-#include +-#include + #include "fcitx-config/configuration.h" + #include "fcitx-config/iniparser.h" + #include "fcitx-utils/event.h" +-- +2.36.1 + diff --git a/fcitx5-5.0.15.tar.xz b/fcitx5-5.0.15.tar.xz deleted file mode 100644 index cdb2b76..0000000 --- a/fcitx5-5.0.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:343df0f278dc6db4afebc778664ee477d9bd6c011c8446e5aa89c20bb1786e41 -size 1329272 diff --git a/fcitx5-5.0.18.tar.xz b/fcitx5-5.0.18.tar.xz new file mode 100644 index 0000000..47ce29f --- /dev/null +++ b/fcitx5-5.0.18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6803f65b9f26e70e0498809f2b0f973b06340f484793d58dde08f2498bd8c6f5 +size 1348668 diff --git a/fcitx5.changes b/fcitx5.changes index c9693b0..5a44789 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 5 11:29:25 UTC 2022 - Fusion Future + +- Update to 5.0.18 + * Support for plasma themes in classicui + * Fix client cursor disappears when using qt text-input-v2 + * Fix clear text when ctrl+c when using gtk text-input-v3 + * Fix a rare wayland protocol error on sway +- Fix build by removing unused headers (gh#fcitx/fcitx5#538) + * 0001-Remove-unused-xkbcommon-headers.patch +- Replace raw package name with pkgconfig() +- Remove "ENABLE_PRESAGE", it's not used anywhere + (https://github.com/fcitx/fcitx5/commit/e7348f0f972d7f4934f3a1dd1258a51d7d057ac4) + ------------------------------------------------------------------- Sat Mar 12 08:17:03 UTC 2022 - Marguerite Su diff --git a/fcitx5.spec b/fcitx5.spec index 6b034b5..6ce6a8f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -25,7 +25,7 @@ %endif Name: fcitx5 -Version: 5.0.15 +Version: 5.0.18 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later @@ -40,40 +40,43 @@ 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 +# PATCH-FIX-UPSTREAM gh#fcitx/fcitx5#538 +Patch3: 0001-Remove-unused-xkbcommon-headers.patch BuildRequires: cmake BuildRequires: dbus-1-devel -BuildRequires: enchant-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: fmt-devel +BuildRequires: ninja %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 -BuildRequires: libevent-devel -BuildRequires: libexpat-devel -BuildRequires: libjson-c-devel -BuildRequires: libpresage-devel -BuildRequires: libuuid-devel -BuildRequires: libxkbcommon-devel -BuildRequires: libxkbcommon-x11-devel -BuildRequires: libxkbfile-devel -BuildRequires: pango-devel -BuildRequires: systemd-devel BuildRequires: update-desktop-files -BuildRequires: wayland-devel -BuildRequires: wayland-protocols-devel -BuildRequires: xcb-imdkit-devel -BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-wm-devel BuildRequires: xkeyboard-config +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cldr-emoji-annotation) +BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(fmt) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-imdkit) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon-x11) +BuildRequires: pkgconfig(xkbfile) %if 0%{?suse_version} <= 1520 BuildRequires: appstream-glib-devel %endif @@ -108,7 +111,6 @@ Summary: Configuration library for fcitx5 Group: System/Libraries Provides: libFcitx5Config5 = %{version} Obsoletes: libFcitx5Config5 < %{version} -Provides: libfcitx-config4 = %{verson} Obsoletes: libfcitx-config4 <= 4.2.9.8 %description -n libFcitx5Config6 @@ -139,10 +141,7 @@ Obsoletes: libfcitx-utils0 <= 4.2.9.8 This package provides utility libraries for fcitx5. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 cp -r %{SOURCE1} src/modules/spell/dict/ %build @@ -150,8 +149,8 @@ cp -r %{SOURCE1} src/modules/spell/dict/ 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 +%cmake -DCMAKE_SKIP_RPATH=OFF -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} +%cmake_build %install %cmake_install