From e25316159ade8b4144217b30a9123c37d08c3288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 09:29:29 +0200 Subject: [PATCH 01/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fcitx5.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index 7bf182f..de9b6a0 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -5,7 +5,8 @@ Name: fcitx5 Version: 5.1.10 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 From 874024dde04ee5fe68fd6b9e28c6f4555df0f5b9 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 5 Oct 2024 18:35:34 +0800 Subject: [PATCH 02/10] Also detect qt6 plugin in xinput script (#2316572) --- fcitx5-xinput | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From f8de8c4be61bddd7164b0b6851ec1eaaea44124a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 10 Oct 2024 15:20:52 +0800 Subject: [PATCH 03/10] update to upstream release 5.1.11 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fc93b0e..2ee9f90 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ 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 diff --git a/fcitx5.spec b/fcitx5.spec index de9b6a0..1093717 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.10 +Version: 5.1.11 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 5b692b2..1198b4a 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.11_dict.tar.zst) = d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb +SHA512 (fcitx5-5.1.11_dict.tar.zst.sig) = 13b713a228bf4765a9f3c480cc249b078acd42c09975930b6cb3bcf7722077780897dc23a9445fc05d8c4693ab4b4697957d0fef244e24b70794f219485cd538 From d6cf83bad702ba5e987153e9ff4b5700c43f3f32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 17:57:57 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 32ff03e40f5a85dab6672462005c51cb492d3ba4 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 23 Jan 2025 10:01:28 +0800 Subject: [PATCH 05/10] update to upstream release 5.1.12 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ee9f90..039daf2 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 1093717..387c919 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.11 +Version: 5.1.12 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 1198b4a..008f4a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.11_dict.tar.zst) = d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb -SHA512 (fcitx5-5.1.11_dict.tar.zst.sig) = 13b713a228bf4765a9f3c480cc249b078acd42c09975930b6cb3bcf7722077780897dc23a9445fc05d8c4693ab4b4697957d0fef244e24b70794f219485cd538 +SHA512 (fcitx5-5.1.12_dict.tar.zst) = 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645 +SHA512 (fcitx5-5.1.12_dict.tar.zst.sig) = 87ba7c9c13b74a5471536ab9eca575868ef4dd74faa549f2c5977b5d265e74144054f8567204afa061c7c4b856ea369a9656b750f22ebd0e83b060df9c9eca15 From 332715bb24d25689c3470f4f53baf080483dce06 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 16 Jun 2025 21:44:37 +0800 Subject: [PATCH 06/10] update to upstream release 5.1.13 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 039daf2..79b8146 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 387c919..b71dc26 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.12 +Version: 5.1.13 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 008f4a0..5d3cdf1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.12_dict.tar.zst) = 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645 -SHA512 (fcitx5-5.1.12_dict.tar.zst.sig) = 87ba7c9c13b74a5471536ab9eca575868ef4dd74faa549f2c5977b5d265e74144054f8567204afa061c7c4b856ea369a9656b750f22ebd0e83b060df9c9eca15 +SHA512 (fcitx5-5.1.13_dict.tar.zst) = 474629c8951c7e1f7f8714fd7dcf3b1b59203815ee37c30a2e65bda77b4acbe4dd0a020024bea2e5a3183a3b73107cee69793a2e4719454cf3d6a70e2096a71f +SHA512 (fcitx5-5.1.13_dict.tar.zst.sig) = ab985c909a4a7e5da4d2639218cf46aad28ec334fd1d6ac80ad8bd4c52b5416cf1b836420d0f23894090092fbeb23c0af74ca0c76e321c837a1f959b6fd52c6c From 262fbf39cec2d19b4a5ea530ac5d58098df13133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:22:19 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3a7385c02defa7836d907f6a51960ba76fac3b56 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 26 Oct 2025 16:56:42 +0000 Subject: [PATCH 08/10] update to upstream release 5.1.15 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79b8146..6a86de2 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index b71dc26..c79e8fb 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.13 +Version: 5.1.15 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 5d3cdf1..9cbdb47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.13_dict.tar.zst) = 474629c8951c7e1f7f8714fd7dcf3b1b59203815ee37c30a2e65bda77b4acbe4dd0a020024bea2e5a3183a3b73107cee69793a2e4719454cf3d6a70e2096a71f -SHA512 (fcitx5-5.1.13_dict.tar.zst.sig) = ab985c909a4a7e5da4d2639218cf46aad28ec334fd1d6ac80ad8bd4c52b5416cf1b836420d0f23894090092fbeb23c0af74ca0c76e321c837a1f959b6fd52c6c +SHA512 (fcitx5-5.1.15_dict.tar.zst) = 607909917913c0e9923acabf72bac59cb4e8749ac6a40e2c5a65d8c0146788cc751c72a5d36efb4650cdc069be491e54e44f7533d5319f07f496fcf5a20fc360 +SHA512 (fcitx5-5.1.15_dict.tar.zst.sig) = 4fc676d52aee164a3e5d27af789f6f950d46e1828d90f1406b8a816c0f9d7617617e697820e3f43e72d4ab7ada809177f7ff0fad681a5d4c2f72e6f2e88ca500 From 5ddb363a1366d553097d94d450230500bee02d42 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 26 Oct 2025 18:41:04 +0000 Subject: [PATCH 09/10] update to upstream release 5.1.16 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6a86de2..631d834 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index c79e8fb..10fa74d 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.15 +Version: 5.1.16 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 9cbdb47..e7329d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.15_dict.tar.zst) = 607909917913c0e9923acabf72bac59cb4e8749ac6a40e2c5a65d8c0146788cc751c72a5d36efb4650cdc069be491e54e44f7533d5319f07f496fcf5a20fc360 -SHA512 (fcitx5-5.1.15_dict.tar.zst.sig) = 4fc676d52aee164a3e5d27af789f6f950d46e1828d90f1406b8a816c0f9d7617617e697820e3f43e72d4ab7ada809177f7ff0fad681a5d4c2f72e6f2e88ca500 +SHA512 (fcitx5-5.1.16_dict.tar.zst) = 5d9b340f8be725b61a52d9a0f6f2bd9172f01262f37633c5db6177dd128873db51bbf8222e2117723f423fbd7035c97d3eb447ac587b73c5f17923c12597bc47 +SHA512 (fcitx5-5.1.16_dict.tar.zst.sig) = 5dffb6c45da1653a56b5ee925eda04b6b2652055016dbb2c18dc0b99bc8f5253871846c40e4ec2463cf7b08afc5ca352a51688f41f8f6fad4e41332def854a7b From b6a309b2accb9196e9ec0dafa26f45102d6d86e7 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Dec 2025 15:47:10 +0000 Subject: [PATCH 10/10] update to upstream release 5.1.17 --- .gitignore | 2 ++ fcitx5.spec | 13 +++++++------ sources | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 631d834..97b3028 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ results_*/ /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.spec b/fcitx5.spec index 10fa74d..f0e1557 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.16 +Version: 5.1.17 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. @@ -46,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} @@ -101,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 @@ -112,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 @@ -120,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) @@ -128,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} @@ -147,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 e7329d1..654c39a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.16_dict.tar.zst) = 5d9b340f8be725b61a52d9a0f6f2bd9172f01262f37633c5db6177dd128873db51bbf8222e2117723f423fbd7035c97d3eb447ac587b73c5f17923c12597bc47 -SHA512 (fcitx5-5.1.16_dict.tar.zst.sig) = 5dffb6c45da1653a56b5ee925eda04b6b2652055016dbb2c18dc0b99bc8f5253871846c40e4ec2463cf7b08afc5ca352a51688f41f8f6fad4e41332def854a7b +SHA512 (fcitx5-5.1.17_dict.tar.zst) = fe3f13d7615ae823b0746bd731d0eac4df90b216c22c186c4f63ab71c0450f38adfa558e906a5493bb5eab873bffea913477c8dcb2ba7055668305cf995e235f +SHA512 (fcitx5-5.1.17_dict.tar.zst.sig) = ea98a9ebaf3d77043b461bf8a6691c57e28d7149d19dcd9c54bc0e4923fd176c6435185a65960cdfdb47c0129983c027b31a3bbdb515c1226fb7240c5600a781