From 4a6656225a84b117772b9c9a516e1bf93e4f25f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:11:42 +0700 Subject: [PATCH 01/13] fcitx5: update to 5.0.9. --- ...d-combinerType-to-signals-and-use-as.patch | 103 ------------------ ...t-introduce-FCITX_DECLARE_SIGNAL_WIT.patch | 44 -------- ...combinerType-in-Signal-data-structur.patch | 76 ------------- srcpkgs/fcitx5/template | 6 +- 4 files changed, 3 insertions(+), 226 deletions(-) delete mode 100644 srcpkgs/fcitx5/patches/0001-SignalAdaptor-add-combinerType-to-signals-and-use-as.patch delete mode 100644 srcpkgs/fcitx5/patches/0002-connectableobject-introduce-FCITX_DECLARE_SIGNAL_WIT.patch delete mode 100644 srcpkgs/fcitx5/patches/0003-CheckUpdate-set-combinerType-in-Signal-data-structur.patch diff --git a/srcpkgs/fcitx5/patches/0001-SignalAdaptor-add-combinerType-to-signals-and-use-as.patch b/srcpkgs/fcitx5/patches/0001-SignalAdaptor-add-combinerType-to-signals-and-use-as.patch deleted file mode 100644 index 53da7203e9dc..000000000000 --- a/srcpkgs/fcitx5/patches/0001-SignalAdaptor-add-combinerType-to-signals-and-use-as.patch +++ /dev/null @@ -1,103 +0,0 @@ -From b9e666587c76386f5f4af38f87c0932af5e9e475 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Wed, 7 Jul 2021 18:28:05 +0700 -Subject: [PATCH 1/5] SignalAdaptor: add combinerType to signals, and use as - default combiner - -As of it's now, we're downcasting from SignalBase to -Signal (which is the same type with -Signal>) in its member functions. - -The downcast is incorrect if its Combiner is NOT LastValue, fcitx5 will -run into undefined behaviours with this kind of casting. - -In my local machine, this result in indeterminated value in -CheckUpdateResult, then fcitx5 will crash because of DBus' assertion. - -When compiling with: -fsanitize=undefined, this problem is being -reported: - -``` -../src/lib/fcitx/../fcitx-utils/connectableobject.h:115:18: runtime error: downcast of address 0x559bd4a2a5b0 which does not point to an object of type 'Signal' -0x559bd4a2a5b0: note: object is of type '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' - 00 00 00 00 40 25 21 2e f7 7f 00 00 e0 f5 a2 d4 9b 55 00 00 20 70 61 67 65 00 00 00 41 00 00 00 - ^~~~~~~~~~~~~~~~~~~~~~~ - vptr for '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' -../src/lib/fcitx/../fcitx-utils/connectableobject.h:116:21: runtime error: member call on address 0x559bd4a2a5b0 which does not point to an object of type 'Signal' -0x559bd4a2a5b0: note: object is of type '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' - 00 00 00 00 40 25 21 2e f7 7f 00 00 e0 f5 a2 d4 9b 55 00 00 20 70 61 67 65 00 00 00 41 00 00 00 - ^~~~~~~~~~~~~~~~~~~~~~~ - vptr for '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' -``` - -As a preparatory step, let's add combinerType into data structure for -Signal, and uses it as default combiner. ---- - src/lib/fcitx-utils/connectableobject.h | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/lib/fcitx-utils/connectableobject.h b/src/lib/fcitx-utils/connectableobject.h -index b145ad3..1b0343d 100644 ---- a/src/lib/fcitx-utils/connectableobject.h -+++ b/src/lib/fcitx-utils/connectableobject.h -@@ -20,10 +20,11 @@ - /// \brief Utilities to enable use object with signal. - - /// \brief Declare signal by type. --#define FCITX_DECLARE_SIGNAL(CLASS_NAME, NAME, ...) \ -- struct NAME { \ -- using signalType = __VA_ARGS__; \ -- using signature = fcitxMakeMetaString(#CLASS_NAME "::" #NAME); \ -+#define FCITX_DECLARE_SIGNAL(CLASS_NAME, NAME, ...) \ -+ struct NAME { \ -+ using signalType = __VA_ARGS__; \ -+ using combinerType = ::fcitx::LastValue::result_type>; \ -+ using signature = fcitxMakeMetaString(#CLASS_NAME "::" #NAME); \ - } - - /// \brief Declare a signal. -@@ -53,8 +54,7 @@ namespace fcitx { - class ConnectableObject; - - /// \brief Helper class to register class. --template ::result_type>> -+template - class SignalAdaptor { - public: - SignalAdaptor(ConnectableObject *d); -@@ -79,7 +79,7 @@ public: - Connection connect(F &&func) { - auto signal = findSignal(SignalType::signature::data()); - if (signal) { -- return static_cast *>( -+ return static_cast *>( - signal) - ->connect(std::forward(func)); - } -@@ -89,7 +89,7 @@ public: - template - void disconnectAll() { - auto signal = findSignal(SignalType::signature::data()); -- static_cast *>(signal) -+ static_cast *>(signal) - ->disconnectAll(); - } - -@@ -112,13 +112,12 @@ protected: - template - auto emit(Args &&...args) const { - auto signal = findSignal(SignalType::signature::data()); -- return (*static_cast *>( -+ return (*static_cast *>( - signal))(std::forward(args)...); - } - - template ::result_type>> -+ typename Combiner = typename SignalType::combinerType> - void registerSignal() { - _registerSignal( - SignalType::signature::data(), diff --git a/srcpkgs/fcitx5/patches/0002-connectableobject-introduce-FCITX_DECLARE_SIGNAL_WIT.patch b/srcpkgs/fcitx5/patches/0002-connectableobject-introduce-FCITX_DECLARE_SIGNAL_WIT.patch deleted file mode 100644 index 255a09d5df23..000000000000 --- a/srcpkgs/fcitx5/patches/0002-connectableobject-introduce-FCITX_DECLARE_SIGNAL_WIT.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7134470f681304d40d1756c31f20013a3911bf33 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Wed, 7 Jul 2021 19:12:54 +0700 -Subject: [PATCH 2/5] connectableobject: introduce - FCITX_DECLARE_SIGNAL_WITH_COMBINER - -In order to correctly downcast SignalBase, in the next step, -we will switch all initialisation of SignalAdaptor to use -SignalType::combinerType. - -Let's introduce a new macro to ease to initialisation of those -signals which employs custom combiner. - -Arguably, the custom combiner is an implementation detail, -thus it'll be put in source files. Hence, the macro is intended -to be used outside of class declaration. ---- - src/lib/fcitx-utils/connectableobject.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/lib/fcitx-utils/connectableobject.h b/src/lib/fcitx-utils/connectableobject.h -index 1b0343d..1c318bf 100644 ---- a/src/lib/fcitx-utils/connectableobject.h -+++ b/src/lib/fcitx-utils/connectableobject.h -@@ -27,6 +27,18 @@ - using signature = fcitxMakeMetaString(#CLASS_NAME "::" #NAME); \ - } - -+/// \brief Declare signal by type with combiner. -+/// -+/// This macro is intended to be used outside of class declaration, -+/// because the custom combiner is an implementation detail, -+/// thus it'll be put in source files. -+#define FCITX_DECLARE_SIGNAL_WITH_COMBINER(CLASS_NAME, NAME, COMBINER, ...) \ -+ struct CLASS_NAME::NAME { \ -+ using signalType = __VA_ARGS__; \ -+ using combinerType = COMBINER; \ -+ using signature = fcitxMakeMetaString(#CLASS_NAME "::" #NAME); \ -+ } -+ - /// \brief Declare a signal. - #define FCITX_DEFINE_SIGNAL(CLASS_NAME, NAME) \ - ::fcitx::SignalAdaptor CLASS_NAME##NAME##Adaptor { this } diff --git a/srcpkgs/fcitx5/patches/0003-CheckUpdate-set-combinerType-in-Signal-data-structur.patch b/srcpkgs/fcitx5/patches/0003-CheckUpdate-set-combinerType-in-Signal-data-structur.patch deleted file mode 100644 index 24d965ab144f..000000000000 --- a/srcpkgs/fcitx5/patches/0003-CheckUpdate-set-combinerType-in-Signal-data-structur.patch +++ /dev/null @@ -1,76 +0,0 @@ -From aeafbe384649f06ef24380167ec3bdb876c44acb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Wed, 7 Jul 2021 18:28:05 +0700 -Subject: [PATCH 3/5] CheckUpdate: set combinerType in Signal data structure to - CheckUpdateResult - -As of it's now, we're downcasting Signal data structure for CheckUpdate -from SignalBase to Signal (which is the same type with -Signal>) in SignalAdaptor member functions. - -The downcast is incorrect because it's Signal -instead, thus fcitx5 will run into undefined behaviours with this downcasting. - -In my local machine, this result in indeterminated value in -CheckUpdateResult, then fcitx5 will crash because of DBus' assertion. - -When compiling with: -fsanitize=undefined, this problem is being -reported: - -``` -../src/lib/fcitx/../fcitx-utils/connectableobject.h:115:18: runtime error: downcast of address 0x559bd4a2a5b0 which does not point to an object of type 'Signal' -0x559bd4a2a5b0: note: object is of type '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' - 00 00 00 00 40 25 21 2e f7 7f 00 00 e0 f5 a2 d4 9b 55 00 00 20 70 61 67 65 00 00 00 41 00 00 00 - ^~~~~~~~~~~~~~~~~~~~~~~ - vptr for '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' -../src/lib/fcitx/../fcitx-utils/connectableobject.h:116:21: runtime error: member call on address 0x559bd4a2a5b0 which does not point to an object of type 'Signal' -0x559bd4a2a5b0: note: object is of type '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' - 00 00 00 00 40 25 21 2e f7 7f 00 00 e0 f5 a2 d4 9b 55 00 00 20 70 61 67 65 00 00 00 41 00 00 00 - ^~~~~~~~~~~~~~~~~~~~~~~ - vptr for '*N5fcitx6SignalIFbvENS_12_GLOBAL__N_117CheckUpdateResultEEE' -``` - -Let's downcast it into correct type by setting CheckUpdateResult as -combinerType. ---- - src/lib/fcitx/instance.cpp | 5 +++-- - src/lib/fcitx/instance.h | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp -index b672383..66bbd51 100644 ---- a/src/lib/fcitx/instance.cpp -+++ b/src/lib/fcitx/instance.cpp -@@ -126,6 +126,8 @@ std::string stripLanguage(const std::string &lc) { - - } // namespace - -+FCITX_DECLARE_SIGNAL_WITH_COMBINER(Instance, CheckUpdate, CheckUpdateResult, bool()); -+ - class CheckInputMethodChanged; - - struct InputState : public InputContextProperty { -@@ -455,8 +457,7 @@ public: - FCITX_DEFINE_SIGNAL_PRIVATE(Instance, CommitFilter); - FCITX_DEFINE_SIGNAL_PRIVATE(Instance, OutputFilter); - FCITX_DEFINE_SIGNAL_PRIVATE(Instance, KeyEventResult); -- FCITX_DEFINE_SIGNAL_PRIVATE_WITH_COMBINER(Instance, CheckUpdate, -- CheckUpdateResult); -+ FCITX_DEFINE_SIGNAL_PRIVATE(Instance, CheckUpdate); - - FactoryFor inputStateFactory_{ - [this](InputContext &ic) { return new InputState(this, &ic); }}; -diff --git a/src/lib/fcitx/instance.h b/src/lib/fcitx/instance.h -index a3355f0..139ff51 100644 ---- a/src/lib/fcitx/instance.h -+++ b/src/lib/fcitx/instance.h -@@ -127,7 +127,7 @@ public: - void(InputContext *inputContext, Text &orig)); - FCITX_DECLARE_SIGNAL(Instance, KeyEventResult, - void(const KeyEvent &keyEvent)); -- FCITX_DECLARE_SIGNAL(Instance, CheckUpdate, bool()); -+ struct CheckUpdate; - - /// Return a focused input context. - InputContext *lastFocusedInputContext(); diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 077b99b54ab6..5aca533806ad 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.0.8 -revision=2 +version=5.0.9 +revision=1 build_style=cmake build_helper=qemu configure_args=" @@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="0ecf6cc763952ff3cbe6bd47d6e40f3f7987a4973547251af3cd1482f33c516f +checksum="703a6bdd82f0c0af2a0e1b3d16ac32d627178bff7a425c1fcf8df48f686e8b5c c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes From 69f0e8126ac8f266382ff96cc85d2c958c50317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:11:48 +0700 Subject: [PATCH 02/13] fcitx5-anthy: update to 5.0.6. --- srcpkgs/fcitx5-anthy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template index 5ec150b4ce75..cdb0e0d5e81d 100644 --- a/srcpkgs/fcitx5-anthy/template +++ b/srcpkgs/fcitx5-anthy/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-anthy' pkgname=fcitx5-anthy -version=5.0.5 +version=5.0.6 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz" -checksum=22364003e737cbe4ea6eaa83d9d274a8df8e38dea61d8f4576560ee7d5eaf44d +checksum=44527eb63d95215424d78d23469c8b45fa6f4f919515bd6de89b249f8d10822e fcitx5-anthy-icons_package() { short_desc+=" - icons" From 494809b8cdf44b28d152873de880e776106c8538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:11:52 +0700 Subject: [PATCH 03/13] fcitx5-chewing: update to 5.0.6. --- srcpkgs/fcitx5-chewing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template index 83dadccc2b3a..d1958d03df1a 100644 --- a/srcpkgs/fcitx5-chewing/template +++ b/srcpkgs/fcitx5-chewing/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chewing' pkgname=fcitx5-chewing -version=5.0.5 +version=5.0.6 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz" -checksum=9c2f208796198daa6c37d9918929f0301792c1611afbc14155ef4dd69d699163 +checksum=e2d719b00b856604f130e015bb654976437dece5d93600991af9836adc0e540f lib32disabled=yes fcitx5-chewing-icons_package() { From cdda94e3aade27a5a59c5b978639a59c3f1de44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:00 +0700 Subject: [PATCH 04/13] fcitx5-chinese-addons: update to 5.0.7. --- srcpkgs/fcitx5-chinese-addons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index e1ba95bd5956..3c875f23ac7a 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons -version=5.0.6 +version=5.0.7 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake @@ -17,7 +17,7 @@ _pystroke_version=20121124 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" -checksum="061e71ef55524e51334ff29e9f93a677b7453f7af48181db0bf3ae851a0ee011 +checksum="b6087e9cddf1d75e7a23ff74e138f19577943a23ed2b4918bbf475d0d5fa2ae7 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" skip_extraction=" From cf4a1e6e242626da8cb7e59b28a9ab7224a7800b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:06 +0700 Subject: [PATCH 05/13] fcitx5-configtool: update to 5.0.6. --- srcpkgs/fcitx5-configtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template index 6f911e21cd49..9477a5ff2d67 100644 --- a/srcpkgs/fcitx5-configtool/template +++ b/srcpkgs/fcitx5-configtool/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-configtool' pkgname=fcitx5-configtool -version=5.0.5 +version=5.0.6 revision=1 build_style=cmake hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" -checksum=11f55a9a564258642f03be1ea3fb92ca64cdf7eab885ce3e6f6ceb8da38d3cb6 +checksum=e5d5c84e36263a2973087074a214de6c9ed7df3f3bddbe4602731405759d4c5c lib32disabled=yes fcitx5-migrator_package() { From 859acf1f6046d78482485838042393eb1f680959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:11 +0700 Subject: [PATCH 06/13] fcitx5-gtk: update to 5.0.8. --- srcpkgs/fcitx5-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template index b94e180a0226..17033d4f54b2 100644 --- a/srcpkgs/fcitx5-gtk/template +++ b/srcpkgs/fcitx5-gtk/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-gtk' pkgname=fcitx5-gtk -version=5.0.7 +version=5.0.8 revision=1 build_style=cmake build_helper=gir @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" -checksum=bb64a6b39c4e1bd3ba1c7b0d0ff53bce434786fe484e7908ed62593896e73d75 +checksum=c133f7a643ba95ebf0a79c9c364041c08e99a156a2303835394cce9a897b428e lib32disabled=yes build_options="gir" From 86335be32170abaf9a8e08b1847786dcfc7bba9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:16 +0700 Subject: [PATCH 07/13] fcitx5-hangul: update to 5.0.4. --- srcpkgs/fcitx5-hangul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template index 0e8116ae535d..12329a30856a 100644 --- a/srcpkgs/fcitx5-hangul/template +++ b/srcpkgs/fcitx5-hangul/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-hangul' pkgname=fcitx5-hangul -version=5.0.3 +version=5.0.4 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz" -checksum=e02d3d59e22a60e65099eaa0e5e394481a770a401c83b9979f754678c100f1e6 +checksum=9d9af72cfea596e862b04aad9a4bab8507df8c8fd4110e6ce7afa2d33b534790 lib32disabled=yes fcitx5-hangul-icons_package() { From 25ef2395668f9f9dbe453c83bf56c4b3b1c5e21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:21 +0700 Subject: [PATCH 08/13] fcitx5-qt: update to 5.0.7. --- srcpkgs/fcitx5-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index 73796e6e8762..6392b4d275c9 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.0.6 +version=5.0.7 revision=1 build_style=cmake configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" -checksum=c954d20bc4e332c0977639dc579bd641a6860926bfd0efe62bc13ee02b43e872 +checksum=33efc353e68a43c80dc4b4eb2846e52ce27adc2f5a9a3feec2d57c1bf49057bf lib32disabled=yes if [ "$XBPS_TARGET_NOATOMIC8" ]; then From 6837c51de29363de09569c83fd23add24a768a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:26 +0700 Subject: [PATCH 09/13] fcitx5-rime: update to 5.0.7. --- srcpkgs/fcitx5-rime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template index 37ba1a1d04fc..3f72384b4e0f 100644 --- a/srcpkgs/fcitx5-rime/template +++ b/srcpkgs/fcitx5-rime/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-rime' pkgname=fcitx5-rime -version=5.0.6 +version=5.0.7 revision=1 build_style=cmake configure_args="-DRIME_DATA_DIR=/usr/share/rime-data" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz" -checksum=46063693645c9ba1bc0a617f8063664b590a0c18f1c3178282d09ba81d178012 +checksum=87acb0c99c978bf42b8ecd2e08fe6df8b170d0e14c39aa693527c40fb6af3848 lib32disabled=yes fcitx5-rime-icons_package() { From 68a8be43c96dfef9fa7bda926926f42b5b3deabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:34 +0700 Subject: [PATCH 10/13] fcitx5-table-extra: update to 5.0.5. --- srcpkgs/fcitx5-table-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template index 5c8aaaf4e213..9d17d5f15661 100644 --- a/srcpkgs/fcitx5-table-extra/template +++ b/srcpkgs/fcitx5-table-extra/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-extra' pkgname=fcitx5-table-extra -version=5.0.4 +version=5.0.5 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz" -checksum=98968b26b0f49d625025d3f03789dd5a542dc95f33ff2ce473f8604ee651188f +checksum=81c6e9ee90d77115fb4e018aaf9bfcfa8bcb4ca9b11048868a755c890c769bd6 From b463b4142e08d3a013de546c8109bdd6fdf80353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:39 +0700 Subject: [PATCH 11/13] fcitx5-zhuyin: update to 5.0.6. --- srcpkgs/fcitx5-zhuyin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template index 530bcec5e495..13b54308b13c 100644 --- a/srcpkgs/fcitx5-zhuyin/template +++ b/srcpkgs/fcitx5-zhuyin/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-zhuyin' pkgname=fcitx5-zhuyin -version=5.0.5 +version=5.0.6 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin" @@ -13,7 +13,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _model_version=20161206 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz" -checksum="982541119a08767a80f750f3c8c365cb90ce76335fc96ce1a0e3268292453dff +checksum="06b380488c4e719e991a774337de2b40e5d552c0fd17116602565cd974fccb8d 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" skip_extraction="model.text.${_model_version}.tar.gz" lib32disabled=yes From 2fd108258039bb08bb2140d145c19c29727c09b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:12:53 +0700 Subject: [PATCH 12/13] libime-jyutping: update to 1.0.3. --- srcpkgs/libime-jyutping/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template index 46a5ad944e88..4513a818fac5 100644 --- a/srcpkgs/libime-jyutping/template +++ b/srcpkgs/libime-jyutping/template @@ -1,6 +1,6 @@ # Template file for 'libime-jyutping' pkgname=libime-jyutping -version=1.0.2 +version=1.0.3 revision=1 build_style=cmake build_helper=qemu @@ -16,7 +16,7 @@ _model_version=20180103 distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz" -checksum="8e948b4d1a1c1586c7e7c2b61e2d4d3d4e83996a791ef685388bed6f681433b3 +checksum="95385988acdb05192cd52034c8f8e53e99e94804e35d09d493b293a9d71f7682 e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071" skip_extraction="jyutping-dict-${_dict_version}.tar.xz From 14814dec45fac15100fc1efafa9987a1fb412637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 30 Sep 2021 17:13:00 +0700 Subject: [PATCH 13/13] libime: update to 1.0.8. --- srcpkgs/libime/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template index 695ba7847c19..b96dd07d5b52 100644 --- a/srcpkgs/libime/template +++ b/srcpkgs/libime/template @@ -1,6 +1,6 @@ # Template file for 'libime' pkgname=libime -version=1.0.7 +version=1.0.8 revision=1 build_style=cmake build_helper=qemu @@ -11,14 +11,14 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" _lm_sc_version=20140820 -_dict_version=20210302 +_dict_version=20210402 distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2 https://download.fcitx-im.org/data/dict.utf8-${_dict_version}.tar.xz https://download.fcitx-im.org/data/table.tar.gz" -checksum="c75bde79842c195b53b88f1c4866e1b84dab376946dc990e05d49de369f5c8b5 +checksum="0755548a197a9766c799c19281276796fc3b11573ba249980f85391e13207eb9 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f - cd43f97749f38e65fc1f706b981a3c1991599770268932dbb11b2ab90c087646 + 818cfbb5a99ae5b40c2707b6158734f4a10196444853400cbd6b14505592d80d 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" skip_extraction=" lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2