From 420306e9e9ce9addaaa4b06d89a27efc7823706e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 24 Nov 2022 02:30:30 +0900 Subject: [PATCH] units: Bump to 2.22 --- packages/units/build.sh | 9 ++++++--- packages/units/units-cur.subpackage.sh | 16 ++++++++++++++++ packages/units/units.c.patch | 11 +++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 packages/units/units-cur.subpackage.sh create mode 100644 packages/units/units.c.patch diff --git a/packages/units/build.sh b/packages/units/build.sh index 8197555dc5..1c0dbb5b0c 100644 --- a/packages/units/build.sh +++ b/packages/units/build.sh @@ -1,9 +1,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/units/ TERMUX_PKG_DESCRIPTION="Converts between different systems of units" -TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.21 +TERMUX_PKG_VERSION=2.22 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=6c3e80a9f980589fd962a5852a2674642257db1c5fd5b27c4d9e664f3486cbaf +TERMUX_PKG_SHA256=5d13e1207721fe7726d906ba1d92dc0eddaa9fc26759ed22e3b8d1a793125848 TERMUX_PKG_DEPENDS="readline, libandroid-support" TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--sharedstatedir=$TERMUX_PREFIX/var/lib +" diff --git a/packages/units/units-cur.subpackage.sh b/packages/units/units-cur.subpackage.sh new file mode 100644 index 0000000000..96f53e394c --- /dev/null +++ b/packages/units/units-cur.subpackage.sh @@ -0,0 +1,16 @@ +TERMUX_SUBPKG_DESCRIPTION="units_cur Python script" +TERMUX_SUBPKG_INCLUDE=" +bin/units_cur +" +TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true +TERMUX_SUBPKG_DEPENDS="python" +TERMUX_SUBPKG_BREAKS="units (<< 2.22)" +TERMUX_SUBPKG_REPLACES="units (<< 2.22)" + +termux_step_create_subpkg_debscripts() { + cat <<- EOF > ./postinst + #!$TERMUX_PREFIX/bin/sh + echo "Installing dependencies through pip..." + pip3 install requests + EOF +} diff --git a/packages/units/units.c.patch b/packages/units/units.c.patch new file mode 100644 index 0000000000..4deb9603b9 --- /dev/null +++ b/packages/units/units.c.patch @@ -0,0 +1,11 @@ +--- a/units.c ++++ b/units.c +@@ -130,7 +130,7 @@ + #ifdef _WIN32 + # define DEFAULTPAGER "more" /* Default pager for Windows */ + #else +-# define DEFAULTPAGER "/usr/bin/pager" /* Default pager for Unix */ ++# define DEFAULTPAGER "@TERMUX_PREFIX@/bin/less" /* Default pager for Unix */ + #endif + #define DEFAULTLOCALE "en_US" /* Default locale */ + #define MAXINCLUDE 5 /* Max depth of include files */