From 207a2e75bbf312898a59353719f7bec65254de73 Mon Sep 17 00:00:00 2001 From: CToID Date: Sat, 9 May 2026 14:26:20 +0800 Subject: [PATCH] libchewing: update to 0.12.0. --- common/shlibs | 2 +- srcpkgs/libchewing/patches/cross-build.patch | 13 ++++++++ .../libchewing/patches/cross-compile.patch | 23 -------------- srcpkgs/libchewing/template | 30 ++++++++++++------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 srcpkgs/libchewing/patches/cross-build.patch delete mode 100644 srcpkgs/libchewing/patches/cross-compile.patch diff --git a/common/shlibs b/common/shlibs index 31880660c9c2c7..0ff29ffef3d851 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3715,7 +3715,7 @@ libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1 libgedit-gtksourceview-300.so.5 libgedit-gtksourceview-299.7.0_1 libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1 libgedit-tepl-6.so.4 libgedit-tepl-6.14.0_1 -libchewing.so.3 libchewing-0.5.1_1 +libchewing.so.3 libchewing-0.12.0_1 libdwarves.so.1 pahole-1.12_1 libdwarves_emit.so.1 pahole-1.12_1 libdwarves_reorganize.so.1 pahole-1.12_1 diff --git a/srcpkgs/libchewing/patches/cross-build.patch b/srcpkgs/libchewing/patches/cross-build.patch new file mode 100644 index 00000000000000..5ac000664a0239 --- /dev/null +++ b/srcpkgs/libchewing/patches/cross-build.patch @@ -0,0 +1,13 @@ +diff --git a/data/dict/chewing/CMakeLists.txt b/data/dict/chewing/CMakeLists.txt +index 3d42fe3..4e87f10 100644 +--- a/data/dict/chewing/CMakeLists.txt ++++ b/data/dict/chewing/CMakeLists.txt +@@ -5,7 +5,7 @@ foreach(TARGET ${TARGETS}) + string(REPLACE "dat" "csv" SRC ${TARGET}) + add_custom_command( + OUTPUT ${TARGET} +- COMMAND ${CHEWING_CLI} init --csv ${CMAKE_CURRENT_SOURCE_DIR}/${SRC} ${TARGET} ++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CHEWING_CLI} init --csv ${CMAKE_CURRENT_SOURCE_DIR}/${SRC} ${TARGET} + DEPENDS ${SRC} + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET} DESTINATION ${CMAKE_INSTALL_DATADIR}/libchewing) diff --git a/srcpkgs/libchewing/patches/cross-compile.patch b/srcpkgs/libchewing/patches/cross-compile.patch deleted file mode 100644 index d127a83589f793..00000000000000 --- a/srcpkgs/libchewing/patches/cross-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07112b0..597a764 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -229,15 +229,16 @@ set_target_properties(${ALL_TOOLS} PROPERTIES - ) - - # tools command -+file(MAKE_DIRECTORY ${DATA_BIN_DIR}) - add_custom_command( - OUTPUT - ${ALL_DATA} -- COMMAND ${CMAKE_COMMAND} -E make_directory ${DATA_BIN_DIR} -- COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_BIN_DIR} ${TOOLS_BIN_DIR}/init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src -+ COMMAND init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src - DEPENDS - ${ALL_TOOLS} - ${DATA_SRC_DIR}/phone.cin - ${DATA_SRC_DIR}/tsi.src -+ WORKING_DIRECTORY ${DATA_BIN_DIR} - ) - - # test diff --git a/srcpkgs/libchewing/template b/srcpkgs/libchewing/template index 9345a70fe6ff74..94dd60c1f6bc71 100644 --- a/srcpkgs/libchewing/template +++ b/srcpkgs/libchewing/template @@ -1,18 +1,29 @@ # Template file for 'libchewing' pkgname=libchewing -version=0.5.1 -revision=5 +version=0.12.0 +revision=1 +_data_version=2026.3.22 build_style=cmake -build_helper="qemu" -hostmakedepends="texinfo" -makedepends="sqlite-devel" +build_helper=qemu +hostmakedepends="corrosion cargo" +makedepends="sqlite-devel rust-std" short_desc="Intelligent phonetic (Zhuyin/Bopomofo) input method" maintainer="Robert Stancil " license="LGPL-2.1-only" homepage="http://chewing.im/" -distfiles="https://github.com/chewing/libchewing/releases/download/v${version}/${pkgname}-${version}.tar.bz2" -checksum=9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b -replaces="libchewing-data>=0" +changelog="https://codeberg.org/chewing/libchewing/raw/branch/master/NEWS" +distfiles="https://codeberg.org/chewing/libchewing/archive/v${version}.tar.gz + https://codeberg.org/chewing/libchewing-data/archive/v${_data_version}.tar.gz +" +checksum="151764f5448f0c9d4206c2d6f947e819d3517b692a3dafb88fc5fecd90ce9ec0 + 6bc29a7cb79eb1c68f3a42209c26b5b86aa6bbad71e71bc3091d27a7f4ddc6a3 +" + +skip_extraction="v${_data_version}.tar.gz" + +post_extract() { + vsrcextract -C data v${_data_version}.tar.gz +} libchewing-devel_package() { depends="libchewing>=${version}_${revision}" @@ -20,8 +31,7 @@ libchewing-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" + vmove usr/lib/cmake vmove "usr/lib/*.so" - vmove usr/share/info } }