diff --git a/.gitignore b/.gitignore index 8163bf8..97b3028 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,67 @@ results_*/ /fcitx5-5.0.7_dict.tar.xz.sig /fcitx5-5.0.8_dict.tar.xz /fcitx5-5.0.8_dict.tar.xz.sig +/fcitx5-5.0.9_dict.tar.xz +/fcitx5-5.0.9_dict.tar.xz.sig +/fcitx5-5.0.10_dict.tar.xz +/fcitx5-5.0.10_dict.tar.xz.sig +/fcitx5-5.0.11_dict.tar.xz +/fcitx5-5.0.11_dict.tar.xz.sig +/fcitx5-5.0.12_dict.tar.xz +/fcitx5-5.0.12_dict.tar.xz.sig +/fcitx5-5.0.13_dict.tar.xz +/fcitx5-5.0.13_dict.tar.xz.sig +/fcitx5-5.0.14_dict.tar.xz +/fcitx5-5.0.14_dict.tar.xz.sig +/fcitx5-5.0.15_dict.tar.xz +/fcitx5-5.0.15_dict.tar.xz.sig +/fcitx5-5.0.16_dict.tar.xz +/fcitx5-5.0.16_dict.tar.xz.sig +/fcitx5-5.0.17_dict.tar.xz +/fcitx5-5.0.17_dict.tar.xz.sig +/fcitx5-5.0.18_dict.tar.xz +/fcitx5-5.0.18_dict.tar.xz.sig +/fcitx5-5.0.19_dict.tar.xz +/fcitx5-5.0.19_dict.tar.xz.sig +/fcitx5-5.0.20_dict.tar.xz +/fcitx5-5.0.20_dict.tar.xz.sig +/fcitx5-5.0.21_dict.tar.xz +/fcitx5-5.0.21_dict.tar.xz.sig +/fcitx5-5.0.22_dict.tar.xz +/fcitx5-5.0.22_dict.tar.xz.sig +/fcitx5-5.0.23_dict.tar.xz +/fcitx5-5.0.23_dict.tar.xz.sig +/fcitx5-5.1.0_dict.tar.xz +/fcitx5-5.1.0_dict.tar.xz.sig +/fcitx5-5.1.1_dict.tar.xz +/fcitx5-5.1.1_dict.tar.xz.sig +/fcitx5-5.1.2_dict.tar.xz +/fcitx5-5.1.2_dict.tar.xz.sig +/fcitx5-5.1.3_dict.tar.xz +/fcitx5-5.1.3_dict.tar.xz.sig +/fcitx5-5.1.4_dict.tar.xz +/fcitx5-5.1.4_dict.tar.xz.sig +/fcitx5-5.1.5_dict.tar.xz +/fcitx5-5.1.5_dict.tar.xz.sig +/fcitx5-5.1.6_dict.tar.xz +/fcitx5-5.1.6_dict.tar.xz.sig +/fcitx5-5.1.7_dict.tar.xz +/fcitx5-5.1.7_dict.tar.xz.sig +/fcitx5-5.1.8_dict.tar.xz +/fcitx5-5.1.8_dict.tar.xz.sig +/fcitx5-5.1.9_dict.tar.zst +/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/changelog b/changelog new file mode 100644 index 0000000..019ded6 --- /dev/null +++ b/changelog @@ -0,0 +1,90 @@ +* Wed Jul 21 2021 Fedora Release Engineering - 5.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 5.0.8-4 +- Rebuild for versioned symbols in json-c + +* Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 +- Cleanup dependences + +* Fri May 07 2021 Qiyu Yan - 5.0.8-2 +- Workaround a flatpak problem + +* Wed May 05 2021 Qiyu Yan - 5.0.8-1 +- Update to 5.0.8 upstream release + +* Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 +- Update to 5.0.7 upstream release + +* Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 +- Update to 5.0.6 upstream release + +* Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 +- update to 5.0.5 upstream release + +* Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 +- use conditional suggests + +* Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 +- update to 5.0.4 upstream release + +* Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 +- fix conlict with fcitx4 + +* Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 +- explicit Conflicts against fcitx-data + +* Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 +- Update to 5.0.3 upstream release + +* Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 +- add weak dep to im-modules + +* Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 +- Update to 5.0.2 upstream release + +* Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 +- add fcitx5-autostart package to auto setup env and autostart + +* Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 +- update to 5.0.1 upstream release + +* Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 +- update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit +- upstream added dbus service + +* Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 +- update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit + +* Wed Sep 16 2020 Qiyu Yan - 0-0.8 +- upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa + +* Sat Sep 12 2020 Karuboniru - 0-0.7 +- Drop imsetting +- Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 +- sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 + +* Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 +- Fix a typo + +* Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 +- Own /usr/share/fcitx5/inputmethod + +* Sun Aug 30 23:39:20 CST 2020 Qiyu Yan - 0-0.4.20200830git4706f37 +- rebuild to push to f32 + +* Sun Aug 30 2020 Qiyu Yan - 0-0.3.20200830git4706f37 +- update to commit 4706f37e60686d391a7f9a45ca1be6df6052ec4d +- fix a wrong xinputrc file + +* Sun Aug 16 2020 Qiyu Yan - 0-0.2.20200813git87fb655 +- change according to review suggestions + +* Thu Aug 13 2020 Qiyu Yan - 0-0.1.20200813git87fb655 +- new version + +* Wed Aug 12 2020 Qiyu Yan - 0-0.1.20200811gitc87ea48 +- initial package diff --git a/fcitx5-xinput b/fcitx5-xinput index 18456e9..819ea70 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -1,16 +1,19 @@ +IMSETTINGS_IGNORE_SESSION=*-wayland XIM=fcitx5 XIM_PROGRAM=/usr/bin/fcitx5 ICON="fcitx5" XIM_ARGS="-D" PREFERENCE_PROGRAM=/usr/bin/fcitx5-configtool SHORT_DESC="fcitx5" -GTK_IM_MODULE=fcitx5 +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=fcitx5 + QT_IM_MODULE=fcitx else QT_IM_MODULE=xim fi diff --git a/fcitx5.spec b/fcitx5.spec index 068fe9c..f0e1557 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,13 +2,14 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.8 -Release: 3%{?dist} +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.xz -Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.xz.sig +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 # Checked by chatting, this key is used to verify fcitx* tarballs Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput @@ -24,7 +25,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cldr-emoji-annotation) BuildRequires: pkgconfig(dri) -BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fmt) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -45,19 +46,29 @@ 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} Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives -Requires: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) -Requires: (fcitx5-qt if qt5-qtbase) -Requires: (fcitx5-qt-module if qt5-qtbase) +Recommends: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) +Recommends: (fcitx5-qt if (qt5-qtbase or qt6-qtbase)) +Recommends: (fcitx5-qt-module if (qt5-qtbase or qt6-qtbase)) +Recommends: fcitx5-configtool %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. +%package libs +Summary: Libraries for %{name} + +%description libs +The %{name}-libs package contains runtime shared libraries necessary for +running programs using Fcitx5 libraries. + %package data Summary: Data files of Fcitx5 BuildArch: noarch @@ -71,7 +82,7 @@ The %{name}-data package provides shared data for Fcitx5. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files necessary for @@ -91,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 @@ -102,11 +113,15 @@ 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 - + +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) @@ -114,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} @@ -133,13 +148,18 @@ 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 %{_bindir}/%{name}-remote %{_bindir}/%{name}-diagnose %{_libdir}/%{name}/ +%{_libexecdir}/fcitx5-wayland-launcher +%{_sysconfdir}/xdg/Xwayland-session.d/20-fcitx-x11 + +%files libs +%license LICENSES/LGPL-2.1-or-later.txt %{_libdir}/libFcitx5*.so.*.* %{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Core.so.7 @@ -158,6 +178,7 @@ fi %{_datadir}/applications/org.fcitx.Fcitx5.desktop %{_metainfodir}/org.fcitx.Fcitx5.metainfo.xml %{_datadir}/applications/%{name}-configtool.desktop +%{_datadir}/applications/%{name}-wayland-launcher.desktop %{_datadir}/icons/hicolor/*/apps/* %files autostart @@ -165,87 +186,4 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog -* Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 -- Cleanup dependences - -* Fri May 07 2021 Qiyu Yan - 5.0.8-2 -- Workaround a flatpak problem - -* Wed May 05 2021 Qiyu Yan - 5.0.8-1 -- Update to 5.0.8 upstream release - -* Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 -- Update to 5.0.7 upstream release - -* Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 -- Update to 5.0.6 upstream release - -* Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 -- update to 5.0.5 upstream release - -* Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 -- use conditional suggests - -* Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 -- update to 5.0.4 upstream release - -* Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 -- fix conlict with fcitx4 - -* Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 -- explicit Conflicts against fcitx-data - -* Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 -- Update to 5.0.3 upstream release - -* Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 -- add weak dep to im-modules - -* Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 -- Update to 5.0.2 upstream release - -* Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 -- add fcitx5-autostart package to auto setup env and autostart - -* Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 -- update to 5.0.1 upstream release - -* Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 -- update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit -- upstream added dbus service - -* Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 -- update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit - -* Wed Sep 16 2020 Qiyu Yan - 0-0.8 -- upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa - -* Sat Sep 12 2020 Karuboniru - 0-0.7 -- Drop imsetting -- Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 -- sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 - -* Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 -- Fix a typo - -* Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 -- Own /usr/share/fcitx5/inputmethod - -* Sun Aug 30 23:39:20 CST 2020 Qiyu Yan - 0-0.4.20200830git4706f37 -- rebuild to push to f32 - -* Sun Aug 30 2020 Qiyu Yan - 0-0.3.20200830git4706f37 -- update to commit 4706f37e60686d391a7f9a45ca1be6df6052ec4d -- fix a wrong xinputrc file - -* Sun Aug 16 2020 Qiyu Yan - 0-0.2.20200813git87fb655 -- change according to review suggestions - -* Thu Aug 13 2020 Qiyu Yan - 0-0.1.20200813git87fb655 -- new version - -* Wed Aug 12 2020 Qiyu Yan - 0-0.1.20200811gitc87ea48 -- initial package +%autochangelog diff --git a/sources b/sources index 2eb9a50..654c39a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.8_dict.tar.xz) = c37d4e44c898c8e352df9495cb380cb5b0837687821274bab88baf39bd17ecc333ea513090437ade8fdfd6f12bc1f91225ca863b1dd814eb8353a6013e43b64d -SHA512 (fcitx5-5.0.8_dict.tar.xz.sig) = 58de1113a8ff3c298d4a2cf9c2bd3ae6e090b83a51c3bacf42f4fd0e747f236b71691931a0450f2a002746f92d39f4b9b9184d901a15bf1e0c5b120b6c86a194 +SHA512 (fcitx5-5.1.17_dict.tar.zst) = fe3f13d7615ae823b0746bd731d0eac4df90b216c22c186c4f63ab71c0450f38adfa558e906a5493bb5eab873bffea913477c8dcb2ba7055668305cf995e235f +SHA512 (fcitx5-5.1.17_dict.tar.zst.sig) = ea98a9ebaf3d77043b461bf8a6691c57e28d7149d19dcd9c54bc0e4923fd176c6435185a65960cdfdb47c0129983c027b31a3bbdb515c1226fb7240c5600a781