From eabb2a4d6df457d74ba665b473b04e9c0a47608a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 2 Jun 2022 10:20:44 +0800 Subject: [PATCH 01/41] update to upstream release 5.0.17 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8aee0c9..3267658 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 1a9b316..903dbd7 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.16 +Version: 5.0.17 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 24f141e..392e643 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.16_dict.tar.xz) = fd237c04fb085b3997aabb96b23db27948af68367f57ad2a89a56a7f46410bcd87f0c22e58e4cc9d9de170360ff7b2e533f375d2378d1673e10fed8fc295b0fa -SHA512 (fcitx5-5.0.16_dict.tar.xz.sig) = 855a05fff97c03e4da378ccbe2b8c185443453cd07d42ea215450b5b91f4c539b44fed273e6e5bb51be0cef8d3ca812d229d93a5b3991e2b9ebbae13b695ab01 +SHA512 (fcitx5-5.0.17_dict.tar.xz) = fe2d45ffacef93aa6c7747a30d99923e6ce5fb8c54c9093fc1b3a87606eb4b9a789951110ac33371b191ccdd9e43a2063ab2665946c0c0f447e2c574f784491f +SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 3657ca644fcb7ae81d7bf588f74dbdb74f27580c318a83bcd9c2f33bfa319baf7cb2c44cf4310a288ee9e35a68bc31db0eabdbbe59dbfb9c86fc8fd38d726482 From 768fc509e8867352bd25c0a79fa2c96796ec6a0a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 10 Jun 2022 11:41:33 +0800 Subject: [PATCH 02/41] Update using upstream's new 5.0.17 tarball --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 392e643..19dfe88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.17_dict.tar.xz) = fe2d45ffacef93aa6c7747a30d99923e6ce5fb8c54c9093fc1b3a87606eb4b9a789951110ac33371b191ccdd9e43a2063ab2665946c0c0f447e2c574f784491f -SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 3657ca644fcb7ae81d7bf588f74dbdb74f27580c318a83bcd9c2f33bfa319baf7cb2c44cf4310a288ee9e35a68bc31db0eabdbbe59dbfb9c86fc8fd38d726482 +SHA512 (fcitx5-5.0.17_dict.tar.xz) = 23c112e35c633cd60050f62a169bc51587c95911f28ae08a5446de8569393341020b470e3cadc692c62228bec2f047e0abd6461a30ddadd2ad5fdb0b9176b616 +SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 64f21236f16636d3dd9e6b77d859e179a1560906515e5201539afa0e9a6715bf950d6156ff63de43d7add7c7c59e7ed2c1243cbc3c03f041444b5aee05208940 From b2310946443c1f319ade351fb3b0f736c1f887ab Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 4 Jul 2022 13:03:25 +0800 Subject: [PATCH 03/41] update to upstream release 5.0.18 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3267658..6c32942 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 903dbd7..a2504b0 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.17 +Version: 5.0.18 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 19dfe88..f858c02 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.17_dict.tar.xz) = 23c112e35c633cd60050f62a169bc51587c95911f28ae08a5446de8569393341020b470e3cadc692c62228bec2f047e0abd6461a30ddadd2ad5fdb0b9176b616 -SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 64f21236f16636d3dd9e6b77d859e179a1560906515e5201539afa0e9a6715bf950d6156ff63de43d7add7c7c59e7ed2c1243cbc3c03f041444b5aee05208940 +SHA512 (fcitx5-5.0.18_dict.tar.xz) = a03cd2b8c556fe26470869a624061cc33ac7c6f19be0ba7e01b17c3e7866dee07dc7fed95b2376d670193ed67258abfba8914279ad23507b55312fd48a486be0 +SHA512 (fcitx5-5.0.18_dict.tar.xz.sig) = e4f48699de171e6cc91b81ea5476ee058dd3357166f1e58b1b28b077439d8fcdeadd62d7b418b9134091d9e2e75a752f1abef95218b80026261b2eb236d8b990 From 5363eed9d453a5cfae22574df1b5c14707065c48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:53:54 +0000 Subject: [PATCH 04/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f445ec962926738cfcaa29351601b3019c27c67c Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 28 Aug 2022 19:27:47 +0800 Subject: [PATCH 05/41] add weak dep: fcitx5-configtool (#2122011) --- fcitx5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx5.spec b/fcitx5.spec index a2504b0..248a448 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -54,6 +54,7 @@ Requires(postun): %{_sbindir}/alternatives 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+. From ddac5ae4e1318ebc397bedbc56a55a8e3f98416a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 30 Aug 2022 22:18:19 +0800 Subject: [PATCH 06/41] update to upstream release 5.0.19 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6c32942..62ef824 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 248a448..8c7011e 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.18 +Version: 5.0.19 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index f858c02..7f89b17 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.18_dict.tar.xz) = a03cd2b8c556fe26470869a624061cc33ac7c6f19be0ba7e01b17c3e7866dee07dc7fed95b2376d670193ed67258abfba8914279ad23507b55312fd48a486be0 -SHA512 (fcitx5-5.0.18_dict.tar.xz.sig) = e4f48699de171e6cc91b81ea5476ee058dd3357166f1e58b1b28b077439d8fcdeadd62d7b418b9134091d9e2e75a752f1abef95218b80026261b2eb236d8b990 +SHA512 (fcitx5-5.0.19_dict.tar.xz) = 5bb6386a145b58348503040687ec5589a81e86ae1d5e7aa58edee35972b8bf4d42eecce5344e0a195105914c6c508c97a85d9388b2c4bee4d7d641d3e5792435 +SHA512 (fcitx5-5.0.19_dict.tar.xz.sig) = 99e33aef5c08bb8634ecb73f67bb38d99ecb5ed84902559d0e119f8bb3fc0fe1862f509dd84185fcd096bbf03164e6b60195536b355eec78156e02f09d56ab47 From 70efea538dcaa541631552a8c79dec725c7f4a8a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 21 Nov 2022 11:57:24 +0800 Subject: [PATCH 07/41] update to upstream release 5.0.20 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62ef824..5a8495c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 8c7011e..7ff4652 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.19 +Version: 5.0.20 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 7f89b17..d490ffa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.19_dict.tar.xz) = 5bb6386a145b58348503040687ec5589a81e86ae1d5e7aa58edee35972b8bf4d42eecce5344e0a195105914c6c508c97a85d9388b2c4bee4d7d641d3e5792435 -SHA512 (fcitx5-5.0.19_dict.tar.xz.sig) = 99e33aef5c08bb8634ecb73f67bb38d99ecb5ed84902559d0e119f8bb3fc0fe1862f509dd84185fcd096bbf03164e6b60195536b355eec78156e02f09d56ab47 +SHA512 (fcitx5-5.0.20_dict.tar.xz) = c0fd8f05e8501f46fc133deefc23ecf81a34f1acc28ae7bb9fbd2b947b02a0cb0d91748650793026ec685a83a862d514b0b89e4418bc097b962bae0aea1de551 +SHA512 (fcitx5-5.0.20_dict.tar.xz.sig) = 70c276036cbd3b279fbd1fd15640ae1b67b854d851c71ccb07527914065796ce9db79aaa349221d5a973b0946f7b926bff7ee5af5e4a051bf18e9046f32750a1 From 9ea58df1d8f6c7a32a07b1d5fda0c04dafaa3369 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 25 Nov 2022 18:26:36 +0800 Subject: [PATCH 08/41] update to upstream release 5.0.21 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a8495c..c179afd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 7ff4652..66c7241 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.20 +Version: 5.0.21 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d490ffa..253675d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.20_dict.tar.xz) = c0fd8f05e8501f46fc133deefc23ecf81a34f1acc28ae7bb9fbd2b947b02a0cb0d91748650793026ec685a83a862d514b0b89e4418bc097b962bae0aea1de551 -SHA512 (fcitx5-5.0.20_dict.tar.xz.sig) = 70c276036cbd3b279fbd1fd15640ae1b67b854d851c71ccb07527914065796ce9db79aaa349221d5a973b0946f7b926bff7ee5af5e4a051bf18e9046f32750a1 +SHA512 (fcitx5-5.0.21_dict.tar.xz) = d5396295c11d9b518ac9ea88e680854114a9f84e0a8b82fe49ca91994434646c3f8ab4154d98c6efe0b83cb37f450d63ea49ea74ecc04ea391746340887c3c97 +SHA512 (fcitx5-5.0.21_dict.tar.xz.sig) = 88910c78b22143980e5e5049a4609f8c9db91f0427ddbc93cdcaf9a8bedd80910cd95783c6e29fcc0af6ea14414211b717127b20b6eb5910540dc86f4c848bc3 From cfb09cd4b946b8fd201f7881b111f6edc35a1fe0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:10:35 +0000 Subject: [PATCH 09/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 517288d73aab8f7da7ad4ca32c3b3fd623d0a151 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 12 Mar 2023 10:58:13 +0800 Subject: [PATCH 10/41] update to upstream release 5.0.22 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c179afd..d9aa540 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 66c7241..d584621 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.21 +Version: 5.0.22 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 253675d..d5c42fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.21_dict.tar.xz) = d5396295c11d9b518ac9ea88e680854114a9f84e0a8b82fe49ca91994434646c3f8ab4154d98c6efe0b83cb37f450d63ea49ea74ecc04ea391746340887c3c97 -SHA512 (fcitx5-5.0.21_dict.tar.xz.sig) = 88910c78b22143980e5e5049a4609f8c9db91f0427ddbc93cdcaf9a8bedd80910cd95783c6e29fcc0af6ea14414211b717127b20b6eb5910540dc86f4c848bc3 +SHA512 (fcitx5-5.0.22_dict.tar.xz) = 3574172fbe854b7f88c3c7a82ee92f47fa842725f056ca158665556403007d4bd9c80a2bd27a4df2f5026fdb30803a67130960be39dc0c3f85e36209d42157cc +SHA512 (fcitx5-5.0.22_dict.tar.xz.sig) = 1998e1b5da6f3edc45ec788eec8251dd948cee0d7f493dd9f5a9f098d0b5ac92dd1cbd94398a0069c0a5cce9a364d6ca8844c3403ff2311b9a17fd88a0c46841 From ccf3d355ffa93d4361250e289b220eabec99f8b4 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 18 Mar 2023 15:46:32 +0800 Subject: [PATCH 11/41] update to upstream release 5.0.23 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d9aa540..0a42c81 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index d584621..ccc2818 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.22 +Version: 5.0.23 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d5c42fc..5ae262b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.22_dict.tar.xz) = 3574172fbe854b7f88c3c7a82ee92f47fa842725f056ca158665556403007d4bd9c80a2bd27a4df2f5026fdb30803a67130960be39dc0c3f85e36209d42157cc -SHA512 (fcitx5-5.0.22_dict.tar.xz.sig) = 1998e1b5da6f3edc45ec788eec8251dd948cee0d7f493dd9f5a9f098d0b5ac92dd1cbd94398a0069c0a5cce9a364d6ca8844c3403ff2311b9a17fd88a0c46841 +SHA512 (fcitx5-5.0.23_dict.tar.xz) = 74373328ece36e8cabf2844fc6e28602a0a5494baf188460c353c2bc1ae7d8cf296456c277fb1948cc4a6523307fa44e8b0ab6eb8743ae896fc8d05d47ed5e7c +SHA512 (fcitx5-5.0.23_dict.tar.xz.sig) = 28e58d65a63077e3c9834d7ade6ef71a38700de02978e2db4c4939a3cf6ccbca673061840d6c739dbb205cca171cf203e38d3809bd752571c92c5b9127defb9b From 9a33303823c1ad205c0d95220be0a46f3bb2ad6a Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 11:11:56 +0200 Subject: [PATCH 12/41] Rebuilt due to fmt 10 update. From 58136b4aec528f80ddd47af36b4196b3ef01ea8b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 12:17:38 +0200 Subject: [PATCH 13/41] Added fmt 10 compatibility upstream patch. [skip changelog] --- fcitx5-fmt10-fixes.patch | 26 ++++++++++++++++++++++++++ fcitx5.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 fcitx5-fmt10-fixes.patch diff --git a/fcitx5-fmt10-fixes.patch b/fcitx5-fmt10-fixes.patch new file mode 100644 index 0000000..0e8a339 --- /dev/null +++ b/fcitx5-fmt10-fixes.patch @@ -0,0 +1,26 @@ +From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001 +From: Weng Xuetian +Date: Sat, 20 May 2023 20:02:24 -0700 +Subject: [PATCH] Fix compatiblity with fmt 10.0 + +Fix #797 +--- + src/modules/dbus/dbusmodule.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp +index a7196676..6bebee30 100644 +--- a/src/modules/dbus/dbusmodule.cpp ++++ b/src/modules/dbus/dbusmodule.cpp +@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable { + ss << fmt::format("{:02x}", static_cast(v)); + } + ss << "] program:" << ic->program() +- << " frontend:" << ic->frontend() +- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) ++ << " frontend:" << ic->frontend() << " cap:" ++ << fmt::format("{:x}", ++ static_cast(ic->capabilityFlags())) + << " focus:" << ic->hasFocus() << std::endl; + return true; + }); diff --git a/fcitx5.spec b/fcitx5.spec index ccc2818..f16c468 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -14,6 +14,9 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh +# https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b +Patch100: fcitx5-fmt10-fixes.patch + BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 From d926610c8c8249256ba5989474f34d602ff480eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:24:11 +0000 Subject: [PATCH 14/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0782627a93c5aeed921538f188d22a66461b99ba Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 18 Aug 2023 10:02:37 +0100 Subject: [PATCH 15/41] update to upstream release 5.1.0 --- .gitignore | 2 ++ fcitx5-fmt10-fixes.patch | 26 -------------------------- fcitx5.spec | 5 +---- sources | 4 ++-- 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 fcitx5-fmt10-fixes.patch diff --git a/.gitignore b/.gitignore index 0a42c81..287998e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ results_*/ /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 diff --git a/fcitx5-fmt10-fixes.patch b/fcitx5-fmt10-fixes.patch deleted file mode 100644 index 0e8a339..0000000 --- a/fcitx5-fmt10-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001 -From: Weng Xuetian -Date: Sat, 20 May 2023 20:02:24 -0700 -Subject: [PATCH] Fix compatiblity with fmt 10.0 - -Fix #797 ---- - src/modules/dbus/dbusmodule.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp -index a7196676..6bebee30 100644 ---- a/src/modules/dbus/dbusmodule.cpp -+++ b/src/modules/dbus/dbusmodule.cpp -@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable { - ss << fmt::format("{:02x}", static_cast(v)); - } - ss << "] program:" << ic->program() -- << " frontend:" << ic->frontend() -- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) -+ << " frontend:" << ic->frontend() << " cap:" -+ << fmt::format("{:x}", -+ static_cast(ic->capabilityFlags())) - << " focus:" << ic->hasFocus() << std::endl; - return true; - }); diff --git a/fcitx5.spec b/fcitx5.spec index f16c468..dc2e494 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.23 +Version: 5.1.0 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ @@ -14,9 +14,6 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh -# https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b -Patch100: fcitx5-fmt10-fixes.patch - BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 diff --git a/sources b/sources index 5ae262b..720405d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.23_dict.tar.xz) = 74373328ece36e8cabf2844fc6e28602a0a5494baf188460c353c2bc1ae7d8cf296456c277fb1948cc4a6523307fa44e8b0ab6eb8743ae896fc8d05d47ed5e7c -SHA512 (fcitx5-5.0.23_dict.tar.xz.sig) = 28e58d65a63077e3c9834d7ade6ef71a38700de02978e2db4c4939a3cf6ccbca673061840d6c739dbb205cca171cf203e38d3809bd752571c92c5b9127defb9b +SHA512 (fcitx5-5.1.0_dict.tar.xz) = 11ed97710c0c29ffc0b50d0e2e0f6614ff0f29d259cb19be09fb0bbeb72df288507dd5f7b3f150e1f907a767feae14139d5b34b3b9313bac4908c387a83e33b7 +SHA512 (fcitx5-5.1.0_dict.tar.xz.sig) = a01f3d907271126b33b504866651a7f02636165e019eeab0dd807f56b97cc06892890d18a3472e368577f02fad62e18237be359158517867b2867f5234365649 From d75af4ee2f2e811f996354ac7c219283dbeb3fe3 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 2 Oct 2023 16:39:52 +0100 Subject: [PATCH 16/41] update to upstream release 5.1.1 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 287998e..ccd11a8 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index dc2e494..c92f69a 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.0 +Version: 5.1.1 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 720405d..6b07ee7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.0_dict.tar.xz) = 11ed97710c0c29ffc0b50d0e2e0f6614ff0f29d259cb19be09fb0bbeb72df288507dd5f7b3f150e1f907a767feae14139d5b34b3b9313bac4908c387a83e33b7 -SHA512 (fcitx5-5.1.0_dict.tar.xz.sig) = a01f3d907271126b33b504866651a7f02636165e019eeab0dd807f56b97cc06892890d18a3472e368577f02fad62e18237be359158517867b2867f5234365649 +SHA512 (fcitx5-5.1.1_dict.tar.xz) = 9112cc2f9fb1ef136ce7cb5d098e96b4cf9959f882231408edc9afa3aaa64b1f3b5e0223ead3f16ce385f46c3ec494c42b6fdaa052104be56816ddacd6be682a +SHA512 (fcitx5-5.1.1_dict.tar.xz.sig) = 05564d90f67f72302fb8f0031b6ff499fe0fc156bded291fde16358c9f35187767c1839726a84966507cd9b4e4a5af260822d8f0dfcea8031d986f686e92e47c From cf2d10a5702d362130d7131c204fb2325e7d3d3e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 9 Oct 2023 20:22:21 -0400 Subject: [PATCH 17/41] Use enchant2 enchant-2 is the first choice in the sources, with the deprecated enchant only as a fallback. --- fcitx5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index c92f69a..2c4e59b 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -24,7 +24,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) From 8c6c225cfba461d09a0b886d7aedb14f02f72ebf Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 20 Oct 2023 15:26:26 -0400 Subject: [PATCH 18/41] Separate libs subpackage This prevents fcitx5-qt, which depends on libFcitx5Utils, from pulling in the main and data packages where not needed, such as flatpak runtimes. --- fcitx5.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 2c4e59b..5cc03ba 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -47,6 +47,7 @@ BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: /usr/bin/appstream-util Requires: dbus-common Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives @@ -59,6 +60,13 @@ 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 @@ -72,7 +80,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 @@ -141,11 +149,14 @@ fi %{_bindir}/%{name}-remote %{_bindir}/%{name}-diagnose %{_libdir}/%{name}/ +%{_libexecdir}/fcitx5-wayland-launcher + +%files libs +%license LICENSES/LGPL-2.1-or-later.txt %{_libdir}/libFcitx5*.so.*.* %{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Core.so.7 %{_libdir}/libFcitx5Utils.so.2 -%{_libexecdir}/fcitx5-wayland-launcher %files devel %{_includedir}/Fcitx5/ From 0e22d91419318173c07044f76492e30d619a1185 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 2 Nov 2023 14:01:46 +0000 Subject: [PATCH 19/41] update to upstream release 5.1.2 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ccd11a8..728f529 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 5cc03ba..be7deba 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.1 +Version: 5.1.2 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 6b07ee7..55b2ec7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.1_dict.tar.xz) = 9112cc2f9fb1ef136ce7cb5d098e96b4cf9959f882231408edc9afa3aaa64b1f3b5e0223ead3f16ce385f46c3ec494c42b6fdaa052104be56816ddacd6be682a -SHA512 (fcitx5-5.1.1_dict.tar.xz.sig) = 05564d90f67f72302fb8f0031b6ff499fe0fc156bded291fde16358c9f35187767c1839726a84966507cd9b4e4a5af260822d8f0dfcea8031d986f686e92e47c +SHA512 (fcitx5-5.1.2_dict.tar.xz) = dfe546dbb5a777239b8f221fe7a04638f0272df86f6ec9cfba6a5328e36c2b60890613807e52ef1bda487e3daaba7ac47ed5b81a293d494db0f3f0bab4c231c3 +SHA512 (fcitx5-5.1.2_dict.tar.xz.sig) = 1ba7eca4793b285af9ded742969327032e6db374575e029208c5a3fe03ba7a4cdeb4146f8b169a352eb9d7bf702e5ead0df6e5a927022b08ba3492ea6945aa57 From 62106f33700f98f01516c885ba0c10094ad57954 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 4 Nov 2023 10:35:29 +0000 Subject: [PATCH 20/41] update to upstream release 5.1.3 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 728f529..20d52bb 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index be7deba..1ec4630 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.2 +Version: 5.1.3 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 55b2ec7..9e789bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.2_dict.tar.xz) = dfe546dbb5a777239b8f221fe7a04638f0272df86f6ec9cfba6a5328e36c2b60890613807e52ef1bda487e3daaba7ac47ed5b81a293d494db0f3f0bab4c231c3 -SHA512 (fcitx5-5.1.2_dict.tar.xz.sig) = 1ba7eca4793b285af9ded742969327032e6db374575e029208c5a3fe03ba7a4cdeb4146f8b169a352eb9d7bf702e5ead0df6e5a927022b08ba3492ea6945aa57 +SHA512 (fcitx5-5.1.3_dict.tar.xz) = 9e46e1846c890f17a4133804280ce17f1fba9cb192a77dff854d65b7ee76f79f6192cdd81d5f35ce422f4b6e96ee23d957912c31ef6ed2aaf521a684e41887cf +SHA512 (fcitx5-5.1.3_dict.tar.xz.sig) = 503359e76e97299784b947097449307f01e5371520b49ff98b0ab0f9c3ea23611ce55a9bc4ec61754802db4a7765efeafe996202cd99e6b2226096a633140ff2 From 439c0aad379e2dbe1e6a3a5db45d5f588adb6266 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 6 Nov 2023 08:15:43 +0000 Subject: [PATCH 21/41] update to upstream release 5.1.4 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 20d52bb..3391765 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 1ec4630..4c95f47 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.3 +Version: 5.1.4 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 9e789bf..004970f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.3_dict.tar.xz) = 9e46e1846c890f17a4133804280ce17f1fba9cb192a77dff854d65b7ee76f79f6192cdd81d5f35ce422f4b6e96ee23d957912c31ef6ed2aaf521a684e41887cf -SHA512 (fcitx5-5.1.3_dict.tar.xz.sig) = 503359e76e97299784b947097449307f01e5371520b49ff98b0ab0f9c3ea23611ce55a9bc4ec61754802db4a7765efeafe996202cd99e6b2226096a633140ff2 +SHA512 (fcitx5-5.1.4_dict.tar.xz) = ea0e8e7d05ff3212ba68b403e6b165a8bcc91430b57eb018755dd7061c15e5c7dcc37ba2bfa4d00d4f96e08115fae31534b6b6de738730d1d5934e5ee5e504ca +SHA512 (fcitx5-5.1.4_dict.tar.xz.sig) = cd6bd8d00247be3cb23cccd09963d0255f2075a639c9106504b12bbfbcd417864e4545e7ceaf46ed989bfecf739ba0eb9f17abb1191ad88050495bc1c2a47c51 From f1d9a26ce5b510f5208da8cb057c1fcfe86d0065 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 14 Nov 2023 09:59:58 +0000 Subject: [PATCH 22/41] update to upstream release 5.1.5 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3391765..66338db 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 4c95f47..a34b445 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.4 +Version: 5.1.5 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 004970f..d11d471 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.4_dict.tar.xz) = ea0e8e7d05ff3212ba68b403e6b165a8bcc91430b57eb018755dd7061c15e5c7dcc37ba2bfa4d00d4f96e08115fae31534b6b6de738730d1d5934e5ee5e504ca -SHA512 (fcitx5-5.1.4_dict.tar.xz.sig) = cd6bd8d00247be3cb23cccd09963d0255f2075a639c9106504b12bbfbcd417864e4545e7ceaf46ed989bfecf739ba0eb9f17abb1191ad88050495bc1c2a47c51 +SHA512 (fcitx5-5.1.5_dict.tar.xz) = d4b5400401b9941cf23dcc5682b026a576bfe57f93a8f65e93127aadedde853c3d026105fac893aaf872a7c8418f3a0d9487e42bcc1427e62c7439f7fb0a3a80 +SHA512 (fcitx5-5.1.5_dict.tar.xz.sig) = 6afc8f0a622764a945f09f98865a57afcfa3356ec35c8daec0dcb9d16d3366add09ca8be7ea85fe17423723fd0bef3ad8c8bee126d76f03f10120b49a8405899 From 60d6fc276bdd56740975315b33f6ffe0d2fa088a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 5 Jan 2024 18:34:32 +0800 Subject: [PATCH 23/41] update to upstream release 5.1.6 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 66338db..d974c2f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index a34b445..fd25f21 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.5 +Version: 5.1.6 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d11d471..72e6324 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.5_dict.tar.xz) = d4b5400401b9941cf23dcc5682b026a576bfe57f93a8f65e93127aadedde853c3d026105fac893aaf872a7c8418f3a0d9487e42bcc1427e62c7439f7fb0a3a80 -SHA512 (fcitx5-5.1.5_dict.tar.xz.sig) = 6afc8f0a622764a945f09f98865a57afcfa3356ec35c8daec0dcb9d16d3366add09ca8be7ea85fe17423723fd0bef3ad8c8bee126d76f03f10120b49a8405899 +SHA512 (fcitx5-5.1.6_dict.tar.xz) = 8f10dfb230d4b4c7e559eb77e7a56c17964e404dc12bd3319f7dc715159a289faa1df95a342a0a1723e7d645aba808b967fd10d04ac065de2c49843a7905e7cb +SHA512 (fcitx5-5.1.6_dict.tar.xz.sig) = 87ce2c919768fc94f3723b0accd789a9d2a1094382bc936efc72c88c331320d3e4c5353bdef8efb8bef9756cf73fa6cb53548ec2b336a44af088b58d55c77c84 From ed5fe5f9f67e2ab89cea81a8822fda0452bda178 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 17 Jan 2024 14:35:26 +0000 Subject: [PATCH 24/41] update to upstream release 5.1.7 --- .gitignore | 2 ++ fcitx5.spec | 8 +++++++- sources | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d974c2f..5996120 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index fd25f21..1dff458 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.6 +Version: 5.1.7 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ @@ -115,6 +115,10 @@ desktop-file-install --delete-original \ 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 @@ -150,6 +154,7 @@ fi %{_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 @@ -171,6 +176,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 diff --git a/sources b/sources index 72e6324..f7901f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.6_dict.tar.xz) = 8f10dfb230d4b4c7e559eb77e7a56c17964e404dc12bd3319f7dc715159a289faa1df95a342a0a1723e7d645aba808b967fd10d04ac065de2c49843a7905e7cb -SHA512 (fcitx5-5.1.6_dict.tar.xz.sig) = 87ce2c919768fc94f3723b0accd789a9d2a1094382bc936efc72c88c331320d3e4c5353bdef8efb8bef9756cf73fa6cb53548ec2b336a44af088b58d55c77c84 +SHA512 (fcitx5-5.1.7_dict.tar.xz) = 0bc11065e0c3357471c51bdfa6f752e089a6d361349002e62f4ac952c8a0f1790a27aba195d027b340103eb4a6eef0efec124b8931ac2285e8b1b69ca3487269 +SHA512 (fcitx5-5.1.7_dict.tar.xz.sig) = bd80492c82e1fe6b1aa4fe481d0056cc69a74bd9a45dec378f70a05cde9a928e54e49da51d7aea328b696ab1ac11020483530508497ffe42bb45b7c2b46b7a46 From 8675083ce91aff5ed08af70b0f4b29bb4a4ed4bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 18:59:41 +0000 Subject: [PATCH 25/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 527936b9d29af556879da9c87a7c256abf0b58af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:18:27 +0000 Subject: [PATCH 26/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1a0907a952477ee483253a8e86a3b86adfb81ea3 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 1 Mar 2024 13:58:58 +0800 Subject: [PATCH 27/41] update to upstream release 5.1.8 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5996120..1c7cdfb 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 1dff458..c8b8359 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.7 +Version: 5.1.8 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index f7901f5..d74b1e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.7_dict.tar.xz) = 0bc11065e0c3357471c51bdfa6f752e089a6d361349002e62f4ac952c8a0f1790a27aba195d027b340103eb4a6eef0efec124b8931ac2285e8b1b69ca3487269 -SHA512 (fcitx5-5.1.7_dict.tar.xz.sig) = bd80492c82e1fe6b1aa4fe481d0056cc69a74bd9a45dec378f70a05cde9a928e54e49da51d7aea328b696ab1ac11020483530508497ffe42bb45b7c2b46b7a46 +SHA512 (fcitx5-5.1.8_dict.tar.xz) = 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43 +SHA512 (fcitx5-5.1.8_dict.tar.xz.sig) = 275b68d71e4b6e0ba8225f45a9e61a39c4476a36d92d545b6b350520938b0af388f2ec3562812129e4cbd0949b81ef0f56fea4ed45fbdb06e5ddcc5b714a866f From 6c87a3fa52d26d0e27e18dc2e49abacf4b03101a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 23 Apr 2024 11:07:23 +0100 Subject: [PATCH 28/41] update to upstream release 5.1.9 --- .gitignore | 2 ++ fcitx5.spec | 6 +++--- sources | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1c7cdfb..8b5fff0 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index c8b8359..4293c02 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,13 +2,13 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.8 +Version: 5.1.9 Release: %autorelease Summary: Next generation of fcitx License: 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 diff --git a/sources b/sources index d74b1e9..a81cb88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.8_dict.tar.xz) = 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43 -SHA512 (fcitx5-5.1.8_dict.tar.xz.sig) = 275b68d71e4b6e0ba8225f45a9e61a39c4476a36d92d545b6b350520938b0af388f2ec3562812129e4cbd0949b81ef0f56fea4ed45fbdb06e5ddcc5b714a866f +SHA512 (fcitx5-5.1.9_dict.tar.zst) = 5121ee4225dd7f840f99361336d5b996ce52c8a57107d3c4fa4166f1cca8b1c81f326790fc04782fe9aaf1c664c40325163c386b363d96c2434ab6a8aaa80b81 +SHA512 (fcitx5-5.1.9_dict.tar.zst.sig) = 3cd0fbf4e90c0741225069f9f2b69fbfad3d566d9c53763ac88136169ede4c68736526a63ff38ba33723ad04f8524bd5881d963b69130b7f83fceade04cd1d0f From 7288925efbc879fba30305458f77e188e372893f Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 1 Jun 2024 08:00:52 +0800 Subject: [PATCH 29/41] update to upstream release 5.1.10 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b5fff0..fc93b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ results_*/ /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 diff --git a/fcitx5.spec b/fcitx5.spec index 4293c02..7bf182f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.9 +Version: 5.1.10 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index a81cb88..5b692b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.9_dict.tar.zst) = 5121ee4225dd7f840f99361336d5b996ce52c8a57107d3c4fa4166f1cca8b1c81f326790fc04782fe9aaf1c664c40325163c386b363d96c2434ab6a8aaa80b81 -SHA512 (fcitx5-5.1.9_dict.tar.zst.sig) = 3cd0fbf4e90c0741225069f9f2b69fbfad3d566d9c53763ac88136169ede4c68736526a63ff38ba33723ad04f8524bd5881d963b69130b7f83fceade04cd1d0f +SHA512 (fcitx5-5.1.10_dict.tar.zst) = 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4 +SHA512 (fcitx5-5.1.10_dict.tar.zst.sig) = 0b386a7a52d9687e311a32ca3a6526d29eeef4b892744bf70f0f07b496d98642aaf00ca31f62cde140c7a6d477890e13e5acced738476e49348cf9dd9fcb5789 From d77b9b29c7afcba764225595f41b45635325d8a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:51:37 +0000 Subject: [PATCH 30/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a4a3765a2e6a9ed79738e828a03374fa376ecc38 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Jul 2024 15:58:15 +0800 Subject: [PATCH 31/41] Disable xinput on Wayland (RHBZ#2256267) --- fcitx5-xinput | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx5-xinput b/fcitx5-xinput index 3a00a38..e1ca1a9 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -1,3 +1,4 @@ +IMSETTINGS_IGNORE_SESSION=*-wayland XIM=fcitx5 XIM_PROGRAM=/usr/bin/fcitx5 ICON="fcitx5" 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 32/41] 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 33/41] 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 34/41] 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 35/41] 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 36/41] 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 37/41] 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 38/41] 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 39/41] 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 40/41] 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 41/41] 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