diff options
| author | Yoan Blanc | 2021-11-22 20:57:45 +0100 |
|---|---|---|
| committer | Yoan Blanc | 2021-11-22 20:58:27 +0100 |
| commit | 8e9ff1261199f5bfee4d39c0526e3349cbd284b0 (patch) | |
| tree | 524c27d2a6c0500b73e387a1a125ac97cde0aa8e | |
| parent | 7e2c714b1d7269057a0c26553872eefd4f374c24 (diff) | |
| download | aur-8e9ff1261199f5bfee4d39c0526e3349cbd284b0.tar.gz | |
Rebuild with patch for mpdecimal 2.5.1
Thanks hwangh95
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0004-mpdecimal-2.5.1.patch | 45 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 56 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = python37 pkgdesc = Major release 3.7 of the Python high-level programming language pkgver = 3.7.12 - pkgrel = 3 + pkgrel = 4 url = https://www.python.org/ arch = x86_64 license = custom @@ -27,11 +27,13 @@ pkgbase = python37 source = dont-make-libpython-readonly.patch source = 0002-smaller-pgo-test-suite.patch source = 0003-enable-building-with-libmpdec.patch + source = 0004-mpdecimal-2.5.1.patch validpgpkeys = 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D sha512sums = e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a sha512sums = SKIP sha512sums = 2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4 sha512sums = 10db463924402b6f1d9631424397495e8be0419bc7f9ca6cd7325216433b2dfe512b6f6669626ff05a8e05a6013613660abee59fcb86e5483558b014687bfaa1 sha512sums = 991540591e2e024d02f2a6f85a98b43ee0e270d223c66572f2d700b32d89c8afa4faa61d45d41998e108c7b1633da20f7f43b37b2d846364431ebdab921dff17 + sha512sums = 58f683cbfdc6aa84c03d068c1bc2f1d8d2c17ba4f7b632c14ab1d529d8332e767354266c3815e239427497fff1a42ec2a37739ea312d24cb76a69dcf1c98c0ad pkgname = python37 diff --git a/0004-mpdecimal-2.5.1.patch b/0004-mpdecimal-2.5.1.patch new file mode 100644 index 000000000000..47e427c62a91 --- /dev/null +++ b/0004-mpdecimal-2.5.1.patch @@ -0,0 +1,45 @@ +From dd436be488bdca2123d12d1e148d85cb6f98be5f Mon Sep 17 00:00:00 2001 +From: Stefan Krah <skrah@bytereef.org> +Date: Sun, 10 Jan 2021 16:35:48 +0100 +Subject: [PATCH] Portability fixes. + +--- + Modules/_decimal/_decimal.c | 4 ++-- + setup.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c +index 664d45a90481d..bbd540bc376e2 100644 +--- a/Modules/_decimal/_decimal.c ++++ b/Modules/_decimal/_decimal.c +@@ -3295,7 +3295,7 @@ dec_format(PyObject *dec, PyObject *args) + } + else { + size_t n = strlen(spec.dot); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) { + /* fix locale dependent non-ascii characters */ + dot = dotsep_as_utf8(spec.dot); + if (dot == NULL) { +@@ -3304,7 +3304,7 @@ dec_format(PyObject *dec, PyObject *args) + spec.dot = PyBytes_AS_STRING(dot); + } + n = strlen(spec.sep); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) { + /* fix locale dependent non-ascii characters */ + sep = dotsep_as_utf8(spec.sep); + if (sep == NULL) { +diff --git a/setup.py b/setup.py +index ddc0bd067d4e4..c547a68664e8c 100644 +--- a/setup.py ++++ b/setup.py +@@ -2199,7 +2199,7 @@ def detect_decimal(self): + undef_macros = [] + if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): + include_dirs = [] +- libraries = [':libmpdec.so.2'] ++ libraries = ['mpdec'] + sources = ['_decimal/_decimal.c'] + depends = ['_decimal/docstrings.h'] + else: @@ -10,7 +10,7 @@ pkgname=python37 pkgver=3.7.12 -pkgrel=3 +pkgrel=4 _pybasever=${pkgver%.*} _pymajver=3 pkgdesc="Major release 3.7 of the Python high-level programming language" @@ -28,12 +28,14 @@ source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz dont-make-libpython-readonly.patch 0002-smaller-pgo-test-suite.patch 0003-enable-building-with-libmpdec.patch + 0004-mpdecimal-2.5.1.patch ) sha512sums=('e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a' 'SKIP' '2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4' '10db463924402b6f1d9631424397495e8be0419bc7f9ca6cd7325216433b2dfe512b6f6669626ff05a8e05a6013613660abee59fcb86e5483558b014687bfaa1' - '991540591e2e024d02f2a6f85a98b43ee0e270d223c66572f2d700b32d89c8afa4faa61d45d41998e108c7b1633da20f7f43b37b2d846364431ebdab921dff17') + '991540591e2e024d02f2a6f85a98b43ee0e270d223c66572f2d700b32d89c8afa4faa61d45d41998e108c7b1633da20f7f43b37b2d846364431ebdab921dff17' + '58f683cbfdc6aa84c03d068c1bc2f1d8d2c17ba4f7b632c14ab1d529d8332e767354266c3815e239427497fff1a42ec2a37739ea312d24cb76a69dcf1c98c0ad') validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D') # Ned Deily (Python release signing key) <nad@python.org> prepare() { @@ -48,6 +50,10 @@ prepare() { # Backport https://bugs.python.org/issue41302 to 3.7 patch -p1 -i ../0003-enable-building-with-libmpdec.patch + # From Python38 AUR, + # https://bugs.python.org/issue41369 + patch -p1 -i ../0004-mpdecimal-2.5.1.patch + # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py |