From 464a44c5d9ce4e8932fed88e5150ce5a8a080996 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sun, 12 Oct 2025 06:05:47 +0000 Subject: [PATCH] bump(main/uwsgi): 2.0.31 Remove hunks related to xml2-config path. It was replaced with pkgconfig. https://github.com/unbit/uwsgi/commit/a87b13c17128c04d6ae4a4328d8e9a89c3656adb --- packages/uwsgi/build.sh | 5 ++--- packages/uwsgi/uwsgiconfig.py.patch | 34 ++--------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/packages/uwsgi/build.sh b/packages/uwsgi/build.sh index 04dcf53fe0..6eaaee46f8 100644 --- a/packages/uwsgi/build.sh +++ b/packages/uwsgi/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://projects.unbit.it/uwsgi TERMUX_PKG_DESCRIPTION="uWSGI application server container" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.0.30" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="2.0.31" TERMUX_PKG_SRCURL=https://github.com/unbit/uwsgi/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c3374cd064ce7e11d364cd869230737fe4f54373098e634c319cea6973cc7a61 +TERMUX_PKG_SHA256=d5fb7b058a6e037cad1f0fb8841de56d673d80a3af036bba830143b60c67c3dc TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-sysv-semaphore, libandroid-utimes, libcap, libcrypt, libjansson, libuuid, libxml2, openssl, pcre2, python" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/uwsgi/uwsgiconfig.py.patch b/packages/uwsgi/uwsgiconfig.py.patch index fd333e00e3..7b0065f2e7 100644 --- a/packages/uwsgi/uwsgiconfig.py.patch +++ b/packages/uwsgi/uwsgiconfig.py.patch @@ -1,6 +1,5 @@ -diff -uNr uwsgi-2.0.25.1/uwsgiconfig.py uwsgi-2.0.25.1.mod/uwsgiconfig.py ---- uwsgi-2.0.25.1/uwsgiconfig.py 2024-04-15 22:43:55.000000000 +0300 -+++ uwsgi-2.0.25.1.mod/uwsgiconfig.py 2024-04-17 14:08:43.743475152 +0300 +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py @@ -730,7 +730,7 @@ if not self.include_path: raise @@ -37,32 +36,3 @@ diff -uNr uwsgi-2.0.25.1/uwsgiconfig.py uwsgi-2.0.25.1.mod/uwsgiconfig.py self.libs.append('-luuid') if self.get('append_version'): -@@ -1315,10 +1315,10 @@ - - if self.get('xml'): - if self.get('xml') == 'auto': -- xmlconf = spcall('xml2-config --libs') -+ xmlconf = spcall('sh @TERMUX_PREFIX@/bin/xml2-config --libs') - if xmlconf and uwsgi_os != 'Darwin': - self.libs.append(xmlconf) -- xmlconf = spcall("xml2-config --cflags") -+ xmlconf = spcall("sh @TERMUX_PREFIX@/bin/xml2-config --cflags") - self.cflags.append(xmlconf) - self.cflags.append("-DUWSGI_XML -DUWSGI_XML_LIBXML2") - self.gcc_list.append('core/xmlconf') -@@ -1329,13 +1329,13 @@ - self.gcc_list.append('core/xmlconf') - report['xml'] = 'expat' - elif self.get('xml') == 'libxml2': -- xmlconf = spcall('xml2-config --libs') -+ xmlconf = spcall('sh @TERMUX_PREFIX@/bin/xml2-config --libs') - if xmlconf is None: - print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML") - sys.exit(1) - else: - self.libs.append(xmlconf) -- xmlconf = spcall("xml2-config --cflags") -+ xmlconf = spcall("sh @TERMUX_PREFIX@/bin/xml2-config --cflags") - if xmlconf is None: - print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML") - sys.exit(1)