From feab747485f0872da224068aefa8e32aeee009ae Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 27 Feb 2025 05:40:17 +0000 Subject: [PATCH 1/3] bump(main/libxlsxwriter): 1.2.1 --- packages/libxlsxwriter/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/libxlsxwriter/build.sh b/packages/libxlsxwriter/build.sh index 14b6bce8ab686e..20dda28ebf3ad4 100644 --- a/packages/libxlsxwriter/build.sh +++ b/packages/libxlsxwriter/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A C library for creating Excel XLSX files" TERMUX_PKG_LICENSE="BSD 2-Clause, BSD 3-Clause, ZLIB, MPL-2.0, MIT, Public Domain" TERMUX_PKG_LICENSE_FILE="License.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.2.0" +TERMUX_PKG_VERSION="1.2.1" TERMUX_PKG_SRCURL=https://github.com/jmcnamara/libxlsxwriter/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=242821862d5841e68ce9b0d7c774cd3b2c9136bb684a2b0c26cea9447cc31ff3 +TERMUX_PKG_SHA256=f3a43fb6b4dab2d65bcbce56088f58c94a8ae7fb5746106c069d77ef87794a24 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+" TERMUX_PKG_DEPENDS="libminizip" @@ -17,11 +17,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_post_get_source() { # Do not forget to bump revision of reverse dependencies and rebuild them # after SOVERSION is changed. - local _SOVERSION=7 + local _SOVERSION=8 local v=$(sed -En 's/.*LXW_SOVERSION .*"(.*)".*/\1/p' \ include/xlsxwriter.h) if [ "${v}" != "${_SOVERSION}" ]; then - termux_error_exit "SOVERSION guard check failed." + termux_error_exit "SOVERSION guard check failed. Expected ${_SOVERSION}, got ${v}." fi } From 11566425357840f06d2fe94f6800fcbdf161acca Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 27 Feb 2025 05:40:23 +0000 Subject: [PATCH 2/3] rebuild(main/sc-im): Rebuild for libxlsxwriter 1.2.1 --- packages/sc-im/build.sh | 1 + packages/sc-im/src-Makefile.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/sc-im/src-Makefile.patch diff --git a/packages/sc-im/build.sh b/packages/sc-im/build.sh index ce0a8902470906..16d37f435cd382 100644 --- a/packages/sc-im/build.sh +++ b/packages/sc-im/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="An improved version of sc, a spreadsheet calculator" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.8.4" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/andmarti1424/sc-im/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ebb1f10006fe49f964a356494f96d86a4f06eb018659e3b9bde63b25c03abdf0 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/sc-im/src-Makefile.patch b/packages/sc-im/src-Makefile.patch new file mode 100644 index 00000000000000..41600d85096851 --- /dev/null +++ b/packages/sc-im/src-Makefile.patch @@ -0,0 +1,18 @@ +This excludes minizip include directory to prevent conflict with libzip. +Otherwise, zip_stat and other symbols are not found in minizip/zip.h. +Those are present in libzip/zip.h. + +https://github.com/jmcnamara/libxlsxwriter/commit/3a975c6b897e4913b088170a20027055df53d532 +commit added the minizip in xlsxwriter.pc pkgconfig file. + +--- a/src/Makefile ++++ b/src/Makefile +@@ -126,7 +126,7 @@ ifneq (, $(shell which pkg-config)) + + # NOTE: libxlsxwriter is required for xlsx file export support + ifneq ($(shell pkg-config --exists xlsxwriter || echo 'no'),no) +- CFLAGS += -DXLSX_EXPORT $(shell pkg-config --cflags xlsxwriter) ++ CFLAGS += -DXLSX_EXPORT $(shell pkg-config --cflags-only-other xlsxwriter) + LDLIBS += $(shell pkg-config --libs xlsxwriter) + endif + From f10448385e4096a03e272824f7a026ae5f410ced Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 27 Feb 2025 05:40:29 +0000 Subject: [PATCH 3/3] chore(main/sc-im): Remove upstream patch The patch was added in https://github.com/andmarti1424/sc-im/commit/b6fcd0658d566dac0fa0b7e83235c8721877d7a0 commit. --- packages/sc-im/src-formats-ods.c.patch | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 packages/sc-im/src-formats-ods.c.patch diff --git a/packages/sc-im/src-formats-ods.c.patch b/packages/sc-im/src-formats-ods.c.patch deleted file mode 100644 index 31291b795b949e..00000000000000 --- a/packages/sc-im/src-formats-ods.c.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/formats/ods.c -+++ b/src/formats/ods.c -@@ -48,6 +48,7 @@ - - #ifdef ODS - #include -+#include - #include - #include -