这是indexloc提供的服务，不要输入任何密码
Skip to content

bump(main/libxlsxwriter): 1.2.1 #23526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2025
Merged

bump(main/libxlsxwriter): 1.2.1 #23526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feab747
bump(main/libxlsxwriter): 1.2.1
Biswa96 Feb 27, 2025
1156642
rebuild(main/sc-im): Rebuild for libxlsxwriter 1.2.1
Biswa96 Feb 27, 2025
f104483
chore(main/sc-im): Remove upstream patch
Biswa96 Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/libxlsxwriter/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
1 change: 1 addition & 0 deletions packages/sc-im/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions packages/sc-im/src-Makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

10 changes: 0 additions & 10 deletions packages/sc-im/src-formats-ods.c.patch
View file
Open in desktop

This file was deleted.