From 0bf9fe872ffd073bb0df2f6eace266bce0e416ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 24 Jun 2025 09:12:55 +0700 Subject: [PATCH] fcitx5: update to 5.1.14. --- common/shlibs | 4 - srcpkgs/fcitx | 1 + srcpkgs/fcitx-devel | 1 - srcpkgs/fcitx-libpinyin-qt5 | 1 - srcpkgs/fcitx-libpinyin/template | 43 ------ srcpkgs/fcitx-libpinyin/update | 1 - srcpkgs/fcitx/patches/execinfo.patch | 12 -- srcpkgs/fcitx/patches/girpath.patch | 14 -- srcpkgs/fcitx/patches/large-file-inode.patch | 63 --------- srcpkgs/fcitx/template | 134 ------------------- srcpkgs/fcitx5/template | 14 +- srcpkgs/libfcitx | 1 - srcpkgs/libfcitx-gtk | 1 - srcpkgs/libfcitx-gtk3 | 1 - 14 files changed, 12 insertions(+), 279 deletions(-) create mode 120000 srcpkgs/fcitx delete mode 120000 srcpkgs/fcitx-devel delete mode 120000 srcpkgs/fcitx-libpinyin-qt5 delete mode 100644 srcpkgs/fcitx-libpinyin/template delete mode 100644 srcpkgs/fcitx-libpinyin/update delete mode 100644 srcpkgs/fcitx/patches/execinfo.patch delete mode 100644 srcpkgs/fcitx/patches/girpath.patch delete mode 100644 srcpkgs/fcitx/patches/large-file-inode.patch delete mode 100644 srcpkgs/fcitx/template delete mode 120000 srcpkgs/libfcitx delete mode 120000 srcpkgs/libfcitx-gtk delete mode 120000 srcpkgs/libfcitx-gtk3 diff --git a/common/shlibs b/common/shlibs index c65ace14596..321498a4eac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2256,10 +2256,6 @@ libpgf.so.6 libpgf-6.14.12_1 libqhull_r.so.8.0 libqhull-2020.2_1 libqhull.so.8.0 libqhull-2020.2_1 libKF5NetworkManagerQt.so.6 networkmanager-qt5-5.26.0_1 -libfcitx-core.so.0 libfcitx-4.2.8_1 -libfcitx-gclient.so.1 libfcitx-4.2.9.5_1 -libfcitx-utils.so.0 libfcitx-4.2.8_1 -libfcitx-config.so.4 libfcitx-4.2.8_1 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 diff --git a/srcpkgs/fcitx b/srcpkgs/fcitx new file mode 120000 index 00000000000..99ac64afc61 --- /dev/null +++ b/srcpkgs/fcitx @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file diff --git a/srcpkgs/fcitx-devel b/srcpkgs/fcitx-devel deleted file mode 120000 index 421114c67a2..00000000000 --- a/srcpkgs/fcitx-devel +++ /dev/null @@ -1 +0,0 @@ -fcitx \ No newline at end of file diff --git a/srcpkgs/fcitx-libpinyin-qt5 b/srcpkgs/fcitx-libpinyin-qt5 deleted file mode 120000 index d697424a8c9..00000000000 --- a/srcpkgs/fcitx-libpinyin-qt5 +++ /dev/null @@ -1 +0,0 @@ -fcitx-libpinyin \ No newline at end of file diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template deleted file mode 100644 index 1921145d129..00000000000 --- a/srcpkgs/fcitx-libpinyin/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'fcitx-libpinyin' -pkgname=fcitx-libpinyin -_mversion=20161206 -version=0.5.4 -revision=2 -build_style=cmake -configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF" -hostmakedepends="pkg-config fcitx libpinyin gettext" -makedepends="libpinyin-devel fcitx-devel" -depends="fcitx" -short_desc="Fcitx wrapper for libpinyin" -maintainer="Đoàn Trần Công Danh " -license="GPL-2.0-or-later" -homepage="https://github.com/fcitx/fcitx-libpinyin" -distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}.tar.xz - https://download.fcitx-im.org/data/model.text.$_mversion.tar.gz" -checksum="650a846f59a50af5e0ce2e493957885bac59995784bb4e211bf8ad1a83607af3 - 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" -skip_extraction=model.text.$_mversion.tar.gz - -if [ "$XBPS_WORDSIZE$XBPS_TARGET_ENDIAN" = "${XBPS_TARGET_WORDSIZE}le" ] -then - configure_args+=" -DENABLE_QT=ON" - hostmakedepends+=" qt5-devel" - makedepends+=" libfcitx-qt5-devel qt5-webengine-devel - qt5-declarative-devel qt5-webchannel-devel qt5-location-devel" -else - # Non empty to forbid xbps-src from generating subpackages - # Other developers argue that conditional define _package is bad. - subpackages=" " -fi - -post_extract() { - cp $XBPS_SRCDISTDIR/$pkgname-$version/model.text.$_mversion.tar.gz data -} - -fcitx-libpinyin-qt5_package() { - short_desc+=" - Qt5 IM module" - depends="fcitx-libpinyin-${version}_${revision}" - pkg_install() { - vmove usr/lib/fcitx/qt - } -} diff --git a/srcpkgs/fcitx-libpinyin/update b/srcpkgs/fcitx-libpinyin/update deleted file mode 100644 index b967599145e..00000000000 --- a/srcpkgs/fcitx-libpinyin/update +++ /dev/null @@ -1 +0,0 @@ -pattern='fcitx-libpinyin-\K[\d.]+(?=_dict)' diff --git a/srcpkgs/fcitx/patches/execinfo.patch b/srcpkgs/fcitx/patches/execinfo.patch deleted file mode 100644 index 1b7d9838e21..00000000000 --- a/srcpkgs/fcitx/patches/execinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/CMakeLists.txt 2017-12-02 13:38:52.784843265 +0100 -+++ b/src/CMakeLists.txt 2017-12-02 13:39:15.028841808 +0100 -@@ -1,6 +1,8 @@ - include_directories(${LIBINTL_INCLUDE_DIR}) - include_directories(${LIBICONV_INCLUDE_DIR}) --include_directories(${LIBEXECINFO_INCLUDE_DIR}) -+if(ENABLE_BACKTRACE) -+ include_directories(${LIBEXECINFO_INCLUDE_DIR}) -+endif() - include_directories(${DL_INCLUDE_DIR}) - include_directories(${PTHREAD_INCLUDE_DIR}) - diff --git a/srcpkgs/fcitx/patches/girpath.patch b/srcpkgs/fcitx/patches/girpath.patch deleted file mode 100644 index dd50600ebf8..00000000000 --- a/srcpkgs/fcitx/patches/girpath.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git src/lib/fcitx-gclient/CMakeLists.txt src/lib/fcitx-gclient/CMakeLists.txt -index ea1d50f..20b2359 100644 ---- a/src/lib/fcitx-gclient/CMakeLists.txt -+++ b/src/lib/fcitx-gclient/CMakeLists.txt -@@ -65,6 +65,8 @@ install(FILES ${FCITX_GCLIENT_HEADERS} - - if(ENABLE_GIR) - include(GObjectIntrospection) -+ string(REPLACE "///" "/" GOBJECT_INTROSPECTION_GIRDIR "${GOBJECT_INTROSPECTION_GIRDIR}") -+ string(REPLACE "///" "/" GOBJECT_INTROSPECTION_TYPELIBDIR "${GOBJECT_INTROSPECTION_TYPELIBDIR}") - gobject_introspection( - FILENAME Fcitx-1.0.gir - NSVERSION 1.0 - diff --git a/srcpkgs/fcitx/patches/large-file-inode.patch b/srcpkgs/fcitx/patches/large-file-inode.patch deleted file mode 100644 index 38c048a5b5a..00000000000 --- a/srcpkgs/fcitx/patches/large-file-inode.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/src/im/pinyin/py.c b/src/im/pinyin/py.c -index e0028854..c45c8b4d 100644 ---- a/src/im/pinyin/py.c -+++ b/src/im/pinyin/py.c -@@ -19,6 +19,7 @@ - ***************************************************************************/ - #include "config.h" - -+#define _FILE_OFFSET_BITS 64 - #include - #include - #include -diff --git a/src/lib/fcitx-config/xdg.c b/src/lib/fcitx-config/xdg.c -index 1559e7bb..cdfbae91 100644 ---- a/src/lib/fcitx-config/xdg.c -+++ b/src/lib/fcitx-config/xdg.c -@@ -27,7 +27,7 @@ - */ - - #define FCITX_CONFIG_XDG_DEPRECATED -- -+#define _FILE_OFFSET_BITS 64 - #include "config.h" - - #include -diff --git a/src/lib/fcitx-utils/utils.h b/src/lib/fcitx-utils/utils.h -index 0d6bf309..a930ced1 100644 ---- a/src/lib/fcitx-utils/utils.h -+++ b/src/lib/fcitx-utils/utils.h -@@ -60,6 +60,7 @@ - #ifndef _FCITX_UTILS_H_ - #define _FCITX_UTILS_H_ - -+#define _FILE_OFFSET_BITS 64 - #include - #include - #include -diff --git a/src/module/spell/dict/comp_spell_dict.c b/src/module/spell/dict/comp_spell_dict.c -index 707226dd..4b8eb2a8 100644 ---- a/src/module/spell/dict/comp_spell_dict.c -+++ b/src/module/spell/dict/comp_spell_dict.c -@@ -17,7 +17,7 @@ - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -- -+#define _FILE_OFFSET_BITS 64 - #include "fcitx-utils/log.h" - #include - #include -diff --git a/src/module/spell/spell-custom-dict.c b/src/module/spell/spell-custom-dict.c -index 93b96266..5a45984b 100644 ---- a/src/module/spell/spell-custom-dict.c -+++ b/src/module/spell/spell-custom-dict.c -@@ -17,7 +17,7 @@ - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -- -+#define _FILE_OFFSET_BITS 64 - #include "fcitx/fcitx.h" - #include "config.h" - diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template deleted file mode 100644 index e4443bdd799..00000000000 --- a/srcpkgs/fcitx/template +++ /dev/null @@ -1,134 +0,0 @@ -# Template file for 'fcitx' -pkgname=fcitx -version=4.2.9.9 -revision=3 -build_style=cmake -build_helper=gir -configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF - -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF - -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF) - -DENCHANT_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/enchant-2/ - -DENCHANT_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libenchant-2.so" -hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel" -makedepends="iso-codes gettext-devel enchant2-devel libxml2-devel - json-c-devel opencc-devel - libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel" -depends="fcitx5 fcitx5-chinese-addons" -short_desc="Flexible Context-aware Input Tool with eXtension" -maintainer="Đoàn Trần Công Danh " -license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" -homepage="https://fcitx-im.org/" -_en_dict=20121020 -_pytable=20121124 -_pystroke=20121124 -distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}.tar.xz - https://download.fcitx-im.org/data/en_dict-${_en_dict}.tar.gz - http://download.fcitx-im.org/data/py_table-${_pytable}.tar.gz - http://download.fcitx-im.org/data/py_stroke-${_pystroke}.tar.gz - http://download.fcitx-im.org/data/pinyin.tar.gz - http://download.fcitx-im.org/data/table.tar.gz - " -checksum="307bddeabbec383eb27c4ea222d9f71d8d9011d7942f4010368e5bc3ca7440a1 - c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb - 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 - 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 - 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 - 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" -skip_extraction=" - en_dict-${_en_dict}.tar.gz - py_table-${_pytable}.tar.gz - py_stroke-${_pystroke}.tar.gz - pinyin.tar.gz - table.tar.gz" -lib32disabled=yes - -# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel -case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" -DENABLE_BACKTRACE=OFF";; -esac - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" fcitx" -fi - -build_options="gir" -build_options_default="gir" - -post_extract() { - local _src="$XBPS_SRCDISTDIR/fcitx-$version" - cp "$_src/en_dict-${_en_dict}.tar.gz" src/module/spell/dict - cp "$_src/py_table-${_pytable}.tar.gz" \ - "$_src/py_stroke-${_pystroke}.tar.gz" \ - src/module/pinyin-enhance/data - cp "$_src/pinyin.tar.gz" src/im/pinyin/data - cp "$_src/table.tar.gz" src/im/table/data -} - -pre_configure() { - # include FcitxMacro.cmake without invoking fcitx4-config - vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \ - cmake/FcitxConfig.cmake - - if [ "$CROSS_BUILD" ]; then - # use host binaries - vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/dev;/usr/lib/fcitx/libexec;' \ - cmake/FcitxMacro.cmake - vsed -i -e 's;${PROJECT_BINARY_DIR}/src/module/spell/dict;/usr/lib/fcitx/libexec;' \ - src/module/spell/dict/CMakeLists.txt - vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/cli;/usr/bin;' \ - src/im/pinyin/data/CMakeLists.txt \ - src/im/table/data/CMakeLists.txt - fi -} - -pre_build() { - LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils" -} - -post_install() { - find $DESTDIR/usr/share/icons -depth \ - -name 'fcitx-kbd.*' -prune -o \ - -name 'fcitx-vk-active.*' -prune -o \ - -name 'fcitx-vk-inactive.*' -prune -o \ - -type f -delete -} - -libfcitx_package() { - short_desc+=" - shared libraries" - pkg_install() { - vmove "usr/lib/*.so.*" - vmove "usr/lib/fcitx/fcitx-*.so" - vmove usr/lib/fcitx/libexec - if [ "$build_option_gir" ]; then - vmove usr/lib/girepository-1.0 - fi - vlicense COPYING.LIBS - vlicense COPYING.MIT - } -} -fcitx-devel_package() { - depends="libfcitx>=${version}_${revision} glib-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/fcitx4-config - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/cmake - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - } -} -libfcitx-gtk_package() { - short_desc+=" - GTK2 IM module" - pkg_install() { - vmove usr/lib/gtk-2.0 - } -} -libfcitx-gtk3_package() { - short_desc+=" - GTK3 IM module" - pkg_install() { - vmove usr/lib/gtk-3.0 - } -} diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 7b8a67fa345..4b856133895 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.1.11 +version=5.1.14 revision=1 build_style=cmake build_helper=qemu @@ -20,10 +20,12 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.zst https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="4b5eb21d4746fe9e006a2db3b583a920ae7105cae6d029a7b6e911ca1af5dce1 +checksum="8b37dacc0a30789d56c98f27af388cb7188d783d044f59a638a230a93f8a5541 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" -replaces="fcitx5-icons>=0" +replaces="fcitx5-icons>=0 fcitx-libpinyin>=0 fcitx-libpinyin-qt5>=0 + libfcitx>=0 fcitx>=0 fcitx-devel>=0" +provides="fcitx-libpinyin-5_1 fcitx-5_1 libfcitx-5_1" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes CXXFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" @@ -62,3 +64,9 @@ libfcitx5-devel_package() { vmove "usr/lib/fcitx5/libtest*" } } + +fcitx_package() { + metapackage=yes + depends="${sourcepkg}" + short_desc+=" - transition" +} diff --git a/srcpkgs/libfcitx b/srcpkgs/libfcitx deleted file mode 120000 index 421114c67a2..00000000000 --- a/srcpkgs/libfcitx +++ /dev/null @@ -1 +0,0 @@ -fcitx \ No newline at end of file diff --git a/srcpkgs/libfcitx-gtk b/srcpkgs/libfcitx-gtk deleted file mode 120000 index 421114c67a2..00000000000 --- a/srcpkgs/libfcitx-gtk +++ /dev/null @@ -1 +0,0 @@ -fcitx \ No newline at end of file diff --git a/srcpkgs/libfcitx-gtk3 b/srcpkgs/libfcitx-gtk3 deleted file mode 120000 index 421114c67a2..00000000000 --- a/srcpkgs/libfcitx-gtk3 +++ /dev/null @@ -1 +0,0 @@ -fcitx \ No newline at end of file