diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.recipe b/net-libs/miniupnpc/miniupnpc-2.2.7.recipe similarity index 60% rename from net-libs/miniupnpc/miniupnpc-2.2.3.recipe rename to net-libs/miniupnpc/miniupnpc-2.2.7.recipe index aebad41ec..452441dda 100644 --- a/net-libs/miniupnpc/miniupnpc-2.2.3.recipe +++ b/net-libs/miniupnpc/miniupnpc-2.2.7.recipe @@ -7,20 +7,22 @@ HOMEPAGE="http://miniupnp.free.fr/ https://miniupnp.tuxfamily.org/" COPYRIGHT="2005-2018 Thomas Bernard" LICENSE="BSD (3-clause)" -REVISION="4" +REVISION="1" SOURCE_URI="http://miniupnp.free.fr/files/miniupnpc-$portVersion.tar.gz https://miniupnp.tuxfamily.org/files/miniupnpc-$portVersion.tar.gz" -CHECKSUM_SHA256="dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24" -PATCHES="miniupnpc-$portVersion.patchset" +CHECKSUM_SHA256="b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86" -libVersion="2.1" -libVersionCompat="$libVersion compat >= ${libVersion%.*}" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +pythonVersion="3.10" +pythonPackage="python310" PROVIDES=" miniupnpc$secondaryArchSuffix = $portVersion + cmd:external_ip.sh$secondaryArchSuffix = $portVersion lib:libminiupnpc$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -35,6 +37,14 @@ REQUIRES_devel=" miniupnpc$secondaryArchSuffix == $portVersion base " +SUMMARY_python310="Python bindings for miniupnpc" +PROVIDES_python310=" + miniupnpc${secondaryArchSuffix}_python310 = $portVersion + " +REQUIRES_python310=" + miniupnpc$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -42,6 +52,8 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make + cmd:python$pythonVersion + setuptools_$pythonPackage " BUILD() @@ -59,11 +71,25 @@ INSTALL() { make -C build install - prepareInstalledDevelLib libminiupnpc +# GENERIC: all python_setuptools-based installs need this + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + $python setup.py build install \ + --root=/ --prefix=$prefix + + prepareInstalledDevelLib \ + libminiupnpc + fixPkgconfig packageEntries devel \ $developDir \ + $documentationDir \ $libDir/cmake + + packageEntries python310 \ + $installLocation } TEST() diff --git a/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset b/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset deleted file mode 100644 index 8a827e1ca..000000000 --- a/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset +++ /dev/null @@ -1,42 +0,0 @@ -From 895b922d86397b057cbe5610f404331ddb7c2aa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Tue, 15 Mar 2022 13:13:27 +0100 -Subject: Install fix - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0553eeb..524bea3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -221,17 +221,17 @@ endif () - - if (NOT UPNPC_NO_INSTALL) - install (FILES -- miniupnpc.h -- miniwget.h -- upnpcommands.h -- igd_desc_parse.h -- upnpreplyparse.h -- upnperrors.h -- upnpdev.h -- miniupnpctypes.h -- portlistingparse.h -- miniupnpc_declspec.h -- DESTINATION include/miniupnpc -+ include/miniupnpc.h -+ include/miniwget.h -+ include/upnpcommands.h -+ include/igd_desc_parse.h -+ include/upnpreplyparse.h -+ include/upnperrors.h -+ include/upnpdev.h -+ include/miniupnpctypes.h -+ include/portlistingparse.h -+ include/miniupnpc_declspec.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniupnpc - ) - - install(FILES miniupnpc-config.cmake --- -2.37.3 -