summaryrefslogtreecommitdiff
path: root/lang/python
diff options
context:
space:
mode:
authorJosef Schlehofer <pepe.schlehofer@gmail.com>2022-10-11 17:55:38 +0200
committerGitHub <noreply@github.com>2022-10-11 17:55:38 +0200
commit0c3732deebca15442d1ee2d4031643f385da6889 (patch)
tree6bdbdeeeaa27585b6b0b3766aee94f276b5ee0eb /lang/python
parent964e59d385ca986fedced9848ffd1a491c123358 (diff)
parente9ddc479f9a77b9d173081bbc57cd805b24942d8 (diff)
Merge pull request #19584 from paper42/python3-update-master
python3: update to 3.10.7
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/python3-version.mk6
-rw-r--r--lang/python/python3/Makefile4
-rw-r--r--lang/python/python3/patches/004-do-not-write-bytes-codes.patch2
-rw-r--r--lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch2
4 files changed, 7 insertions, 7 deletions
diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
index fe4654726..d8e72df19 100644
--- a/lang/python/python3-version.mk
+++ b/lang/python/python3-version.mk
@@ -8,12 +8,12 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=10
-PYTHON3_VERSION_MICRO:=5
+PYTHON3_VERSION_MICRO:=7
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
PYTHON3_PIP_PKG_RELEASE:=1
-PYTHON3_SETUPTOOLS_VERSION:=58.1.0
-PYTHON3_PIP_VERSION:=22.0.4
+PYTHON3_SETUPTOOLS_VERSION:=63.2.0
+PYTHON3_PIP_VERSION:=22.2.2
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 003653cc1..37604fd89 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
include ../python3-version.mk
PKG_NAME:=python3
-PKG_RELEASE:=2
+PKG_RELEASE:=1
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486
+PKG_HASH:=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=PSF-2.0
diff --git a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
index c012d0cb4..40b4e5b0c 100644
--- a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
+++ b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
@@ -1,6 +1,6 @@
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
-@@ -154,7 +154,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
+@@ -163,7 +163,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
int Py_FrozenFlag = 0; /* Needed by getpath.c */
int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */
diff --git a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
index 18ec0de72..a2bb0fba0 100644
--- a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
+++ b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
-@@ -832,7 +832,8 @@ class PyBuildExt(build_ext):
+@@ -831,7 +831,8 @@ class PyBuildExt(build_ext):
# only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()