Date: Friday, December 17, 2021 @ 08:07:27 Author: arojas Revision: 1075904
Fix build with python 3.10 Added: 0ad/trunk/python-3.10.patch Modified: 0ad/trunk/PKGBUILD -------------------+ PKGBUILD | 10 +++++- python-3.10.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-17 08:06:55 UTC (rev 1075903) +++ PKGBUILD 2021-12-17 08:07:27 UTC (rev 1075904) @@ -13,9 +13,15 @@ 'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' 'glu' 'fmt' 'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium') makedepends=('boost' 'cmake' 'mesa' 'zip' 'libsm' 'rust') -source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -sha512sums=('e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4') +source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" + python-3.10.patch) +sha512sums=('e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4' + '42df5eb7c4a99b31365b7f15c5bcd76c978339f2837eb8bc6ec371979429d0f0a6e31e870f6851aa40fc4859cb3e82f74821a01d04b82b486342db0fa60bf55e') +prepare() { + patch -d $pkgname-$_pkgver -p1 < python-3.10.patch # Fix spidermonkey build with Python 3.10 +} + build() { cd "$pkgname-$_pkgver/build/workspaces" Added: python-3.10.patch =================================================================== --- python-3.10.patch (rev 0) +++ python-3.10.patch 2021-12-17 08:07:27 UTC (rev 1075904) @@ -0,0 +1,78 @@ +diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh +--- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh 2021-12-17 08:53:59.543315034 +0100 ++++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh 2021-12-17 08:53:34.789777469 +0100 +@@ -43,6 +43,8 @@ + # Note that this isn't quite the upstream patch to match our version. + patch -p1 < ../FixRust150.diff + ++patch -p1 < ../python-3.10.diff ++ + # Patch those separately, as they might interfere with normal behaviour. + if [ "$(uname -s)" = "FreeBSD" ]; + then +diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff +--- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff 1970-01-01 01:00:00.000000000 +0100 ++++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff 2021-12-17 09:05:09.713419684 +0100 +@@ -0,0 +1,62 @@ ++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py ++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py 2020-11-28 17:33:58.000000000 +0100 +++++ mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py 2021-12-17 08:52:07.342371513 +0100 ++@@ -9,7 +9,8 @@ ++ import sys ++ import json ++ ++-from collections import Iterable, OrderedDict +++from collections.abc import Iterable +++from collections import OrderedDict ++ from types import ModuleType ++ ++ import mozpack.path as mozpath ++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py ++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py 2020-11-28 17:33:58.000000000 +0100 +++++ mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py 2021-12-17 09:05:02.820298351 +0100 ++@@ -7,7 +7,7 @@ ++ import os ++ import re ++ import six ++-from collections import Iterable +++from collections.abc import Iterable ++ ++ ++ class Makefile(object): ++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py mozjs-78.6.0/python/mozbuild/mozbuild/util.py ++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py 2020-11-28 17:33:58.000000000 +0100 +++++ mozjs-78.6.0/python/mozbuild/mozbuild/util.py 2021-12-17 08:52:31.045908142 +0100 ++@@ -782,7 +782,7 @@ ++ self._strings = StrictOrderingOnAppendList() ++ self._children = {} ++ ++- class StringListAdaptor(collections.Sequence): +++ class StringListAdaptor(collections.abc.Sequence): ++ def __init__(self, hsl): ++ self._hsl = hsl ++ ++diff -ru mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py ++--- mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py 2020-11-28 17:34:00.000000000 +0100 +++++ mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py 2021-12-17 09:02:44.801711871 +0100 ++@@ -12,7 +12,8 @@ ++ ++ import itertools ++ import os ++-from collections import defaultdict, MutableSequence +++from collections import defaultdict +++from collections.abc import MutableSequence ++ ++ import six ++ from six import string_types ++diff -ru mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py ++--- mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py 2020-11-28 17:34:05.000000000 +0100 +++++ mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py 2021-12-17 08:58:55.798970530 +0100 ++@@ -1804,7 +1804,7 @@ ++ pass ++ else: ++ # noinspection PyProtectedMember ++- if sysconfig._get_default_scheme() == "posix_local": +++ if sysconfig.get_default_scheme() == "posix_local": ++ local_path = os.path.join(home_dir, "local") ++ if not os.path.exists(local_path): ++ os.mkdir(local_path)