Merge remote-tracking branch 'upstream/master'

termux-play-store · Feb 6, 2025 · b646ce7 · b646ce7
2 parents cd6f28c + 1001da7
commit b646ce7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/packages/cloudflared/build.sh b/packages/cloudflared/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/cloudflare/cloudflared
 TERMUX_PKG_DESCRIPTION="A tunneling daemon that proxies traffic from the Cloudflare network to your origins"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="2025.1.1"
+TERMUX_PKG_VERSION="2025.2.0"
 TERMUX_PKG_SRCURL=https://github.com/cloudflare/cloudflared/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=37913efe6b7aa3f84fbffc53f0f4a02c6e4fa587049c422eb27fdc452b624725
+TERMUX_PKG_SHA256=54de1e3bfb3ebcddd8bdc70837b6e91cdd2221673117356c022d0ca3376dcca4
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 

diff --git a/packages/flatbuffers/build.sh b/packages/flatbuffers/build.sh
@@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/flatbuffers
 TERMUX_PKG_DESCRIPTION="Memory Efficient Serialization Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="24.12.23"
+TERMUX_PKG_VERSION="25.1.24"
 TERMUX_PKG_SRCURL=https://github.com/google/flatbuffers/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=7e2ef35f1af9e2aa0c6a7d0a09298c2cb86caf3d4f58c0658b306256e5bcab10
+TERMUX_PKG_SHA256=0b9f8d2bb1d22d553c93cd7e3ecf3eb725469980a58a98db6e21574341b4ed63
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++"
-
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DFLATBUFFERS_BUILD_SHAREDLIB=ON
 -DFLATBUFFERS_BUILD_TESTS=OFF

diff --git a/packages/jql/build.sh b/packages/jql/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A JSON Query Language CLI tool"
 TERMUX_PKG_LICENSE="Apache-2.0, MIT"
 TERMUX_PKG_LICENSE_FILE="../../LICENSE-APACHE, ../../LICENSE-MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="8.0.2"
+TERMUX_PKG_VERSION="8.0.3"
 TERMUX_PKG_SRCURL=https://github.com/yamafaktory/jql/archive/refs/tags/jql-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=3c591dc7c1f2459d581f3373f0aa81593dcc2596c88078dd851f2f84410dc054
+TERMUX_PKG_SHA256=ec4f9885b42316610857a22d6ab0a1b752187a8d858cffa2fbfb2b104b96b978
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+"
 TERMUX_PKG_BUILD_IN_SRC=true

diff --git a/packages/libx11/build.sh b/packages/libx11/build.sh
@@ -4,9 +4,9 @@ TERMUX_PKG_DESCRIPTION="X11 client-side library"
 TERMUX_PKG_LICENSE="MIT, X11"
 TERMUX_PKG_LICENSE_FILE="COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.8.10"
+TERMUX_PKG_VERSION="1.8.11"
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libX11-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=2b3b3dad9347db41dca56beb7db5878f283bde1142f04d9f8e478af435dfdc53
+TERMUX_PKG_SHA256=3b74e82943924b45a0b778cc6842976909c3010d9445a8fd185e1dca4d380e88
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libxcb"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros, xtrans"

diff --git a/packages/screen/build.sh b/packages/screen/build.sh
@@ -3,13 +3,16 @@ TERMUX_PKG_DESCRIPTION="Terminal multiplexer with VT100/ANSI terminal emulation"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="5.0.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
-TERMUX_PKG_DEPENDS="ncurses, termux-auth"
+# libandroid-support is necessary as screen uses `wcwidth`, see #22688
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-auth"
 TERMUX_PKG_BUILD_DEPENDS="libcrypt"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--with-system_screenrc=$TERMUX_PREFIX/etc/screenrc
 --disable-socket-dir
 --disable-pam
 --enable-colors256

diff --git a/packages/screen/issue-22688.patch b/packages/screen/issue-22688.patch
@@ -0,0 +1,12 @@
+This reverts https://git.savannah.gnu.org/cgit/screen.git/commit/?id=7fc842ddc6e5905da2c5961547e3ff7385bbcc44
+
+--- a/display.c
++++ b/display.c
+@@ -437,6 +437,7 @@
+ {
+
+ 	if (D_encoding == UTF8) {
++		c = (c & 255) | (unsigned char)D_rend.font << 8;
+ 		if (D_mbcs) {
+ 			c = D_mbcs;
+ 			if (D_x == D_width)
diff --git a/root-packages/gocryptfs/build.sh b/root-packages/gocryptfs/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://nuetzlich.net/gocryptfs/
 TERMUX_PKG_DESCRIPTION="An encrypted overlay filesystem written in Go"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.5.0
+TERMUX_PKG_VERSION=2.5.1
 TERMUX_PKG_SRCURL=https://github.com/rfjakob/gocryptfs/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=26e6b561701bcace5ab1fb4f7716bb6b5582ab4b2f614b5947f8068ca7b6ab43
+TERMUX_PKG_SHA256=b37fc5aefd552c8d78acb896d115bfee1ed8aa4c9880b307b150f505f0a4d52e
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_BUILD_IN_SRC=true
 

diff --git a/x11-packages/kitty/build.sh b/x11-packages/kitty/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 TERMUX_PKG_DESCRIPTION="Cross-platform, fast, feature-rich, GPU based terminal"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.39.0"
+TERMUX_PKG_VERSION="0.39.1"
 TERMUX_PKG_SRCURL=https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION}/kitty-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=c3f5d2371ce78ae29475d21d31264d41478357024f267d9f6038bb4bcdbc972b
+TERMUX_PKG_SHA256=4baa2a59de7569b3b34f44ea8536c53d312aa76d1347121a2d6557abfde21325
 # fontconfig is dlopen(3)ed:
 TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, ncurses, opengl, openssl, python, xxhash, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, simde, xorgproto"