From b73fdbc25ea0040d5453e78d3dff00f23b239da5 Mon Sep 17 00:00:00 2001 From: Maxython Date: Tue, 10 Sep 2024 14:28:16 +0300 Subject: [PATCH] update pkgs gpkg/glib gpkg/libcairo gpkg/libexpat gpkg/libgc gpkg/nano gpkg/openssl gpkg/vulkan-icd-loader gpkg/vulkan-tools gpkg/libcurl gpkg/vulkan-volk gpkg/jsoncpp gpkg/readline gpkg/mpdecimal: fix for python-glibc to compile correctly gpkg/python-pip: recompilation gpkg/python-py3c: recompilation gpkg/python: 3.12.6 gpkg/asciidoc: recompilation Mgpkg/libxcb: recompilation gpkg/libxml2: recompilation gpkg/libxslt: recompilation gpkg/opengl: recompilation gpkg/subversion: recompilation gpkg/util-linux: recompilation gpkg/xcb-proto: recompilation gpkg/gobject-introspection: recompilation --- .github/workflows/build.yml | 2 +- gpkg/asciidoc/build.sh | 1 + gpkg/glib/build.sh | 4 +-- gpkg/gobject-introspection/build.sh | 2 +- gpkg/jsoncpp/build.sh | 4 +-- gpkg/libcairo/build.sh | 4 +-- gpkg/libcurl/build.sh | 4 +-- gpkg/libexpat/build.sh | 4 +-- gpkg/libgc/build.sh | 4 +-- gpkg/libxcb/build.sh | 1 + gpkg/libxml2/build.sh | 1 + gpkg/libxslt/build.sh | 1 + gpkg/mpdecimal/build.sh | 6 ++-- gpkg/mpdecimal/configure.patch | 11 ------- gpkg/nano/build.sh | 4 +-- gpkg/opengl/build.sh | 1 + gpkg/openssl/build.sh | 6 ++-- gpkg/python-pip/build.sh | 1 + gpkg/python-py3c/build.sh | 1 + gpkg/python/build.sh | 45 +++++++++++++++++++++++------ gpkg/python/configure.patch | 19 ------------ gpkg/python/setup.py.patch | 10 ------- gpkg/readline/build.sh | 22 +++++++++++--- gpkg/subversion/build.sh | 1 + gpkg/util-linux/build.sh | 1 + gpkg/vulkan-icd-loader/build.sh | 4 +-- gpkg/vulkan-tools/build.sh | 4 +-- gpkg/vulkan-volk/build.sh | 4 +-- gpkg/xcb-proto/build.sh | 1 + 29 files changed, 91 insertions(+), 82 deletions(-) delete mode 100644 gpkg/mpdecimal/configure.patch delete mode 100644 gpkg/python/configure.patch delete mode 100644 gpkg/python/setup.py.patch diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bceff796b..f9e569893 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: fetch-depth: 1000 - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Get files from termux-packages repository run: ./get-build-package.sh diff --git a/gpkg/asciidoc/build.sh b/gpkg/asciidoc/build.sh index 9da0e69d6..a3dbc5c7e 100644 --- a/gpkg/asciidoc/build.sh +++ b/gpkg/asciidoc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Text document format for short documents, articles, book TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="10.2.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/asciidoc/asciidoc-py3/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8e1fb9691952cc4f13357e1ef58172e566c5f88e3c44222d4a8693585f884507 TERMUX_PKG_DEPENDS="docbook-xsl-glibc, libxml2-utils-glibc, python-glibc, xsltproc-glibc" diff --git a/gpkg/glib/build.sh b/gpkg/glib/build.sh index 719de404c..30ccade8c 100644 --- a/gpkg/glib/build.sh +++ b/gpkg/glib/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="2.80.4" +TERMUX_PKG_VERSION="2.80.5" TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION%.*}/glib-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f +TERMUX_PKG_SHA256=9f23a9de803c695bbfde7e37d6626b18b9a83869689dd79019bf3ae66c3e6771 TERMUX_PKG_DEPENDS="libffi-glibc, pcre2-glibc, util-linux-glibc, zlib-glibc, openssl-glibc, libunwind-glibc" TERMUX_PKG_BUILD_DEPENDS="gobject-introspection-glibc" TERMUX_PKG_PYTHON_COMMON_DEPS="pygments, itstool, packaging, gi-docgen" diff --git a/gpkg/gobject-introspection/build.sh b/gpkg/gobject-introspection/build.sh index 48d4d88eb..c90db5b54 100644 --- a/gpkg/gobject-introspection/build.sh +++ b/gpkg/gobject-introspection/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Uniform machine readable API" TERMUX_PKG_LICENSE="LGPL-2.0, GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="1.80.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gobject-introspection/${TERMUX_PKG_VERSION%.*}/gobject-introspection-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8 TERMUX_PKG_DEPENDS="libgirepository-glibc, python-glibc" diff --git a/gpkg/jsoncpp/build.sh b/gpkg/jsoncpp/build.sh index 22b53925f..e532ed026 100644 --- a/gpkg/jsoncpp/build.sh +++ b/gpkg/jsoncpp/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.9.5 +TERMUX_PKG_VERSION=1.9.6 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 +TERMUX_PKG_SHA256=f93b6dd7ce796b13d02c108bc9f79812245a82e577581c4c9aabe57075c90ea2 TERMUX_PKG_DEPENDS="glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_SHARED_LIBS=ON diff --git a/gpkg/libcairo/build.sh b/gpkg/libcairo/build.sh index 2cc09bb1e..8b848a127 100644 --- a/gpkg/libcairo/build.sh +++ b/gpkg/libcairo/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.18.0 +TERMUX_PKG_VERSION=1.18.2 TERMUX_PKG_SRCURL=https://gitlab.freedesktop.org/cairo/cairo/-/archive/${TERMUX_PKG_VERSION}/cairo-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=abf8fba4d510086a492783c3e0828e90b32734738fd80906595617d229d02bab +TERMUX_PKG_SHA256=0b895967abfae888ecad9ace4bce475a27e1b9aaeedaaf334b97c96f13ccc604 TERMUX_PKG_DEPENDS="fontconfig-glibc, glib-glibc, libpng-glibc, libx11-glibc, libxcb-glibc, libxext-glibc, libxrender-glibc, liblzo-glibc, libpixman-glibc, zlib-glibc" TERMUX_PKG_MESON_NATIVE=true #-Dgtk_doc=true diff --git a/gpkg/libcurl/build.sh b/gpkg/libcurl/build.sh index cf38c4c44..efdfef719 100644 --- a/gpkg/libcurl/build.sh +++ b/gpkg/libcurl/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://curl.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=8.9.1 +TERMUX_PKG_VERSION=8.10.0 TERMUX_PKG_SRCURL=https://github.com/curl/curl/releases/download/curl-${TERMUX_PKG_VERSION//./_}/curl-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 +TERMUX_PKG_SHA256=e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0 TERMUX_PKG_DEPENDS="libnghttp2-glibc, libssh2-glibc, openssl-glibc (>= 3.0.3), krb5-glibc, brotli-glibc, libpsl-glibc" TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/libexpat/build.sh b/gpkg/libexpat/build.sh index 6b5db76c4..7225bbe0a 100644 --- a/gpkg/libexpat/build.sh +++ b/gpkg/libexpat/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://libexpat.github.io/ TERMUX_PKG_DESCRIPTION="An XML parser library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=2.6.2 +TERMUX_PKG_VERSION=2.6.3 TERMUX_PKG_SRCURL=https://github.com/libexpat/libexpat/releases/download/R_${TERMUX_PKG_VERSION//./_}/expat-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0 +TERMUX_PKG_SHA256=b8baef92f328eebcf731f4d18103951c61fa8c8ec21d5ff4202fb6f2198aeb2d TERMUX_PKG_DEPENDS="glibc, gcc-libs-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-docbook" diff --git a/gpkg/libgc/build.sh b/gpkg/libgc/build.sh index e7025cee9..f25cb203f 100644 --- a/gpkg/libgc/build.sh +++ b/gpkg/libgc/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative g TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="README.QUICK" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=8.2.6 +TERMUX_PKG_VERSION=8.2.8 TERMUX_PKG_SRCURL=https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc +TERMUX_PKG_SHA256=7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160 TERMUX_PKG_DEPENDS="gcc-libs-glibc" TERMUX_PKG_RM_AFTER_INSTALL="glibc/share/gc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-cplusplus" diff --git a/gpkg/libxcb/build.sh b/gpkg/libxcb/build.sh index c32634bbb..40d3e49e9 100644 --- a/gpkg/libxcb/build.sh +++ b/gpkg/libxcb/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="X11 client-side library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="1.17.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/lib/libxcb-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a59a6d55 TERMUX_PKG_DEPENDS="libxau-glibc, libxdmcp-glibc, xcb-proto-glibc" diff --git a/gpkg/libxml2/build.sh b/gpkg/libxml2/build.sh index bba648cff..28d6c45b2 100644 --- a/gpkg/libxml2/build.sh +++ b/gpkg/libxml2/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" _MAJOR_VERSION=2.13 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libxml2/${_MAJOR_VERSION}/libxml2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138 TERMUX_PKG_SETUP_PYTHON=true diff --git a/gpkg/libxslt/build.sh b/gpkg/libxslt/build.sh index 87ce4450c..c736b4380 100644 --- a/gpkg/libxslt/build.sh +++ b/gpkg/libxslt/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux-pacman" _MAJOR_VERSION=1.1 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.42 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libxslt/${_MAJOR_VERSION}/libxslt-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb TERMUX_PKG_DEPENDS="libgcrypt-glibc, libxml2-glibc, liblzma-glibc" diff --git a/gpkg/mpdecimal/build.sh b/gpkg/mpdecimal/build.sh index 39b4fdf79..b5b313481 100644 --- a/gpkg/mpdecimal/build.sh +++ b/gpkg/mpdecimal/build.sh @@ -4,14 +4,12 @@ TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE_FILE="COPYRIGHT.txt" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=4.0.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c TERMUX_PKG_DEPENDS="gcc-libs-glibc" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - if [ "$TERMUX_ARCH" = "i686" ]; then - # error of ld: undefined reference to `__stack_chk_fail_local' - CFLAGS+=" -fno-stack-protector" - fi + LD=$CC } diff --git a/gpkg/mpdecimal/configure.patch b/gpkg/mpdecimal/configure.patch deleted file mode 100644 index 17ac01744..000000000 --- a/gpkg/mpdecimal/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/configure 2024-05-14 09:51:56.647059636 +0300 -+++ src/configure.patch 2024-05-14 09:54:59.447059566 +0300 -@@ -2876,7 +2876,7 @@ - LIBNAME="libmpdec.so" - LIBSONAME="libmpdec.so.4" - LIBSHARED="libmpdec.so.4.0.0" -- CONFIGURE_LDFLAGS="-shared $FPIC -Wl,-soname,$LIBSONAME" -+ CONFIGURE_LDFLAGS="-shared $FPIC -soname $LIBSONAME" - ;; - esac - diff --git a/gpkg/nano/build.sh b/gpkg/nano/build.sh index 8a35050bd..d84738f3c 100644 --- a/gpkg/nano/build.sh +++ b/gpkg/nano/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.nano-editor.org/ TERMUX_PKG_DESCRIPTION="Small, free and friendly text editor" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=8.1 +TERMUX_PKG_VERSION=8.2 TERMUX_PKG_SRCURL=https://nano-editor.org/dist/v${TERMUX_PKG_VERSION/.*/}/nano-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=93b3e3e9155ae389fe9ccf9cb7ab380eac29602835ba3077b22f64d0f0cbe8cb +TERMUX_PKG_SHA256=d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb TERMUX_PKG_DEPENDS="ncurses-glibc, file-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-color diff --git a/gpkg/opengl/build.sh b/gpkg/opengl/build.sh index 47b564fd5..dd1d9c362 100644 --- a/gpkg/opengl/build.sh +++ b/gpkg/opengl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A metapackage for OpenGL implementation" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_DEPENDS="libglvnd-glibc, mesa-glibc" TERMUX_PKG_ANTI_BUILD_DEPENDS="mesa-glibc" diff --git a/gpkg/openssl/build.sh b/gpkg/openssl/build.sh index 82ad0448d..36ec3fba2 100644 --- a/gpkg/openssl/build.sh +++ b/gpkg/openssl/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.openssl.org/ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=3.3.1 -TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +TERMUX_PKG_VERSION=3.3.2 +TERMUX_PKG_SRCURL=https://github.com/openssl/openssl/releases/download/openssl-${TERMUX_PKG_VERSION}/openssl-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 TERMUX_PKG_DEPENDS="ca-certificates-glibc, resolv-conf, zlib-glibc, gcc-libs-glibc" TERMUX_PKG_CONFFILES="glibc/etc/ssl/openssl.cnf, glibc/etc/resolv.conf, glibc/etc/hosts" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/gpkg/python-pip/build.sh b/gpkg/python-pip/build.sh index 1c257f337..ceb79c3ba 100644 --- a/gpkg/python-pip/build.sh +++ b/gpkg/python-pip/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The PyPA recommended tool for installing Python packages TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="24.2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/pypa/pip/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e527f2366551b8483fa3a8ac2954aa79f2461e6600d917f3b6ae741d708cb982 TERMUX_PKG_DEPENDS="gcc-glibc, make-glibc, pkgconf-glibc, python-glibc (>= 3.11.1-1)" diff --git a/gpkg/python-py3c/build.sh b/gpkg/python-py3c/build.sh index 9469e331a..c4a888f65 100644 --- a/gpkg/python-py3c/build.sh +++ b/gpkg/python-py3c/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE.MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=1.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/encukou/py3c/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=abc745079ef906148817f4472c3fb4bc41d62a9ea51a746b53e09819494ac006 TERMUX_PKG_DEPENDS="python-glibc" diff --git a/gpkg/python/build.sh b/gpkg/python/build.sh index d262f1ef9..ed0753f9f 100644 --- a/gpkg/python/build.sh +++ b/gpkg/python/build.sh @@ -3,29 +3,31 @@ TERMUX_PKG_DESCRIPTION="The Python programming language" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=3.11.9 +TERMUX_PKG_VERSION=3.12.6 _MAJOR_VERSION="${TERMUX_PKG_VERSION%.*}" -TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION%rc*}/Python-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=9b1e896523fc510691126c864406d9360a3d1e986acbda59cda57b5abda45b87 +_SETUPTOOLS_VERSION=69.5.1 +TERMUX_PKG_SRCURL=(https://www.python.org/ftp/python/${TERMUX_PKG_VERSION%rc*}/Python-${TERMUX_PKG_VERSION}.tar.xz + https://github.com/pypa/setuptools/archive/refs/tags/v${_SETUPTOOLS_VERSION}.tar.gz) +TERMUX_PKG_SHA256=(1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c + 2cf4ea407b1325c2c85862d13eb31f9b57098b0ae7f94e2258aea4e634f6534f) TERMUX_PKG_DEPENDS="libbz2-glibc, libexpat-glibc, gdbm-glibc, libffi-glibc, libnsl-glibc, libxcrypt-glibc, openssl-glibc, zlib-glibc" TERMUX_PKG_BUILD_DEPENDS="sqlite-glibc, mpdecimal-glibc, llvm-glibc" TERMUX_PKG_PROVIDES="python3-glibc" -TERMUX_PKG_RM_AFTER_INSTALL="glibc/lib/python${_MAJOR_VERSION}/site-packages/*/" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { rm -rf Modules/expat - rm -r Modules/_ctypes/{darwin,libffi}* rm -rf Modules/_decimal/libmpdec + sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setuptools-${_SETUPTOOLS_VERSION}/setup.cfg - export CFLAGS="${CFLAGS/-O2/-O3}" + export CFLAGS="${CFLAGS/-O2/-O3} -ffat-lto-objects" } termux_step_configure() { local _CONF_FLAG="" - if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - _CONF_FLAG="--with-build-python=python$_MAJOR_VERSION" - fi + #if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then + # _CONF_FLAG="--with-build-python=python${_MAJOR_VERSION}" + #fi ./configure --prefix=${TERMUX_PREFIX} \ --build=${TERMUX_HOST_PLATFORM} \ @@ -41,6 +43,7 @@ termux_step_configure() { --enable-loadable-sqlite-extensions \ --without-ensurepip \ ${_CONF_FLAG} \ + ac_cv_func_link=no \ LN='ln -s' } @@ -57,3 +60,27 @@ termux_step_make_install() { install -m755 Tools/i18n/{msgfmt,pygettext}.py ${TERMUX_PREFIX}/lib/python${_MAJOR_VERSION}/Tools/i18n/ install -m755 Tools/scripts/{README,*py} ${TERMUX_PREFIX}/lib/python${_MAJOR_VERSION}/Tools/scripts/ } + +termux_step_post_make_install() { + echo README.txt > ${TERMUX_PKG_SRCDIR}/setuptools-files + ( + export TERMUX_PKG_SETUP_PYTHON=true + export TERMUX_SKIP_DEPCHECK=true + export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 + termux_step_get_dependencies_python + + cd ${TERMUX_PKG_SRCDIR}/setuptools-${_SETUPTOOLS_VERSION} + pip install --no-deps . --prefix $TERMUX_PREFIX + + pip show -f setuptools | grep "^ " | sed 's/ //' \ + | awk -F '/' '{printf $1 "\n"}' | uniq >> ${TERMUX_PKG_SRCDIR}/setuptools-files + ) +} + +termux_step_post_massage() { + for i in glibc/lib/python${_MAJOR_VERSION}/site-packages/*; do + if ! grep -q "^${i##*/}$" ${TERMUX_PKG_SRCDIR}/setuptools-files; then + rm -fr $i + fi + done +} diff --git a/gpkg/python/configure.patch b/gpkg/python/configure.patch deleted file mode 100644 index bd104aead..000000000 --- a/gpkg/python/configure.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Python-3.11.6/configure 2023-10-02 16:29:10.000000000 +0300 -+++ Python-3.11.6/configure.patch 2023-11-06 13:19:05.736786585 +0300 -@@ -9199,7 +9199,7 @@ - sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \ - sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \ - sys/statvfs.h sys/sys_domain.h sys/syscall.h sys/sysmacros.h sys/termio.h sys/time.h sys/times.h \ -- sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sys/xattr.h sysexits.h syslog.h \ -+ sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sysexits.h syslog.h \ - termios.h util.h utime.h utmp.h \ - - do : -@@ -15331,7 +15331,6 @@ - $as_echo "$ac_cv_func_link" >&6; } - if test "x$ac_cv_func_link" = xyes; then : - --$as_echo "#define HAVE_LINK 1" >>confdefs.h - - fi - diff --git a/gpkg/python/setup.py.patch b/gpkg/python/setup.py.patch deleted file mode 100644 index 947f0da73..000000000 --- a/gpkg/python/setup.py.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Python-3.11.6/setup.py 2023-10-02 16:29:10.000000000 +0300 -+++ Python-3.11.6/setup.py.patch 2023-11-03 14:01:11.037614118 +0300 -@@ -852,7 +852,6 @@ - # only change this for cross builds for 3.3, issues on Mageia - if CROSS_COMPILING: - self.add_cross_compiling_paths() -- self.add_multiarch_paths() - self.add_ldflags_cppflags() - - def init_inc_lib_dirs(self): diff --git a/gpkg/readline/build.sh b/gpkg/readline/build.sh index 5582d0d00..ac3ac40fd 100644 --- a/gpkg/readline/build.sh +++ b/gpkg/readline/build.sh @@ -4,26 +4,40 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_DEPENDS="ncurses-glibc" _MAIN_VERSION=8.2 -_PATCH_VERSION=1 +_PATCH_VERSION=13 TERMUX_PKG_VERSION=$_MAIN_VERSION.$_PATCH_VERSION -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${_MAIN_VERSION}.tar.gz +TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/readline/readline-${_MAIN_VERSION}.tar.gz TERMUX_PKG_SHA256=3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 TERMUX_PKG_CONFFILES="glibc/etc/inputrc" +TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncurses" termux_step_pre_configure() { declare -A PATCH_CHECKSUMS PATCH_CHECKSUMS[001]=bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7 + PATCH_CHECKSUMS[002]=e06503822c62f7bc0d9f387d4c78c09e0ce56e53872011363c74786c7cd4c053 + PATCH_CHECKSUMS[003]=24f587ba46b46ed2b1868ccaf9947504feba154bb8faabd4adaea63ef7e6acb0 + PATCH_CHECKSUMS[004]=79572eeaeb82afdc6869d7ad4cba9d4f519b1218070e17fa90bbecd49bd525ac + PATCH_CHECKSUMS[005]=622ba387dae5c185afb4b9b20634804e5f6c1c6e5e87ebee7c35a8f065114c99 + PATCH_CHECKSUMS[006]=c7b45ff8c0d24d81482e6e0677e81563d13c74241f7b86c4de00d239bc81f5a1 + PATCH_CHECKSUMS[007]=5911a5b980d7900aabdbee483f86dab7056851e6400efb002776a0a4a1bab6f6 + PATCH_CHECKSUMS[008]=a177edc9d8c9f82e8c19d0630ab351f3fd1b201d655a1ddb5d51c4cee197b26a + PATCH_CHECKSUMS[009]=3d9885e692e1998523fd5c61f558cecd2aafd67a07bd3bfe1d7ad5a31777a116 + PATCH_CHECKSUMS[010]=758e2ec65a0c214cfe6161f5cde3c5af4377c67d820ea01d13de3ca165f67b4c + PATCH_CHECKSUMS[011]=e0013d907f3a9e6482cc0934de1bd82ee3c3c4fd07a9646aa9899af237544dd7 + PATCH_CHECKSUMS[012]=6c8adf8ed4a2ca629f7fd11301ed6293a6248c9da0c674f86217df715efccbd3 + PATCH_CHECKSUMS[013]=1ea434957d6ec3a7b61763f1f3552dad0ebdd6754d65888b5cd6d80db3a788a8 for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do PATCHFILE=$TERMUX_PKG_CACHEDIR/readline_patch_${PATCH_NUM}.patch termux_download \ - "http://mirrors.kernel.org/gnu/readline/readline-$_MAIN_VERSION-patches/readline${_MAIN_VERSION/./}-$PATCH_NUM" \ + "https://ftp.gnu.org/gnu/readline/readline-$_MAIN_VERSION-patches/readline${_MAIN_VERSION/./}-$PATCH_NUM" \ $PATCHFILE \ ${PATCH_CHECKSUMS[$PATCH_NUM]} patch -p0 -i $PATCHFILE done + + sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf } termux_step_post_make_install() { diff --git a/gpkg/subversion/build.sh b/gpkg/subversion/build.sh index 6804cf231..1670e95de 100644 --- a/gpkg/subversion/build.sh +++ b/gpkg/subversion/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=1.14.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.apache.org/dist/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440 TERMUX_PKG_DEPENDS="gcc-libs-glibc, apr-util-glibc, serf-glibc, libexpat-glibc, libsqlite-glibc, liblz4-glibc, utf8proc-glibc, zlib-glibc" diff --git a/gpkg/util-linux/build.sh b/gpkg/util-linux/build.sh index bb0ee86ee..7d18ccb10 100644 --- a/gpkg/util-linux/build.sh +++ b/gpkg/util-linux/build.sh @@ -10,6 +10,7 @@ Documentation/licenses/COPYING.BSD-4-Clause-UC Documentation/licenses/COPYING.ISC" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=2.40.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/util-linux/util-linux/archive/refs/tags/v${TERMUX_PKG_VERSION}.zip TERMUX_PKG_SHA256=93780a9f9ccf2702e4166cbe71cba31cc65fcec688b0465828c9252fd62140ab TERMUX_PKG_DEPENDS="libcap-ng-glibc, ncurses-glibc, zlib-glibc, libpam-glibc, libsmartcols-glibc, bash-glibc" diff --git a/gpkg/vulkan-icd-loader/build.sh b/gpkg/vulkan-icd-loader/build.sh index 592b3a230..0c1dbe5dc 100644 --- a/gpkg/vulkan-icd-loader/build.sh +++ b/gpkg/vulkan-icd-loader/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.3.294 +TERMUX_PKG_VERSION=1.3.295 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Loader/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=22933596b3b4b204800193426ce55364eef194705ee29e3f18c1f567d958e33e +TERMUX_PKG_SHA256=9241b99fb70c6e172cdb8cb4c3d291c129e9499126cfe4c12aa854b71e035518 TERMUX_PKG_DEPENDS="glibc" TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, libxrandr-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/vulkan-tools/build.sh b/gpkg/vulkan-tools/build.sh index 34b46d181..68180f743 100644 --- a/gpkg/vulkan-tools/build.sh +++ b/gpkg/vulkan-tools/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.3.294 +TERMUX_PKG_VERSION=1.3.295 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3eac1a3e4991b1c6ff92b29676f1291cf7fadd249cf6f142d5900af2e3179a51 +TERMUX_PKG_SHA256=caaf5972173e986605df279b5714f4fc0295769527372ec1752b87e001a8e7cf TERMUX_PKG_DEPENDS="gcc-libs-glibc, libx11-glibc, libxcb-glibc, libwayland-glibc, vulkan-icd-loader-glibc" TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, libwayland-protocols-glibc, vulkan-volk-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/vulkan-volk/build.sh b/gpkg/vulkan-volk/build.sh index 3cf850a59..de143110c 100644 --- a/gpkg/vulkan-volk/build.sh +++ b/gpkg/vulkan-volk/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/zeux/volk TERMUX_PKG_DESCRIPTION="Meta loader for Vulkan API" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="1.3.270" +TERMUX_PKG_VERSION="1.3.295" TERMUX_PKG_SRCURL=https://github.com/zeux/volk/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=95530bc7850b0358e4bad899eb653f882ee8a08088257d90c5042cec02208f52 +TERMUX_PKG_SHA256=aea9f09c49f8a4e36738003c7aa5f08f99d68b96e4028ad9fa9039d2ee9fb251 TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, vulkan-icd-loader-glibc" TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/xcb-proto/build.sh b/gpkg/xcb-proto/build.sh index 503fc3a71..7205ea847 100644 --- a/gpkg/xcb-proto/build.sh +++ b/gpkg/xcb-proto/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="XML-XCB protocol descriptions" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="1.17.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c TERMUX_PKG_BUILD_DEPENDS="libxml2-glibc"