Merge branch 'master' into update-nim-2.2.0

termux · Jan 23, 2025 · 3b54023 · 3b54023
2 parents 4821a5a + c541ab7
commit 3b54023
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 21 deletions.
diff --git a/packages/alsa-utils/build.sh b/packages/alsa-utils/build.sh
@@ -3,12 +3,12 @@ TERMUX_PKG_DESCRIPTION="The Advanced Linux Sound Architecture (ALSA) - utils"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.2.13"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/alsa-project/alsa-utils/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=90c941cbcccfb9d8f87c22efe00035b6a7bfe37f71c109afb8422114cd3dca35
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
-TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_BUILD_DEPENDS="alsa-lib"
+TERMUX_PKG_DEPENDS="ncurses, alsa-lib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-udev-rules-dir=$TERMUX_PREFIX/lib/udev/rules.d
 --with-asound-state-dir=$TERMUX_PREFIX/var/lib/alsa

diff --git a/packages/brook/build.sh b/packages/brook/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/txthinking/brook
 TERMUX_PKG_DESCRIPTION="A cross-platform strong encryption and not detectable proxy. Zero-Configuration."
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm"
-TERMUX_PKG_VERSION="20240606"
+TERMUX_PKG_VERSION="20250202"
 TERMUX_PKG_SRCURL=https://github.com/txthinking/brook/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=eee1c6173daff3199c23396f4661d7f81d701dc0f4eb1662b39041a6ca10703b
