diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/libproxy/APKBUILD | 8 | ||||
| -rw-r--r-- | user/libproxy/python3.10.patch | 58 |
2 files changed, 3 insertions, 63 deletions
diff --git a/user/libproxy/APKBUILD b/user/libproxy/APKBUILD index d0d3b6620..f3bbe23c8 100644 --- a/user/libproxy/APKBUILD +++ b/user/libproxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Zach van Rijn <me@zv.io> pkgname=libproxy -pkgver=0.4.17 +pkgver=0.4.18 pkgrel=0 pkgdesc="Library providing automatic proxy configuration management" url="https://libproxy.github.io/libproxy/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-bin py3-$pkgname:py" source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$pkgver.tar.gz libproxy-0.4.7-unistd.patch fix-includes.patch - python3.10.patch " # secfixes: @@ -59,7 +58,6 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 libproxy-0.4.17.tar.gz +sha512sums="1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 libproxy-0.4.18.tar.gz 9929c308195bc59c1b9a7ddaaf708fb831da83c5d86d7ce122cb9774c9b9b16aef3c17fb721356e33a865de1af27db493f29a99d292e1e258cd0135218cacd32 libproxy-0.4.7-unistd.patch -e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch -9f506d918c4bacbc224cf798b776a7daeb124782352270cca184c5af0f6f4cab73de724f3724e380ddd9240521e0eee46b1a22f2953d1d3026edc3926b3ff9b0 python3.10.patch" +e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch" diff --git a/user/libproxy/python3.10.patch b/user/libproxy/python3.10.patch deleted file mode 100644 index 73645cee6..000000000 --- a/user/libproxy/python3.10.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 04eeeabb42436cb58e9bac2f6c31c0fb87905a72 Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Mon, 21 Jun 2021 17:10:43 +0100 -Subject: [PATCH] python: Support Python 3.10 and above -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As suggested by Miro Hrončok, change the way that the Python interpreter -version is found. Additionally, update the static list of accepted -Python 3 versions. - -https://bugzilla.redhat.com/show_bug.cgi?id=1898060 ---- - bindings/python/python2/CMakeLists.txt | 2 +- - bindings/python/python3/CMakeLists.txt | 2 +- - cmake/FindPython3Interp.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bindings/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt -index 00df551b..f4d2b91a 100644 ---- a/bindings/python/python2/CMakeLists.txt -+++ b/bindings/python/python2/CMakeLists.txt -@@ -6,7 +6,7 @@ if(PYTHON2INTERP_FOUND) - if(NOT PYTHON2_SITEPKG_DIR) - execute_process(COMMAND - ${PYTHON2_EXECUTABLE} -- -c "import sys; print (sys.version[0:3])" -+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))" - OUTPUT_VARIABLE PYTHON2_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - -diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt -index bf87dfcc..fc3b24b2 100644 ---- a/bindings/python/python3/CMakeLists.txt -+++ b/bindings/python/python3/CMakeLists.txt -@@ -6,7 +6,7 @@ if(PYTHON3INTERP_FOUND) - if(NOT PYTHON3_SITEPKG_DIR) - execute_process(COMMAND - ${PYTHON3_EXECUTABLE} -- -c "import sys; print (sys.version[0:3])" -+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))" - OUTPUT_VARIABLE PYTHON3_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - -diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake -index 74398b2b..5b25e5af 100644 ---- a/cmake/FindPython3Interp.cmake -+++ b/cmake/FindPython3Interp.cmake -@@ -39,7 +39,7 @@ - - unset(_Python3_NAMES) - --set(_Python3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_Python3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Interp_FIND_VERSION) - if(Python3Interp_FIND_VERSION_COUNT GREATER 1) |