From b43870cb9e57d4ff34e30174a1ecfe29f3123e18 Mon Sep 17 00:00:00 2001 From: Ronald Y Date: Thu, 19 Sep 2024 21:11:11 +0800 Subject: [PATCH] libpaper: remove _NL_PAPER_{WIDTH,HEIGHT} --- packages/libpaper/0001-disable-NL_PAPER.patch | 13 +++++++++++++ packages/libpaper/build.sh | 6 +----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 packages/libpaper/0001-disable-NL_PAPER.patch diff --git a/packages/libpaper/0001-disable-NL_PAPER.patch b/packages/libpaper/0001-disable-NL_PAPER.patch new file mode 100644 index 00000000000000..2b62ad6a88e240 --- /dev/null +++ b/packages/libpaper/0001-disable-NL_PAPER.patch @@ -0,0 +1,13 @@ +diff --git a/lib/libpaper.c.in.in b/lib/libpaper.c.in.in +index 9294f3f..d6e9f77 100644 +--- a/lib/libpaper.c.in.in ++++ b/lib/libpaper.c.in.in +@@ -316,7 +316,7 @@ _GL_ATTRIBUTE_PURE const struct paper *paperwithsize(double pswidth, double pshe + + /* Get locale default paper size. */ + static const char *localepapername(void) { +-#if defined LC_PAPER && defined _GNU_SOURCE ++#if defined LC_PAPER && defined _GNU_SOURCE && !defined(__ANDROID__) + if (setlocale(LC_PAPER, "") != NULL) { + #define NL_PAPER_GET(x) \ + ((union { char *string; unsigned word; })nl_langinfo(x)).word diff --git a/packages/libpaper/build.sh b/packages/libpaper/build.sh index 2f9b7b5e1d1bbb..e05030b5c514c7 100644 --- a/packages/libpaper/build.sh +++ b/packages/libpaper/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for handling paper characteristics (by @rrthomas TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.2.5" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/rrthomas/libpaper/releases/download/v${TERMUX_PKG_VERSION}/libpaper-${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=7be50974ce0df0c74e7587f10b04272cd53fd675cb6a1273ae1cc5c9cc9cab09 TERMUX_PKG_AUTO_UPDATE=true @@ -24,11 +25,6 @@ termux_step_post_get_source() { } -termux_step_pre_configure() { - # 210x297 (in mm) is A4 size. Use as default to be provided by locale. - CFLAGS+=" -D_NL_PAPER_WIDTH=210 -D_NL_PAPER_HEIGHT=297" -} - termux_step_create_debscripts() { cat <<-EOF >./postinst #!${TERMUX_PREFIX}/bin/sh