From 657df17c362e5493c16f144c6c7e02c903c23efa Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 27 Apr 2023 16:45:45 +0900 Subject: [PATCH] perl: Bump to 5.36.1 --- packages/irssi/build.sh | 1 + packages/libapt-pkg-perl/build.sh | 2 +- packages/libregexp-assemble-perl/build.sh | 2 +- packages/perl/build.sh | 9 +++-- packages/perl/cnf-clang16.patch | 40 ++++++++++++++++------- packages/perl/cnf-configure_func.sh.patch | 16 +++++---- packages/psutils/build.sh | 1 + packages/subversion/build.sh | 2 +- 8 files changed, 47 insertions(+), 26 deletions(-) diff --git a/packages/irssi/build.sh b/packages/irssi/build.sh index 4d00dba238..89ec2a9d84 100644 --- a/packages/irssi/build.sh +++ b/packages/irssi/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Terminal based IRC client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.4.4" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libapt-pkg-perl/build.sh b/packages/libapt-pkg-perl/build.sh index 5bb68798f6..860978ca1b 100644 --- a/packages/libapt-pkg-perl/build.sh +++ b/packages/libapt-pkg-perl/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Perl interface to APT's libapt-pkg" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.1.40 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=http://deb.debian.org/debian/pool/main/liba/libapt-pkg-perl/libapt-pkg-perl_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=524d2ef77f3d6896c50e7674022d85e4a391a6a2b3c65ba5e50ac671fa7ce4a1 TERMUX_PKG_DEPENDS="apt, libc++, perl" diff --git a/packages/libregexp-assemble-perl/build.sh b/packages/libregexp-assemble-perl/build.sh index cdc7e1f423..d42c62d0e6 100644 --- a/packages/libregexp-assemble-perl/build.sh +++ b/packages/libregexp-assemble-perl/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Perl module to merge several regular expressions" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.38 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://salsa.debian.org/perl-team/modules/packages/libregexp-assemble-perl/-/archive/upstream/${TERMUX_PKG_VERSION}/libregexp-assemble-perl-upstream-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=ca31b4111b825a4aa5262b07412822457910577881c2edb19407baad3997ebb0 TERMUX_PKG_DEPENDS="perl" diff --git a/packages/perl/build.sh b/packages/perl/build.sh index bcf57240ea..eedf2f6f01 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -9,11 +9,10 @@ TERMUX_PKG_MAINTAINER="@termux" # - libregexp-assemble-perl # - psutils # - subversion -TERMUX_PKG_VERSION=(5.36.0 - 1.4) -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=(e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a - be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91) +TERMUX_PKG_VERSION=(5.36.1 + 1.4.1) +TERMUX_PKG_SHA256=(68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1 + 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca) TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz https://github.com/arsv/perl-cross/releases/download/${TERMUX_PKG_VERSION[1]}/perl-cross-${TERMUX_PKG_VERSION[1]}.tar.gz) TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/perl/cnf-clang16.patch b/packages/perl/cnf-clang16.patch index 7f96b0464c..3bcb9fc0a4 100644 --- a/packages/perl/cnf-clang16.patch +++ b/packages/perl/cnf-clang16.patch @@ -1,15 +1,33 @@ https://github.com/termux/termux-packages/issues/15852 -This is a BAD practice and should not be mimicked in other places. - --- a/cnf/configure_func.sh +++ b/cnf/configure_func.sh -@@ -7,7 +7,7 @@ - try_start - funcincludes "$3" "$4" "$includes" - try_add "int main(void) { $2($3); return 0; }" -- try_link -O0 -fno-builtin -+ try_link -O0 -fno-builtin -Wno-implicit-function-declaration - resdef $1 'found' 'missing' - fi - } +@@ -33,7 +33,7 @@ + checkfunc d_alarm 'alarm' "0" 'unistd.h' + checkfunc d_asctime64 'asctime64' + checkfunc d_atolf 'atolf' +-checkfunc d_atoll 'atoll' ++checkfunc d_atoll 'atoll' "NULL" 'stdlib.h' + checkfunc d_backtrace 'backtrace' 'NULL, 0' 'execinfo.h' + checkfunc d_bcmp 'bcmp' "NULL,NULL,0" 'string.h' + checkfunc d_bcopy 'bcopy' "NULL,NULL,0" 'string.h' +@@ -269,7 +269,7 @@ + checkfunc d_strtod_l 'strtod_l' + checkfunc d_strtol 'strtol' 'NULL,NULL,0' + checkfunc d_strtold 'strtold' 'NULL,NULL' +-checkfunc d_strtold_l 'strtold_l' ++checkfunc d_strtold_l 'strtold_l' 'NULL,NULL,NULL' 'stdlib.h' + checkfunc d_strtoll 'strtoll' 'NULL,NULL,0' + checkfunc d_strtoq 'strtoq' 'NULL,NULL,0' + checkfunc d_strtoul 'strtoul' 'NULL,NULL,0' +--- a/cnf/configure_func_dbl.sh ++++ b/cnf/configure_func_dbl.sh +@@ -40,7 +40,7 @@ + checkfunc d_ldexpl 'ldexpl' '0.0, 0' + checkfunc d_lgamma 'lgamma' '0.0' + checkfunc d_lgamma_r 'lgamma_r' '0.0, NULL' +-checkfunc d_llabs 'llabs' '0LL' ++checkfunc d_llabs 'llabs' '0LL' 'stdlib.h' + checkfunc d_llrint 'llrint' '0.0' + checkfunc d_llrintl 'llrintl' '0.0' + checkfunc d_llround 'llround' '0.0' diff --git a/packages/perl/cnf-configure_func.sh.patch b/packages/perl/cnf-configure_func.sh.patch index 9ecb5a2512..c646fc974c 100644 --- a/packages/perl/cnf-configure_func.sh.patch +++ b/packages/perl/cnf-configure_func.sh.patch @@ -4,12 +4,14 @@ since the second argument should be a va_list. diff -u -r ../src-orig/cnf/configure_func.sh ./cnf/configure_func.sh --- ../src-orig/cnf/configure_func.sh 2017-06-28 11:41:43.391383248 +0200 +++ ./cnf/configure_func.sh 2017-06-28 11:42:10.055083970 +0200 -@@ -275,7 +275,7 @@ - checkfunc d_usleep 'usleep' - checkfunc d_ustat 'ustat' +@@ -300,8 +300,8 @@ + checkfunc d_usleep 'usleep' '0' 'unistd.h' + checkfunc d_ustat 'ustat' '0,NULL' 'sys/types.h unistd.h' define d_vfork 'undef' # unnecessary --checkfunc d_vprintf 'vprintf' 'NULL,0' +-checkfunc d_vprintf 'vprintf' 'NULL,0' 'stdio.h' +-checkfunc d_vsnprintf 'vsnprintf' 'NULL,0,NULL,NULL' 'stdio.h' +define d_vprintf 'define' - checkfunc d_vsnprintf 'vsnprintf' - checkfunc d_wait4 'wait4' - checkfunc d_waitpid 'waitpid' '0,NULL,0' ++define d_vsnprintf 'define' + checkfunc d_wait4 'wait4' '0,NULL,0,NULL' 'sys/wait.h' + checkfunc d_waitpid 'waitpid' '0,NULL,0' 'sys/wait.h' + checkfunc d_wcrtomb 'wcrtomb' 'NULL,0,NULL' 'wchar.h' diff --git a/packages/psutils/build.sh b/packages/psutils/build.sh index 6e1cc97990..79d8311084 100644 --- a/packages/psutils/build.sh +++ b/packages/psutils/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A set of postscript utilities" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.10" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/rrthomas/psutils/releases/download/v${TERMUX_PKG_VERSION}/psutils-${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404d7e98b TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh index 16159fe091..2f5be5b787 100644 --- a/packages/subversion/build.sh +++ b/packages/subversion/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.14.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://www.apache.org/dist/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28 TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite, liblz4, utf8proc, zlib"