From 48dcd7e260bf0a8f6b29e025c873861cad74454f Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Fri, 1 Nov 2024 13:47:30 -0500 Subject: [PATCH 1/5] scripts(setup-ubuntu.sh): Apply system libdirs and pkgconfig dirs to new pkgconf build Fixes #22060 --- scripts/setup-ubuntu.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index f14b0326ab4483..e13f607286acc3 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -343,12 +343,21 @@ $SUDO ln -sf /data/data/com.termux/files/usr/opt/bionic-host /system # Install newer pkg-config then what ubuntu provides, as the stock # ubuntu version has performance problems with at least protobuf: PKGCONF_VERSION=2.3.0 +HOST_TRIPLET=$(gcc -dumpmachine) +PKG_CONFIG_DIRS=$(grep DefaultSearchPaths: /usr/share/pkgconfig/personality.d/${HOST_TRIPLET}.personality | cut -d ' ' -f 2) +SYSTEM_LIBDIRS=$(grep SystemLibraryPaths: /usr/share/pkgconfig/personality.d/${HOST_TRIPLET}.personality | cut -d ' ' -f 2) mkdir -p /tmp/pkgconf-build cd /tmp/pkgconf-build curl -O https://distfiles.ariadne.space/pkgconf/pkgconf-${PKGCONF_VERSION}.tar.xz tar xf pkgconf-${PKGCONF_VERSION}.tar.xz cd pkgconf-${PKGCONF_VERSION} -./configure --prefix=/usr && make && $SUDO make install +echo "SYSTEM_LIBDIRS: $SYSTEM_LIBDIRS" +echo "PKG_CONFIG_DIRS: $PKG_CONFIG_DIRS" +./configure --prefix=/usr \ + --with-system-libdir=${SYSTEM_LIBDIRS} \ + --with-pkg-config-dir=${PKG_CONFIG_DIRS} +make +$SUDO make install cd - rm -Rf /tmp/pkgconf-build # Prevent package from being upgraded and overwriting our manual installation: From e3f19d21af10cf18b7f2bf6cea72121d0d505f23 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 2 Nov 2024 18:10:17 +0000 Subject: [PATCH 2/5] bump(main/mpg123): 1.32.9 This commit has been automatically submitted by Github Actions. --- packages/mpg123/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mpg123/build.sh b/packages/mpg123/build.sh index dea30a186bfab4..83bae30a08d51a 100644 --- a/packages/mpg123/build.sh +++ b/packages/mpg123/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mpg123.org/ TERMUX_PKG_DESCRIPTION="Fast console MPEG Audio Player and decoder library" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.32.8" +TERMUX_PKG_VERSION="1.32.9" # Flaky https://mpg123.org/download/mpg123-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=feee1374c79540e0e405df0bc45fde20ad67011425c361a2759e2146894a27a7 +TERMUX_PKG_SHA256=03b61e4004e960bacf2acdada03ed94d376e6aab27a601447bd4908d8407b291 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="pulseaudio" From 1b2ded5caf1ffd9904d697a5e6106a3aa78c17c8 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 2 Nov 2024 18:12:34 +0000 Subject: [PATCH 3/5] bump(main/python-numpy): 2.1.3 This commit has been automatically submitted by Github Actions. --- packages/python-numpy/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index c29b2a7ecf2847..97f86437445e3a 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://numpy.org/ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.1.2" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="2.1.3" TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy TERMUX_PKG_DEPENDS="libc++, libopenblas, python" TERMUX_PKG_AUTO_UPDATE=true From f7d9db631375dc2d8e1dcf378a6b4bc981cc0e74 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 2 Nov 2024 18:18:11 +0000 Subject: [PATCH 4/5] bump(x11/kitty): 0.37.0 This commit has been automatically submitted by Github Actions. --- x11-packages/kitty/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x11-packages/kitty/build.sh b/x11-packages/kitty/build.sh index 0554477cf37886..ca965d493555de 100644 --- a/x11-packages/kitty/build.sh +++ b/x11-packages/kitty/build.sh @@ -2,10 +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.36.4" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION="0.37.0" TERMUX_PKG_SRCURL=https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION}/kitty-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=10ebf00a8576bca34ae683866c5be307a35f3c517906d6441923fd740db059bd +TERMUX_PKG_SHA256=efbf933dfe930abd7c88ad0860997633c9c23b46c5000c5872ae3859dfbc50ff # 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" From db9ada31acac605c9cb713f2f3e1dd7c4de5cdc7 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 2 Nov 2024 18:23:22 +0000 Subject: [PATCH 5/5] bump(x11/tuxpaint): 0.9.34 This commit has been automatically submitted by Github Actions. --- x11-packages/tuxpaint/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x11-packages/tuxpaint/build.sh b/x11-packages/tuxpaint/build.sh index a522e8d2e1a10e..d3280247132b6b 100644 --- a/x11-packages/tuxpaint/build.sh +++ b/x11-packages/tuxpaint/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tuxpaint.org/ TERMUX_PKG_DESCRIPTION="A free, award-winning drawing program for children ages 3 to 12" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.9.33" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="0.9.34" TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/tuxpaint/tuxpaint-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=8701ec5082d48a00ba2f408c7c48cf592aa82b60f50dd6d4b6574fac6b48dc76 +TERMUX_PKG_SHA256=b761df5ed386a9e04a6809ab3e0cbf2126f10b770527cb2b5f190ff5e370ed03 TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, libandroid-wordexp, libcairo, libimagequant, libpaper, libpng, librsvg, pango, sdl2, sdl2-gfx, sdl2-image, sdl2-mixer, sdl2-pango, sdl2-ttf, zlib" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true