diff --git a/libs/newt/Makefile b/libs/newt/Makefile index d1e3cdc0a8..91add766ea 100644 --- a/libs/newt/Makefile +++ b/libs/newt/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=newt -PKG_VERSION:=0.52.24 +PKG_VERSION:=0.52.25 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://releases.pagure.org/newt -PKG_HASH:=5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb +PKG_HASH:=ef0ca9ee27850d1a5c863bb7ff9aa08096c9ed312ece9087b30f3a426828de82 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=LGPL-2.0-only diff --git a/libs/newt/patches/0001-Revert-install-python-modules-to-purelib-and-platlib.patch b/libs/newt/patches/0001-Revert-install-python-modules-to-purelib-and-platlib.patch new file mode 100644 index 0000000000..63fdc54dac --- /dev/null +++ b/libs/newt/patches/0001-Revert-install-python-modules-to-purelib-and-platlib.patch @@ -0,0 +1,30 @@ +From ce2b86fe32047f0c2d59273bf3ca5bbafd7f740a Mon Sep 17 00:00:00 2001 +From: Alexandru Ardelean +Date: Mon, 23 Mar 2026 16:51:22 +0200 +Subject: [PATCH] Revert "install python modules to purelib and platlib" + +This reverts commit ecd43ab512e707f6e7873368871b517ed3206859. +--- + Makefile.in | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -161,13 +161,10 @@ endif + + install-py: _snack.$(SOEXT) + ifneq ($(PYTHONVERS),) +- @for ver in $(PYTHONVERS); do \ +- PLATLIB=`$$ver -c "import sysconfig; print(sysconfig.get_path('platlib'))"`; \ +- [ -d $(instroot)/$$PLATLIB ] || install -m 755 -d $(instroot)/$$PLATLIB ;\ +- echo install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$$PLATLIB;\ +- install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$$PLATLIB;\ +- echo install -m 644 snack.py $(instroot)/$$PLATLIB;\ +- install -m 644 snack.py $(instroot)/$$PLATLIB;\ ++ for ver in $(PYTHONVERS); do \ ++ [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ ++ install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\ ++ install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ + done + endif + diff --git a/libs/newt/patches/002-use-target-ar-python-config.patch b/libs/newt/patches/002-use-target-ar-python-config.patch index 479567e8c6..715e45749d 100644 --- a/libs/newt/patches/002-use-target-ar-python-config.patch +++ b/libs/newt/patches/002-use-target-ar-python-config.patch @@ -1,9 +1,9 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -84,12 +84,7 @@ showkey: showkey.o $(LIBNEWT) - +@@ -85,12 +85,7 @@ showkey: showkey.o $(LIBNEWT) _snack.$(SOEXT): snack.c $(LIBNEWTSH) - @[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS); do \ + ifneq ($(PYTHONVERS),) + @for ver in $(PYTHONVERS); do \ - pyconfig=$$ver-config; \ - if ! $$pyconfig --cflags > /dev/null 2>&1 && \ - python-config --cflags > /dev/null 2>&1; then \ @@ -13,13 +13,4 @@ + pyconfig=$(PYTHON_CONFIG_PATH)/$$ver-config; \ mkdir -p $$ver; \ PCFLAGS=`$$pyconfig --cflags`; \ - PIFLAGS=`$$pyconfig --includes`; \ -@@ -109,7 +104,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE - $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) - - $(LIBNEWT): $(LIBOBJS) -- ar rv $@ $^ -+ $(AR) rv $@ $^ - - newt.o $(SHAREDDIR)/newt.o: newt.c Makefile - + PLDFLAGS=`$$pyconfig --ldflags --embed || $$pyconfig --ldflags`; \