Merge remote-tracking branch 'upstream/master'

termux-play-store · Nov 16, 2024 · 5cf880b · 5cf880b
2 parents e703adb + ef88cbe
commit 5cf880b
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 39 deletions.
diff --git a/packages/angle-android/build.sh b/packages/angle-android/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://chromium.googlesource.com/angle/angle
 TERMUX_PKG_DESCRIPTION="A conformant OpenGL ES implementation for Windows, Mac, Linux, iOS and Android"
 TERMUX_PKG_LICENSE="BSD 3-Clause, Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-_COMMIT_DATE=2024.7.15
-_COMMIT=faae3c32c038030acca0cebd4abc3f52f8168f03
-_COMMIT_POSISION=23487
+_COMMIT_DATE=2024.11.15
+_COMMIT=9dd69aae818e3b4bb13784a09f8a02419f9cd8cd
+_COMMIT_POSISION=24318
 TERMUX_PKG_SRCURL=git+https://chromium.googlesource.com/angle/angle
 TERMUX_PKG_VERSION="2.1.$_COMMIT_POSISION-${_COMMIT:0:8}"
 TERMUX_PKG_REVISION=1

diff --git a/packages/cava/build.sh b/packages/cava/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/karlstav/cava
 TERMUX_PKG_DESCRIPTION="Console-based Audio Visualizer. Works with MPD and Pulseaudio"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
-TERMUX_PKG_VERSION="0.10.2"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION="0.10.3"
 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=853ee78729ed3501d0cdf9c1947967ad3bfe6526d66a029b4ddf9adaa6334d4f
+TERMUX_PKG_SHA256=bf822ac18ae0ca2cf926c2875f3221591960c25f2bcab89ea19729be4b9c3663
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="fftw, libiniparser, ncurses, pulseaudio"
 TERMUX_PKG_BUILD_DEPENDS="libtool"

