haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-16 00:30:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

sip: update to version 6.7.11, support Python 3.10. (#9464)

Browse Source 
Recipe cleanups/fixes.
This commit is contained in:
OscarL
2023-09-20 06:50:12 -03:00
committed by GitHub
parent ca078798bf
commit cc0acf96d8
2 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-python/sip/patches/sip-6.7.9.patchset → dev-python/sip/patches/sip-6.7.11.patchset
View File

@@ -1,11 +1,11 @@
From 4fdd942a49577984bcc84acf1f7b7e7025d458ba Mon Sep 17 00:00:00 2001
From a5b67fff1944aa8180f12f290892920b208a0906 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 21 Nov 2021 00:01:45 +0100
Subject: use get_python_inc
diff --git a/sipbuild/project.py b/sipbuild/project.py
index 6a12fba..84c8171 100644
index 60a3e4f..92f910e 100644
--- a/sipbuild/project.py
+++ b/sipbuild/project.py
@@ -22,6 +22,7 @@
@@ -16,7 +16,7 @@ index 6a12fba..84c8171 100644
import os
import packaging
import shutil
@@ -78,7 +79,7 @@ class Project(AbstractProject, Configurable):
@@ -73,7 +74,7 @@ class Project(AbstractProject, Configurable):
Option('py_debug', option_type=bool),
# The name of the directory containing Python.h.
@@ -26,5 +26,5 @@ index 6a12fba..84c8171 100644
# The name of the target Python platform.
Option('py_platform'),
--
2.30.2
2.37.3

82
dev-python/sip/sip-6.7.9.recipe → dev-python/sip/sip-6.7.11.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="GNU GPL v2
SIP"
REVISION="1"
SOURCE_URI="https://pypi.python.org/packages/source/s/sip/sip-$portVersion.tar.gz"
CHECKSUM_SHA256="35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17"
CHECKSUM_SHA256="f0dc3287a0b172e5664931c87847750d47e4fdcda4fe362b514af8edd655b469"
SOURCE_DIR="sip-$portVersion"
PATCHES="sip-$portVersion.patchset"
@@ -26,13 +26,6 @@ fi
PROVIDES="
sip$secondaryArchSuffix = $portVersion
cmd:sip = $portVersion
cmd:sip_build
cmd:sip_distinfo
cmd:sip_install
cmd:sip_module
cmd:sip_sdist
cmd:sip_wheel
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -46,31 +39,49 @@ BUILD_PREREQUIRES="
cmd:make
"
PYTHON_PACKAGES=(python39)
PYTHON_VERSIONS=(3.9)
PYTHON_PACKAGES=(python39 python310)
PYTHON_VERSIONS=(3.9 3.10)
defaultVersion=3.10
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
maybe_sipNoSuffix=
if [ "$targetArchitecture" = "x86_gcc2" ]; then
maybe_sipNoSuffix="sip_$pythonPackage = $portVersion"
eval "PROVIDES_${pythonPackage}=\"
sip${secondaryArchSuffix}_$pythonPackage = $portVersion
cmd:sip_$pythonVersion = $portVersion
cmd:sip_build_$pythonVersion = $portVersion
cmd:sip_distinfo_$pythonVersion = $portVersion
cmd:sip_install_$pythonVersion = $portVersion
cmd:sip_module_$pythonVersion = $portVersion
cmd:sip_sdist_$pythonVersion = $portVersion
cmd:sip_wheel_$pythonVersion = $portVersion
\""
if [ $pythonVersion = $defaultVersion ]; then
eval "PROVIDES_${pythonPackage}+=\"
cmd:sip = $portVersion
cmd:sip_build = $portVersion
cmd:sip_distinfo = $portVersion
cmd:sip_install = $portVersion
cmd:sip_module = $portVersion
cmd:sip_sdist = $portVersion
cmd:sip_wheel = $portVersion
\""
fi
eval "
PROVIDES_${pythonPackage}=\"
sip${secondaryArchSuffix}_$pythonPackage = $portVersion
$maybe_sipNoSuffix
\"
REQUIRES_$pythonPackage=\"
haiku$secondaryArchSuffix
cmd:python$pythonVersion
packaging_$pythonPackage
ply_$pythonPackage
setuptools_$pythonPackage
toml_$pythonPackage
\"
"
if [ "$targetArchitecture" = x86_gcc2 ]; then
eval "PROVIDES_${pythonPackage}+=\"
sip_$pythonPackage = $portVersion
\""
fi
eval "REQUIRES_$pythonPackage=\"
haiku$secondaryArchSuffix
packaging_$pythonPackage
ply_$pythonPackage
setuptools_$pythonPackage
tomli_$pythonPackage # for Python < 3.11
cmd:python$pythonVersion
\""
BUILD_REQUIRES+="
build_$pythonPackage
@@ -91,10 +102,25 @@ INSTALL()
python=python$pythonVersion
rm -rf dist
$python -m build --wheel --no-isolation --skip-dependency-check
$python -m installer --prefix=$prefix dist/*.whl
# Version suffix all the scripts
for f in $commandBinDir/*; do
mv $f $f-$pythonVersion
done
# And provide suffix-less symlinks for the default version
if [ $pythonVersion = $defaultVersion ]; then
for f in $commandBinDir/*; do
ln -sr $f ${f%-$pythonVersion}
done
fi
packageEntries $pythonPackage \
"$prefix/lib/$python"
$prefix/lib/python* \
$commandBinDir
done
}