Merge remote-tracking branch 'upstream/master'

termux-play-store · Nov 2, 2024 · 121f5e4 · 121f5e4
2 parents d8f7870 + db9ada3
commit 121f5e4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git 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"
diff --git 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

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -342,12 +342,21 @@ $SUDO chown -R $(whoami) /data
 # 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:

diff --git 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"

diff --git 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