diff --git a/packages/cava/configure.ac.patch b/packages/cava/configure.ac.patch
@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -260,7 +260,7 @@
- AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
-     if [[ $have_iniparser = "yes" ]] ; then
-     LIBS="$LIBS -liniparser"
--      CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
-+      CPPFLAGS="$CPPFLAGS -I@TERMUX_PREFIX@/include/iniparser"
+@@ -429,7 +429,7 @@
+         CPPFLAGS="$CPPFLAGS -I/usr/local/include/iniparser/"
+         CPPFLAGS="$CPPFLAGS -I/opt/homebrew/include/iniparser/"
+     else
+-        CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
++        CPPFLAGS="$CPPFLAGS -I@TERMUX_PREFIX@/include/iniparser"
+     fi
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
        [[dictionary* ini;
-       const char *keys[3];
diff --git a/packages/debianutils/build.sh b/packages/debianutils/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/debianutils
 TERMUX_PKG_DESCRIPTION="Small utilities which are used primarily by the installation scripts of Debian packages"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="5.20"
+TERMUX_PKG_VERSION="5.21"
 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/d/debianutils/debianutils_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=dce8731adee52d1620d562c1d98b8f4177b4ae591b7a17091ffe09700dbd4be8
+TERMUX_PKG_SHA256=0053dcfd89e5c7dbfb2632450c00af6b8a646eeaaf185bbc8f2915488f994fe5
 TERMUX_PKG_AUTO_UPDATE=true
 
 TERMUX_PKG_RM_AFTER_INSTALL="

diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A peer-to-peer hypermedia distribution protocol"
 TERMUX_PKG_LICENSE="MIT, Apache-2.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE-APACHE, LICENSE-MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.32.0"
+TERMUX_PKG_VERSION="0.32.1"
 TERMUX_PKG_SRCURL=https://github.com/ipfs/kubo/releases/download/v${TERMUX_PKG_VERSION}/kubo-source.tar.gz
-TERMUX_PKG_SHA256=e891868a8dde7eb675b124fb857f8916de4328c40503adf582ee84b873b34751
+TERMUX_PKG_SHA256=ffbda89ac0d9dbe9ee3c79195ed477312b315a27310b462716629c1c5db60bed
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_SUGGESTS="termux-services"
 TERMUX_PKG_SERVICE_SCRIPT=("ipfs" "[ ! -d \"${TERMUX_ANDROID_HOME}/.ipfs\" ] && ipfs init --empty-repo 2>&1 && ipfs config --json Swarm.EnableRelayHop false 2>&1 && ipfs config --json Swarm.EnableAutoRelay true 2>&1; exec ipfs daemon --enable-namesys-pubsub 2>&1")

diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_SRCURL=git+https://github.com/grpc/grpc
-TERMUX_PKG_VERSION="1.67.1"
+TERMUX_PKG_VERSION="1.68.0"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 TERMUX_PKG_DEPENDS="abseil-cpp, c-ares, ca-certificates, libc++, libprotobuf, libre2, openssl, protobuf, zlib, libutf8-range"

diff --git a/packages/libtpms/build.sh b/packages/libtpms/build.sh
@@ -2,14 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://github.com/stefanberger/libtpms
 TERMUX_PKG_DESCRIPTION="Provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.9.6
+TERMUX_PKG_VERSION="0.10.0"
 TERMUX_PKG_SRCURL=https://github.com/stefanberger/libtpms/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=2807466f1563ebe45fdd12dd26e501e8a0c4fbb99c7c428fbb508789efd221c0
+TERMUX_PKG_SHA256=6da9a527b3afa7b1470acd4cd17157b8646c31a2c7ff3ba2dfc50c81ba413426
+TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-openssl
+--with-tpm2
 "
 
 termux_step_pre_configure() {
 	autoreconf -fi
+	CPPFLAGS+=" -Dindex=strchr"
 }
diff --git a/packages/plantuml/0002-gradle-8.10.2.patch b/packages/plantuml/0002-gradle-8.10.2.patch
diff --git a/packages/plantuml/build.sh b/packages/plantuml/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://plantuml.com/
 TERMUX_PKG_DESCRIPTION="Draws UML diagrams, using a simple and human readable text description"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.2024.7"
+TERMUX_PKG_VERSION="1.2024.8"
 TERMUX_PKG_SRCURL=https://github.com/plantuml/plantuml/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4cdfdf38093b29b41cbafbd88e30c598c903618015c6807cfa6fc16f6e97a31e
+TERMUX_PKG_SHA256=5b5903545e7977a5b1b7136401847a57885ac83247264100c47c6fda1658e56f
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openjdk-21"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

diff --git a/packages/python-grpcio/build.sh b/packages/python-grpcio/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_SRCURL=git+https://github.com/grpc/grpc
-TERMUX_PKG_VERSION="1.67.1"
+TERMUX_PKG_VERSION="1.68.0"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 TERMUX_PKG_DEPENDS="abseil-cpp, c-ares, ca-certificates, libc++, libre2, openssl, python, zlib"

diff --git a/packages/swtpm/build.sh b/packages/swtpm/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Software TPM Emulator"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_LICENSE_FILE="LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.9.0"
+TERMUX_PKG_VERSION="0.10.0"
 TERMUX_PKG_SRCURL=https://github.com/stefanberger/swtpm/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=9679ca171e8aaa3c4e4053e8bc1d10c8dabf0220bd4b16aba78743511c25f731
+TERMUX_PKG_SHA256=9f10ae0d3123ab05c3808f8c8d39f633cf1a0cf142d6ac9b87b8364a682ac842
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="glib, json-glib, libseccomp, libtpms, openssl, libgmp"
 TERMUX_PKG_BUILD_DEPENDS="libtasn1"
@@ -20,3 +20,7 @@ termux_step_pre_configure() {
 
 	CPPFLAGS+=" -Dindex=strchr"
 }
+
+termux_step_post_massage() {
+	rm -r "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}"/libexec/installed-tests
+}
diff --git a/packages/swtpm/src-swtpm_setup-swtpm.c.patch b/packages/swtpm/src-swtpm_setup-swtpm.c.patch
@@ -1,11 +1,11 @@
 --- a/src/swtpm_setup/swtpm.c
 +++ b/src/swtpm_setup/swtpm.c
-@@ -70,7 +70,7 @@
-     unsigned ctr;
+@@ -92,7 +92,7 @@
      int pidfile_fd;
      int ret = 1;
+     gchar *tmp;
 -    char pidfile[] = "/tmp/.swtpm_setup.pidfile.XXXXXX";
 +    char pidfile[] = "@TERMUX_PREFIX@/tmp/.swtpm_setup.pidfile.XXXXXX";
 
-     pidfile_fd = mkstemp(pidfile);
+     pidfile_fd = g_mkstemp_full(pidfile, O_EXCL|O_CREAT, 0600);
      if (pidfile_fd < 0) {
diff --git a/packages/yq/build.sh b/packages/yq/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mikefarah.gitbook.io/yq/
 TERMUX_PKG_DESCRIPTION="A lightweight and portable command-line YAML, JSON and XML processor"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="4.44.3"
+TERMUX_PKG_VERSION="4.44.5"
 TERMUX_PKG_SRCURL=https://github.com/mikefarah/yq/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=ea950f5622480fc0ff3708c52589426a737cd4ec887a52922a74efa1be8f2fbf
+TERMUX_PKG_SHA256=1505367f4a6c0c4f3b91c6197ffed4112d29ef97c48d0b5e66530cfa851d3f0e
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 

diff --git a/x11-packages/extra-cmake-modules/build.sh b/x11-packages/extra-cmake-modules/build.sh
@@ -4,7 +4,13 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_LICENSE_FILE="LICENSES/BSD-3-Clause.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="6.8.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/extra-cmake-modules-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=ff8a0bf72285bec1768e3acd8f7c665a26d55a1527e96d73e35789dc9f0e3472
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="cmake"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DBUILD_HTML_DOCS=OFF
+-DBUILD_QTHELP_DOCS=OFF
+-DBUILD_TESTING=OFF
+"