From b74bc6f18680da3300603fa2744480785f86bf68 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 24 Mar 2020 15:27:02 +0100 Subject: [PATCH] Updates for some packages (#5070) * imagemagick: update to 7.0.10.2 * fossil: update to 2.10 Had to disable tests checking for sqlite3 as they try to run cross-compiled tests * automake: update to 1.16.2 * ghostscript: update to 9.52 * cmake: update to 3.17.0 * git: update to 2.26.0 * krb5: update to 1.18 * ldc: update to 1.20.1 --- packages/automake/build.sh | 4 +- .../Modules-CMakeDetermineSystem.cmake.patch | 13 ---- ...orm-Android-Determine-Compiler.cmake.patch | 19 ------ .../cmake/Source-cmStateSnapshot.cxx.patch | 20 ------- packages/cmake/build.sh | 4 +- packages/fossil/auto.def.patch | 60 +++++++++++++++++++ packages/fossil/build.sh | 6 +- packages/fossil/src-popen.c.patch | 25 +++----- packages/ghostscript/arch-aarch64.h | 4 ++ packages/ghostscript/arch-arm.h | 4 ++ packages/ghostscript/arch-i686.h | 4 ++ packages/ghostscript/arch-x86_64.h | 4 ++ packages/ghostscript/build.sh | 5 +- packages/ghostscript/configure.patch | 11 ---- packages/git/build.sh | 4 +- packages/imagemagick/build.sh | 4 +- packages/krb5/build.sh | 5 +- .../krb5/src-util-support-plugins.c.patch | 11 ++++ packages/ldc/build.sh | 7 +-- 19 files changed, 113 insertions(+), 101 deletions(-) delete mode 100644 packages/cmake/Modules-CMakeDetermineSystem.cmake.patch delete mode 100644 packages/cmake/Modules-Platform-Android-Determine-Compiler.cmake.patch delete mode 100644 packages/cmake/Source-cmStateSnapshot.cxx.patch create mode 100644 packages/fossil/auto.def.patch delete mode 100644 packages/ghostscript/configure.patch create mode 100644 packages/krb5/src-util-support-plugins.c.patch diff --git a/packages/automake/build.sh b/packages/automake/build.sh index b8052a5e2..da96c3e10 100644 --- a/packages/automake/build.sh +++ b/packages/automake/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/automake/ TERMUX_PKG_DESCRIPTION="Tool for automatically generating Makefile.in files" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=1.16.1 +TERMUX_PKG_VERSION=1.16.2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/automake/automake-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 +TERMUX_PKG_SHA256=ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 TERMUX_PKG_DEPENDS="autoconf" TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/cmake/Modules-CMakeDetermineSystem.cmake.patch b/packages/cmake/Modules-CMakeDetermineSystem.cmake.patch deleted file mode 100644 index ea6fb827d..000000000 --- a/packages/cmake/Modules-CMakeDetermineSystem.cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index dc208c600..f3ec4da2d 100644 ---- a/Modules/CMakeDetermineSystem.cmake -+++ b/Modules/CMakeDetermineSystem.cmake -@@ -43,7 +43,7 @@ if(CMAKE_HOST_UNIX) - else() - exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) - endif() -- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") -+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$|Android") - exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR - RETURN_VALUE val) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND diff --git a/packages/cmake/Modules-Platform-Android-Determine-Compiler.cmake.patch b/packages/cmake/Modules-Platform-Android-Determine-Compiler.cmake.patch deleted file mode 100644 index 9507d16b5..000000000 --- a/packages/cmake/Modules-Platform-Android-Determine-Compiler.cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Modules/Platform/Android/Determine-Compiler.cmake b/Modules/Platform/Android/Determine-Compiler.cmake -index a03ebcc29..34d527741 100644 ---- a/Modules/Platform/Android/Determine-Compiler.cmake -+++ b/Modules/Platform/Android/Determine-Compiler.cmake -@@ -31,6 +31,14 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(_ANDROID_HOST_EXT "") - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(_ANDROID_HOST_EXT ".exe") -+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") -+ macro(__android_determine_compiler lang) -+ # Do nothing -+ endmacro() -+ if(NOT CMAKE_CXX_COMPILER_NAMES) -+ set(CMAKE_CXX_COMPILER_NAMES c++) -+ endif() -+ return() - else() - message(FATAL_ERROR "Android: Builds hosted on '${CMAKE_HOST_SYSTEM_NAME}' not supported.") - endif() diff --git a/packages/cmake/Source-cmStateSnapshot.cxx.patch b/packages/cmake/Source-cmStateSnapshot.cxx.patch deleted file mode 100644 index 39b5fabb7..000000000 --- a/packages/cmake/Source-cmStateSnapshot.cxx.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx -index 63bec710b..19286c50e 100644 ---- a/Source/cmStateSnapshot.cxx -+++ b/Source/cmStateSnapshot.cxx -@@ -316,11 +316,15 @@ void cmStateSnapshot::SetDefaultDefinitions() - this->SetDefinition("UNIX", "1"); - this->SetDefinition("CMAKE_HOST_UNIX", "1"); - -+#if defined(__ANDROID__) -+ this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", "Android"); -+#else - struct utsname uts_name; - if (uname(&uts_name) >= 0) { - this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", uts_name.sysname); - } - #endif -+#endif - #if defined(__CYGWIN__) - std::string legacy; - if (cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32", legacy) && diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index 66cdcdcdd..fa15daf9c 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=3.16.5 +TERMUX_PKG_VERSION=3.17.0 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc +TERMUX_PKG_SHA256=b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON" diff --git a/packages/fossil/auto.def.patch b/packages/fossil/auto.def.patch new file mode 100644 index 000000000..613a538f8 --- /dev/null +++ b/packages/fossil/auto.def.patch @@ -0,0 +1,60 @@ +--- ../auto.def.orig 2020-03-24 09:23:19.936110079 +0100 ++++ ./auto.def 2020-03-24 09:33:04.184974256 +0100 +@@ -133,51 +133,17 @@ + # not stmt_isexplain(), then the system SQLite is too old to link against + # fossil. + # +- if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} { +- # Success. Update symbols and return. +- # +- define USE_SYSTEM_SQLITE 1 +- define-append LIBS -lsqlite3 +- define-append LIBS $extralibs +- return +- } ++ # Update symbols and return. ++ # ++ define USE_SYSTEM_SQLITE 1 ++ define-append LIBS -lsqlite3 ++ define-append LIBS $extralibs ++ return + } + user-error "system sqlite3 not found" + } + + find_system_sqlite +- +- proc test_system_sqlite {} { +- # Check compatibility of the system SQLite library by running the sqlcompttest.c +- # program in the source tree +- # +- set cmdline {} +- lappend cmdline {*}[get-define CCACHE] +- lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] +- lappend cmdline $::autosetup(dir)/../src/sqlcompattest.c -o conftest__ +- lappend cmdline {*}[get-define LDFLAGS] +- lappend cmdline {*}[get-define LIBS] +- set ok 1 +- set err [catch {exec-with-stderr {*}$cmdline} result errinfo] +- if {$err} { +- configlog "Failed: [join $cmdline]" +- if {[string length $result]>0} {configlog $result} +- configlog "============" +- set ok 0 +- } elseif {$::autosetup(debug)} { +- configlog "Compiled OK: [join $cmdline]" +- configlog "============" +- } +- if {!$ok} { +- user-error "unable to compile SQLite compatibility test program" +- } +- set err [catch {exec-with-stderr ./conftest__} result errinfo] +- if {$err} { +- user-error $result +- } +- file delete ./conftest__ +- } +- test_system_sqlite + + } + diff --git a/packages/fossil/build.sh b/packages/fossil/build.sh index 6f9742fe2..6cc6897ca 100644 --- a/packages/fossil/build.sh +++ b/packages/fossil/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.fossil-scm.org TERMUX_PKG_DESCRIPTION="DSCM with built-in wiki, http interface and server, tickets database" TERMUX_PKG_LICENSE="BSD 2-Clause" -TERMUX_PKG_VERSION=2.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=2.10 TERMUX_PKG_SRCURL=https://www.fossil-scm.org/index.html/uv/fossil-src-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=1cb2ada92d43e3e7e008fe77f5e743d301c7ea34d4c36c42f255f873e73d8b4f +TERMUX_PKG_SHA256=d8a3776d2ce77385ed5ff20a2776d13bb534fb2508e87351e14e94f91cd12b10 TERMUX_PKG_DEPENDS="libsqlite, openssl, zlib" termux_step_pre_configure() { @@ -23,4 +22,3 @@ termux_step_configure() { --with-openssl=$TERMUX_PREFIX \ --with-zlib=$TERMUX_PREFIX } - diff --git a/packages/fossil/src-popen.c.patch b/packages/fossil/src-popen.c.patch index 2965fde5a..48fdaf6f0 100644 --- a/packages/fossil/src-popen.c.patch +++ b/packages/fossil/src-popen.c.patch @@ -1,18 +1,11 @@ -Index: src/popen.c -================================================================== ---- a/src/popen.c -+++ b/src/popen.c -@@ -189,11 +189,11 @@ - close(1); - fd = dup(pin[1]); - if( fd!=1 ) nErr++; - close(pin[0]); - close(pin[1]); -- execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0); -+ execl("@TERMUX_PREFIX@/bin/sh", "@TERMUX_PREFIX@/bin/sh", "-c", zCmd, (char*)0); +--- ./src/popen.c.orig 2020-03-24 09:01:15.178685700 +0100 ++++ ./src/popen.c 2020-03-24 09:03:05.615137701 +0100 +@@ -200,7 +200,7 @@ + if( bDirect ){ + execl(zCmd, zCmd, (char*)0); + }else{ +- execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0); ++ execl("@TERMUX_PREFIX@/bin/sh", "@TERMUX_PREFIX@/bin/sh", "-c", zCmd, (char*)0); + } return 1; }else{ - /* This is the parent process */ - close(pin[1]); - *pfdIn = pin[0]; - diff --git a/packages/ghostscript/arch-aarch64.h b/packages/ghostscript/arch-aarch64.h index a05de29de..3a1f1e9cf 100644 --- a/packages/ghostscript/arch-aarch64.h +++ b/packages/ghostscript/arch-aarch64.h @@ -6,6 +6,7 @@ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_SIZE_T_MOD 8 #define ARCH_ALIGN_PTR_MOD 8 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 8 @@ -16,7 +17,9 @@ #define ARCH_LOG2_SIZEOF_SHORT 1 #define ARCH_LOG2_SIZEOF_INT 2 #define ARCH_LOG2_SIZEOF_LONG 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 3 #define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_SIZE_T 8 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 #define ARCH_SIZEOF_PTR 8 #define ARCH_SIZEOF_FLOAT 4 @@ -30,6 +33,7 @@ #define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Miscellaneous ---------------- */ diff --git a/packages/ghostscript/arch-arm.h b/packages/ghostscript/arch-arm.h index e8772cd95..68f78c242 100644 --- a/packages/ghostscript/arch-arm.h +++ b/packages/ghostscript/arch-arm.h @@ -6,6 +6,7 @@ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 4 +#define ARCH_ALIGN_SIZE_T_MOD 4 #define ARCH_ALIGN_PTR_MOD 4 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 8 @@ -16,7 +17,9 @@ #define ARCH_LOG2_SIZEOF_SHORT 1 #define ARCH_LOG2_SIZEOF_INT 2 #define ARCH_LOG2_SIZEOF_LONG 2 +#define ARCH_LOG2_SIZEOF_SIZE_T 2 #define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_SIZE_T 4 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 #define ARCH_SIZEOF_PTR 4 #define ARCH_SIZEOF_FLOAT 4 @@ -30,6 +33,7 @@ #define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Miscellaneous ---------------- */ diff --git a/packages/ghostscript/arch-i686.h b/packages/ghostscript/arch-i686.h index 3ec810168..52ce17c6b 100644 --- a/packages/ghostscript/arch-i686.h +++ b/packages/ghostscript/arch-i686.h @@ -6,6 +6,7 @@ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 4 +#define ARCH_ALIGN_SIZE_T_MOD 4 #define ARCH_ALIGN_PTR_MOD 4 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 4 @@ -16,7 +17,9 @@ #define ARCH_LOG2_SIZEOF_SHORT 1 #define ARCH_LOG2_SIZEOF_INT 2 #define ARCH_LOG2_SIZEOF_LONG 2 +#define ARCH_LOG2_SIZEOF_SIZE_T 2 #define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_SIZE_T 4 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 #define ARCH_SIZEOF_PTR 4 #define ARCH_SIZEOF_FLOAT 4 @@ -30,6 +33,7 @@ #define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Miscellaneous ---------------- */ diff --git a/packages/ghostscript/arch-x86_64.h b/packages/ghostscript/arch-x86_64.h index a05de29de..3a1f1e9cf 100644 --- a/packages/ghostscript/arch-x86_64.h +++ b/packages/ghostscript/arch-x86_64.h @@ -6,6 +6,7 @@ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_SIZE_T_MOD 8 #define ARCH_ALIGN_PTR_MOD 8 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 8 @@ -16,7 +17,9 @@ #define ARCH_LOG2_SIZEOF_SHORT 1 #define ARCH_LOG2_SIZEOF_INT 2 #define ARCH_LOG2_SIZEOF_LONG 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 3 #define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_SIZE_T 8 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 #define ARCH_SIZEOF_PTR 8 #define ARCH_SIZEOF_FLOAT 4 @@ -30,6 +33,7 @@ #define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Miscellaneous ---------------- */ diff --git a/packages/ghostscript/build.sh b/packages/ghostscript/build.sh index 0e406e57a..4084fc931 100644 --- a/packages/ghostscript/build.sh +++ b/packages/ghostscript/build.sh @@ -1,15 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://www.ghostscript.com/ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF" TERMUX_PKG_LICENSE="AGPL-V3" -TERMUX_PKG_VERSION=9.50 +TERMUX_PKG_VERSION=9.52 TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=dd94c5a06c03c58b47b929d03260f491d4807eaf5be83abd283278927b11c9ee +TERMUX_PKG_SHA256=8f6e48325c106ae033bbae3e55e6c0b9ee5c6b57e54f7cd24fb80a716a93b06a TERMUX_PKG_DEPENDS="libandroid-support, libiconv, libtiff, libjpeg-turbo, libpng, libexpat, freetype, fontconfig, libidn, littlecms, openjpeg" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_lcms2__cmsCreateMutex=yes CCAUX=gcc --build=$TERMUX_BUILD_TUPLE ---enable-little-endian --with-arch_h=$TERMUX_PKG_BUILDER_DIR/arch-${TERMUX_ARCH}.h --without-pcl --without-x diff --git a/packages/ghostscript/configure.patch b/packages/ghostscript/configure.patch deleted file mode 100644 index b45b48c82..000000000 --- a/packages/ghostscript/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure 2017-03-16 10:12:59.000000000 +0000 -+++ ./configure 2017-03-18 15:14:30.363309054 +0000 -@@ -3772,7 +3772,7 @@ - echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in - echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in - -- ../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" -+ $0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" - status=$? - cp config.log ../configaux.log - if test $status -eq 0 ; then diff --git a/packages/git/build.sh b/packages/git/build.sh index 7e9fe7794..b2be25741 100644 --- a/packages/git/build.sh +++ b/packages/git/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/ TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=2.25.2 +TERMUX_PKG_VERSION=2.26.0 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=9b937103e048e2d3bf964d4132a0e7edccc2583d4ef30bc8a516f93a76de7123 +TERMUX_PKG_SHA256=9ece0dcb07a5e0d7366a92b613b201cca11ae368ab7687041364b3e756e495d6 TERMUX_PKG_DEPENDS="libcurl, libiconv, less, openssl, pcre2, zlib" ## This requires a working $TERMUX_PREFIX/bin/sh on the host building: diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index 2dd2d1d11..09ccb2840 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats" TERMUX_PKG_LICENSE="ImageMagick" -TERMUX_PKG_VERSION=7.0.10.1 +TERMUX_PKG_VERSION=7.0.10.2 TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/$(echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/').tar.gz -TERMUX_PKG_SHA256=61fcd748d3c3962c614c2df2645cf09ba7ae95b495cb27148dd5d2a8fc995713 +TERMUX_PKG_SHA256=2fb408a56e06ad80ce5c1a5c3dbc2c34886000c7a0740461569e74b5d7348e86 TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms, libwebp, librsvg" TERMUX_PKG_BREAKS="imagemagick-dev" TERMUX_PKG_REPLACES="imagemagick-dev" diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index d3e2d220b..30878a295 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://web.mit.edu/kerberos TERMUX_PKG_DESCRIPTION="The Kerberos network authentication system" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.17.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=1.18 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/krb5-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=3706d7ec2eaa773e0e32d3a87bf742ebaecae7d064e190443a3acddfd8afb181 +TERMUX_PKG_SHA256=73913934d711dcf9d5f5605803578edb44b9a11786df3c1b2711f4e1752f2c88 TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libdb" TERMUX_PKG_BREAKS="krb5-dev" TERMUX_PKG_REPLACES="krb5-dev" diff --git a/packages/krb5/src-util-support-plugins.c.patch b/packages/krb5/src-util-support-plugins.c.patch new file mode 100644 index 000000000..fd9c11f1d --- /dev/null +++ b/packages/krb5/src-util-support-plugins.c.patch @@ -0,0 +1,11 @@ +--- ../plugins.c.orig 2020-03-24 12:00:24.214840738 +0000 ++++ src/util/support/plugins.c 2020-03-24 12:04:04.597776193 +0000 +@@ -62,7 +62,7 @@ + * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects + * anyway. + */ +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__ANDROID__) + #include + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 7869c7dd8..cab28a6bd 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -4,22 +4,21 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ldc-developers/ldc TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=() -TERMUX_PKG_VERSION+=(1.20.0) +TERMUX_PKG_VERSION+=(1.20.1) TERMUX_PKG_VERSION+=(9.0.1) # LLVM version TERMUX_PKG_VERSION+=(2.090.1) # TOOLS version TERMUX_PKG_VERSION+=(1.19.0) # DUB version -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz https://github.com/ldc-developers/llvm-project/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz https://github.com/dlang/tools/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz https://github.com/dlang/dub/archive/v${TERMUX_PKG_VERSION[3]}.tar.gz https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz) -TERMUX_PKG_SHA256=(49c9fdfe3a51c978385aae94f2e102f306102f6282215638f2ae3fb9ea8d3ab9 +TERMUX_PKG_SHA256=(2b21dfffb6efd2c2158bc83422765335aae34b709ebdc406bb026c21967a1aaf fb1aa89d334487a23036978e266c9e47e00941b40c749561a688efe83961e051 5b2db582632ec882188b70dc84da0156e16b21d346c9e46f6d21c663024efa35 84dc77f517ca1f115e05e25e8a8cdbcacbf31df281217ebac31dc974560a4ffc - ab2100228b9396ff1098006f7692d5638f4ebeb07890767499207c8aaf62ff09) + 2185802dcabb89e516f904ee7c4c313dcf5784bb1d15cc8e674075455b1d0b6b) TERMUX_PKG_DEPENDS="clang, libc++, zlib" TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_HOSTBUILD=true