diff --git a/component/python3/buildout.cfg b/component/python3/buildout.cfg index dc92197f13e1e18e3bb314982872c661dea53578..b7c5bbd4aaeecef3960c505a4d3e6aedf987d120 100644 --- a/component/python3/buildout.cfg +++ b/component/python3/buildout.cfg @@ -9,7 +9,6 @@ extends = ../libpng/buildout.cfg ../ncurses/buildout.cfg ../openssl/buildout.cfg - ../patch/buildout.cfg ../readline/buildout.cfg ../sqlite3/buildout.cfg ../xz-utils/buildout.cfg @@ -28,9 +27,6 @@ package_version_suffix = executable = @@LOCATION@@/bin/${:_buildout_section_name_} -patch-options = -p1 -patches = - ${:_profile_base_location_}/default_encoding.patch#4ad9664e622d5556b4c32b1d9cb587ff url = https://www.python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz configure-options = @@ -48,45 +44,30 @@ pre-install = mkdir profile-opt # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic, # which would otherwise load the system libmagic.so with ctypes environment = - PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s + PATH=${xz-utils:location}/bin:%(PATH)s CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib -[python3.6] -<= python3-common -version = 3.6 -package_version = 3.6.10 -md5sum = 986078f11b39074be22a199e56491d98 - [python3.7] <= python3-common version = 3.7 -package_version = 3.7.9 -md5sum = 389d3ed26b4d97c741d9e5423da1f43b -patch-options = -patches = +package_version = 3.7.13 +md5sum = 10822726f75fd7efe05a94fbd6ac2258 [python3.8] <= python3-common version = 3.8 -package_version = 3.8.9 -md5sum = 51b5bbf2ab447e66d15af4883db1c133 -patch-options = -patches = +package_version = 3.8.13 +md5sum = c4b7100dcaace9d33ab1fda9a3a038d6 [python3.9] <= python3-common version = 3.9 package_version = 3.9.13 md5sum = 5e2411217b0060828d5f923eb422a3b8 -patch-options = -patches = - [python3.10] <= python3-common version = 3.10 -package_version = 3.10.5 -md5sum = f05727cb3489aa93cd57eb561c16747b -patch-options = -patches = +package_version = 3.10.6 +md5sum = afc7e14f7118d10d1ba95ae8e2134bf0 diff --git a/component/python3/default_encoding.patch b/component/python3/default_encoding.patch deleted file mode 100644 index df524d6b4831cb6f12d7bd0fd80e9d68c39e3eb6..0000000000000000000000000000000000000000 --- a/component/python3/default_encoding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Python-3.5.3/Programs/python.c.orig 2017-01-17 08:57:53.000000000 +0100 -+++ Python-3.5.3/Programs/python.c 2017-06-08 19:30:42.927077437 +0200 -@@ -24,6 +24,9 @@ - int i, res; - char *oldloc; - -+ if (!getenv("LC_CTYPE") && !getenv("LC_ALL")) -+ setenv("LANG", "C.UTF-8", 0); -+ - argv_copy = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); - argv_copy2 = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); - if (!argv_copy || !argv_copy2) {