diff --git a/.gitignore b/.gitignore index fc93b0e..97b3028 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,15 @@ results_*/ /fcitx5-5.1.9_dict.tar.zst.sig /fcitx5-5.1.10_dict.tar.zst /fcitx5-5.1.10_dict.tar.zst.sig +/fcitx5-5.1.11_dict.tar.zst +/fcitx5-5.1.11_dict.tar.zst.sig +/fcitx5-5.1.12_dict.tar.zst +/fcitx5-5.1.12_dict.tar.zst.sig +/fcitx5-5.1.13_dict.tar.zst +/fcitx5-5.1.13_dict.tar.zst.sig +/fcitx5-5.1.15_dict.tar.zst +/fcitx5-5.1.15_dict.tar.zst.sig +/fcitx5-5.1.16_dict.tar.zst +/fcitx5-5.1.16_dict.tar.zst.sig +/fcitx5-5.1.17_dict.tar.zst +/fcitx5-5.1.17_dict.tar.zst.sig diff --git a/fcitx5-xinput b/fcitx5-xinput index e1ca1a9..819ea70 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -9,7 +9,9 @@ GTK_IM_MODULE=fcitx if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ - test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so; + test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ + test -f /usr/lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ + test -f /usr/lib64/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so ; then QT_IM_MODULE=fcitx else diff --git a/fcitx5.spec b/fcitx5.spec index 7bf182f..f0e1557 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,10 +2,11 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.10 +Version: 5.1.17 Release: %autorelease Summary: Next generation of fcitx -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: https://github.com/fcitx/fcitx5 Source: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst.sig @@ -45,6 +46,7 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: /usr/bin/appstream-util +BuildRequires: cmake(nlohmann_json) Requires: dbus-common Requires: %{name}-data = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -100,7 +102,7 @@ This package will setup autostart and environment needed for fcitx5 to work prop %build %cmake -GNinja -%cmake_build +%cmake_build %install %cmake_install @@ -111,7 +113,7 @@ install -d %{buildroot}%{_datadir}/%{name}/table desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop - + desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop @@ -119,7 +121,7 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-wayland-launcher.desktop - + # convert symlinked icons to copied icons, this will help co-existing with # fcitx4 for iconfile in $(find %{buildroot}%{_datadir}/icons -type l) @@ -127,7 +129,7 @@ do origicon=$(readlink -f ${iconfile}) rm -f ${iconfile} cp ${origicon} ${iconfile} -done +done appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %find_lang %{name} @@ -146,7 +148,7 @@ fi %files -f %{name}.lang %license LICENSES/LGPL-2.1-or-later.txt -%doc README.md +%doc README.md %config %{_xinputconf} %{_bindir}/%{name} %{_bindir}/%{name}-configtool diff --git a/sources b/sources index 5b692b2..654c39a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.10_dict.tar.zst) = 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4 -SHA512 (fcitx5-5.1.10_dict.tar.zst.sig) = 0b386a7a52d9687e311a32ca3a6526d29eeef4b892744bf70f0f07b496d98642aaf00ca31f62cde140c7a6d477890e13e5acced738476e49348cf9dd9fcb5789 +SHA512 (fcitx5-5.1.17_dict.tar.zst) = fe3f13d7615ae823b0746bd731d0eac4df90b216c22c186c4f63ab71c0450f38adfa558e906a5493bb5eab873bffea913477c8dcb2ba7055668305cf995e235f +SHA512 (fcitx5-5.1.17_dict.tar.zst.sig) = ea98a9ebaf3d77043b461bf8a6691c57e28d7149d19dcd9c54bc0e4923fd176c6435185a65960cdfdb47c0129983c027b31a3bbdb515c1226fb7240c5600a781