+TERMUX_PKG_SHA256=2ee6bf43345b2cbf883eeaa8350da161352610e4fee82c29b0d3411a3e761f1f
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make() {

diff --git a/packages/exiftool/build.sh b/packages/exiftool/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://exiftool.org/
 TERMUX_PKG_DESCRIPTION="Utility for reading, writing and editing meta information in a wide variety of files."
 TERMUX_PKG_LICENSE="Artistic-License-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="13.14"
+TERMUX_PKG_VERSION="13.15"
 TERMUX_PKG_SRCURL="https://exiftool.org/Image-ExifTool-$TERMUX_PKG_VERSION.tar.gz"
-TERMUX_PKG_SHA256=dbea540293fb33f8b231590a2ea44e80374eea61bf499d1aa02f2208febbf9d5
+TERMUX_PKG_SHA256=bb45555c00c294a0444d99d642373f71632dc1777e747023296b5203244a46bc
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP='^\d+\.\d+(\.(?!0$)\d+)?'
 TERMUX_PKG_DEPENDS="perl"

diff --git a/packages/finch/build.sh b/packages/finch/build.sh
@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Text-based multi-protocol instant messaging client"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # please sync version and patches with x11-packages/pidgin
-TERMUX_PKG_VERSION="2.14.13"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION="2.14.14"
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/pidgin/pidgin-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8
+TERMUX_PKG_SHA256=0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356
 TERMUX_PKG_DEPENDS="glib, libgnt, libgnutls, libidn, libsasl, libxml2, ncurses"
 TERMUX_PKG_BREAKS="finch-dev"
 TERMUX_PKG_REPLACES="finch-dev"

diff --git a/packages/ngspice/build.sh b/packages/ngspice/build.sh
@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A mixed-level/mixed-signal circuit simulator"
 TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-2.1"
 TERMUX_PKG_LICENSE_FILE="COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="43"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION="44"
 TERMUX_PKG_SRCURL=https://github.com/imr/ngspice/archive/refs/tags/ngspice-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4c0443250f777f4e24884263674e33cfe4bdff9756bd846ac7a69ac36192bf73
+TERMUX_PKG_SHA256=40e15a4951d1c3c8b4ba5335ff8a1e8161bea6994767761cc598d0218fe8d2cb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
 TERMUX_PKG_UPDATE_VERSION_SED_REGEXP="s/ngspice-//"
@@ -18,6 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-readline=yes
 "
 TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
 --enable-cider
 --enable-xspice

diff --git a/packages/ngspice/pthread_cancel.patch b/packages/ngspice/pthread_cancel.patch
@@ -0,0 +1,44 @@
+--- a/src/xspice/verilog/coroutine_shim.h
++++ b/src/xspice/verilog/coroutine_shim.h
+@@ -82,6 +82,13 @@ static void cr_yield_to_sim(struct cr_ctx *ctx) {
+         fail("pthread_cond_wait (spice)", err);
+ }
+
++#ifdef __ANDROID__
++static void cr_thread_signal_handler(int signum)
++{
++     pthread_exit(0);
++}
++#endif
++
+ static void cr_init(struct cr_ctx *ctx, void *(*fn)(void *), void *data) {
+     int err;
+
+@@ -105,6 +112,15 @@ static void cr_init(struct cr_ctx *ctx, void *(*fn)(void *), void *data) {
+     err = pthread_cond_wait(&ctx->spice_cond, &ctx->mutex);
+     if (err)
+         fail("pthread_cond_wait", err);
++
++#ifdef __ANDROID__
++    struct sigaction actions;
++    memset(&actions, 0, sizeof(actions));
++    sigemptyset(&actions.sa_mask);
++    actions.sa_flags = 0;
++    actions.sa_handler = cr_thread_signal_handler;
++    sigaction(SIGUSR2, &actions, NULL);
++#endif
+ }
+
+ static void cr_safety(void) {
+@@ -129,7 +145,11 @@ static void cr_cleanup(struct cr_ctx *ctx) {
+      * It should be in pthread_cond_wait() and will go quickly.
+      */
+
++#ifndef __ANDROID__
+     pthread_cancel(ctx->thread);
++#else
++    pthread_kill(ctx->thread, SIGUSR2);
++#endif
+     pthread_mutex_unlock(&ctx->mutex);
+     pthread_cond_signal(&ctx->cosim_cond); // Make it run
+     pthread_join(ctx->thread, NULL);       // Wait for it.
diff --git a/packages/sox/build.sh b/packages/sox/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying
 TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="14.4.2"
-TERMUX_PKG_REVISION=26
+TERMUX_PKG_REVISION=27
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
-TERMUX_PKG_DEPENDS="file, libandroid-glob, libao, libflac, libiconv, libid3tag, libltdl, libmad, libmp3lame, libogg, libpng, libsndfile, libvorbis, opusfile, pulseaudio, zlib"
+TERMUX_PKG_DEPENDS="file, libandroid-glob, libao, libflac, libiconv, libid3tag, libltdl, libmad, libmp3lame, libogg, libpng, libsndfile, libvorbis, opusfile, pulseaudio, zlib, wget"
 TERMUX_PKG_BREAKS="sox-dev"
 TERMUX_PKG_REPLACES="sox-dev"
 

diff --git a/packages/swi-prolog/build.sh b/packages/swi-prolog/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://swi-prolog.org/
 TERMUX_PKG_DESCRIPTION="Most popular and complete prolog implementation"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="9.3.18"
+TERMUX_PKG_VERSION="9.3.19"
 TERMUX_PKG_SRCURL=https://www.swi-prolog.org/download/devel/src/swipl-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8302de3a9e204bccd8e1c1211737572a67c511d1713d13abf7a726abfb181ac3
+TERMUX_PKG_SHA256=d72d6169ba7fa4ed871ecc617a3524d2d3229b1c2862c3d101b82a7c773eb834
 TERMUX_PKG_DEPENDS="libandroid-execinfo, libarchive, libcrypt, libgmp, libyaml, ncurses, openssl, ossp-uuid, readline, zlib, pcre2"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_HOSTBUILD=true

diff --git a/x11-packages/gw/build.sh b/x11-packages/gw/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kcleal/gw
 TERMUX_PKG_DESCRIPTION="A browser for genomic sequencing data (.bam/.cram format)"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="clealk@cardiff.ac.uk"
-TERMUX_PKG_VERSION="1.1.1"
+TERMUX_PKG_VERSION="1.1.2"
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=5ac0430d9179d1a48938f24011c329fe807e72aba0c20eb191c566d129115f86
+TERMUX_PKG_SHA256=c01a3ea537342ebfc8ff7e2a5fb04507693e71ba3184ffa4ff1c4bc6d7aba613
 TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl, libcurl"
 TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev, libcurl"
 TERMUX_PKG_AUTO_UPDATE=true
@@ -55,7 +55,7 @@ termux_step_make() {
 	unzip -o "${TERMUX_PKG_CACHEDIR}/skia-${TERMUX_ARCH}.zip"
 	cd ../../
 
-	make -j "$TERMUX_PKG_MAKE_PROCESSES"
+	OLD_SKIA=1 make -j "$TERMUX_PKG_MAKE_PROCESSES"
 }
 
 termux_step_make_install() {

diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh
@@ -9,9 +9,9 @@ TERMUX_PKG_RECOMMENDS="diffutils, xxd"
 TERMUX_PKG_CONFLICTS="vim"
 TERMUX_PKG_BREAKS="vim-python"
 TERMUX_PKG_REPLACES="vim-python"
-TERMUX_PKG_VERSION="9.1.1000"
+TERMUX_PKG_VERSION="9.1.1050"
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=c8ccd457bba5563513ab3e2088ad10d62b982682af9a9278686b48202b8c7697
+TERMUX_PKG_SHA256=4a76cc51a236582421e5cd35adf4f9973272624a4e3511ff8725403040026689
 TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_CONFFILES="share/vim/vimrc"