From d051a7f59eb190ef7d68e8ee8c714a18c62e0cbc Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Oct 11 2022 14:14:36 +0000 Subject: Update to 2.47.3 Force Python 3.10 for Fedora 37 and higher for now. https://bugs.winehq.org/show_bug.cgi?id=53400 --- diff --git a/.gitignore b/.gitignore index 412e6d1..1316c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/wine-gecko-2.47.2-src.tar.xz -/virtualenv-16.7.11.tar.gz /libffi-3.4.2.tar.gz +/wine-gecko-2.47.3-src.tar.xz diff --git a/mingw-wine-gecko-gcc11.patch b/mingw-wine-gecko-gcc11.patch index a9cdf62..d3a6185 100644 --- a/mingw-wine-gecko-gcc11.patch +++ b/mingw-wine-gecko-gcc11.patch @@ -19,26 +19,6 @@ #include #include "mozilla/Attributes.h" #include "mozilla/DebugOnly.h" ---- a/gfx/2d/BaseRect.h 2020-11-30 06:47:56.000000000 -0600 -+++ b/gfx/2d/BaseRect.h 2022-01-24 17:34:42.951126605 -0600 -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - - #include "mozilla/Assertions.h" ---- a/nsprpub/pr/src/io/prmapopt.c 2020-11-30 06:47:56.000000000 -0600 -+++ b/nsprpub/pr/src/io/prmapopt.c 2022-01-24 17:47:10.013250910 -0600 -@@ -19,6 +19,7 @@ - - #if defined(WINNT) || defined(__MINGW32__) - #include -+#include - #endif - - /* MinGW doesn't define these in its winsock.h. */ --- a/js/src/ctypes/libffi/configure 2022-01-25 15:31:21.136318541 -0600 +++ b/js/src/ctypes/libffi/configure 2022-01-27 07:20:06.853378891 -0600 @@ -22137,4 +22137,5 @@ diff --git a/mingw-wine-gecko-header.patch b/mingw-wine-gecko-header.patch new file mode 100644 index 0000000..7bd5d01 --- /dev/null +++ b/mingw-wine-gecko-header.patch @@ -0,0 +1,168 @@ +--- a/accessible/windows/uia/uiaRawElmProvider.h 2022-07-12 08:33:06.000000000 -0500 ++++ b/accessible/windows/uia/uiaRawElmProvider.h 2022-10-10 21:00:37.312691681 -0500 +@@ -10,7 +10,12 @@ + #include "objbase.h" + #include "AccessibleWrap.h" + #include "IUnknownImpl.h" +-#include "uiautomation.h" ++//#include "uiautomation.h" ++#include ++#include ++ ++// from mingw/include/uiautomationcoreapi.h ++#define UiaAppendRuntimeId 3 + + namespace mozilla { + namespace a11y { +--- a/accessible/interfaces/msaa/ISimpleDOMDocument.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/accessible/interfaces/msaa/ISimpleDOMDocument.idl 2022-10-10 21:50:49.789611875 -0500 +@@ -54,6 +54,9 @@ + cpp_quote("///////////////////////////////////////////////////////////////////////////////////////////////////////") + cpp_quote("") + cpp_quote("") ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") + + import "objidl.idl"; + import "oaidl.idl"; +--- a/accessible/interfaces/msaa/ISimpleDOMText.idl 2022-10-10 21:50:58.653700783 -0500 ++++ b/accessible/interfaces/msaa/ISimpleDOMText.idl 2022-10-10 21:48:31.824229684 -0500 +@@ -50,6 +50,9 @@ + cpp_quote("///////////////////////////////////////////////////////////////////////////////////////////////////////") + cpp_quote("") + cpp_quote("") ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") + + [object, uuid(4e747be5-2052-4265-8af0-8ecad7aad1c0)] + interface ISimpleDOMText: IUnknown +--- a/other-licenses/ia2/Accessible2.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/Accessible2.idl 2022-10-10 21:53:19.401141868 -0500 +@@ -349,6 +349,10 @@ + + **/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- other-licenses/ia2/AccessibleAction.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleAction.idl 2022-10-10 21:56:07.888866970 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleApplication.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleApplication.idl 2022-10-10 21:58:51.334540452 -0500 +@@ -51,6 +51,9 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") + + import "objidl.idl"; + import "oaidl.idl"; +--- a/other-licenses/ia2/AccessibleComponent.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleComponent.idl 2022-10-10 22:00:46.459714290 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleDocument.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleDocument.idl 2022-10-10 22:03:37.926434136 -0500 +@@ -49,6 +49,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleEditableText.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleEditableText.idl 2022-10-10 22:05:03.473292177 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleImage.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleImage.idl 2022-10-10 22:09:56.002205574 -0500 +@@ -50,6 +50,9 @@ + * Policy to indicate compliance with the IAccessible2 specification. + * + ************************************************************************/ ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") + + import "objidl.idl"; + import "oaidl.idl"; +--- a/other-licenses/ia2/AccessibleRelation.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleRelation.idl 2022-10-10 22:12:04.181447409 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleText.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleText.idl 2022-10-10 22:15:18.708332033 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; +--- a/other-licenses/ia2/AccessibleValue.idl 2022-07-12 08:33:06.000000000 -0500 ++++ b/other-licenses/ia2/AccessibleValue.idl 2022-10-10 22:18:05.236944031 -0500 +@@ -51,6 +51,10 @@ + * + ************************************************************************/ + ++cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") ++cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") ++ + import "objidl.idl"; + import "oaidl.idl"; + import "oleacc.idl"; diff --git a/mingw-wine-gecko-python310-1.patch b/mingw-wine-gecko-python310-1.patch deleted file mode 100644 index ab7b900..0000000 --- a/mingw-wine-gecko-python310-1.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -uNr wine-gecko-2.47.2.org/media/webrtc/trunk/tools/gyp/pylib/gyp/msvs_emulation.py wine-gecko-2.47.2/media/webrtc/trunk/tools/gyp/pylib/gyp/msvs_emulation.py ---- wine-gecko-2.47.2.org/media/webrtc/trunk/tools/gyp/pylib/gyp/msvs_emulation.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/media/webrtc/trunk/tools/gyp/pylib/gyp/msvs_emulation.py 2021-10-06 16:16:55.695835188 +0200 -@@ -91,7 +91,7 @@ - """Add |prefix| to |element| or each subelement if element is iterable.""" - if element is None: - return element -- if (isinstance(element, collections.Iterable) and -+ if (isinstance(element, collections.abc.Iterable) and - not isinstance(element, basestring)): - return [prefix + e for e in element] - else: -@@ -104,7 +104,7 @@ - if map is not None and element is not None: - if not callable(map): - map = map.get # Assume it's a dict, otherwise a callable to do the remap. -- if (isinstance(element, collections.Iterable) and -+ if (isinstance(element, collections.abc.Iterable) and - not isinstance(element, basestring)): - element = filter(None, [map(elem) for elem in element]) - else: -@@ -117,7 +117,7 @@ - then add |element| to it, adding each item in |element| if it's a list or - tuple.""" - if append is not None and element is not None: -- if (isinstance(element, collections.Iterable) and -+ if (isinstance(element, collections.abc.Iterable) and - not isinstance(element, basestring)): - append.extend(element) - else: -diff -uNr wine-gecko-2.47.2.org/media/webrtc/trunk/tools/gyp/test/lib/TestGyp.py wine-gecko-2.47.2/media/webrtc/trunk/tools/gyp/test/lib/TestGyp.py ---- wine-gecko-2.47.2.org/media/webrtc/trunk/tools/gyp/test/lib/TestGyp.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/media/webrtc/trunk/tools/gyp/test/lib/TestGyp.py 2021-10-06 16:16:55.759837366 +0200 -@@ -496,7 +496,7 @@ - if status is None: - kw['status'] = None - else: -- if not isinstance(status, collections.Iterable): status = (status,) -+ if not isinstance(status, collections.abc.Iterable): status = (status,) - kw['status'] = list(itertools.chain((0,), status)) - self.cmake_build(gyp_file, target, **kw) - kw['status'] = status -diff -uNr wine-gecko-2.47.2.org/python/bitstring/bitstring.py wine-gecko-2.47.2/python/bitstring/bitstring.py ---- wine-gecko-2.47.2.org/python/bitstring/bitstring.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/bitstring/bitstring.py 2021-10-06 16:16:55.789838387 +0200 -@@ -1286,7 +1286,7 @@ - data = bytearray((s + 7) // 8) - self._datastore = ByteStore(data, s, 0) - return -- if isinstance(s, collections.Iterable): -+ if isinstance(s, collections.abc.Iterable): - # Evaluate each item as True or False and set bits to 1 or 0. - self._setbin_unsafe(''.join(str(int(bool(x))) for x in s)) - return -@@ -3487,7 +3487,7 @@ - if pos is None: - self._invert_all() - return -- if not isinstance(pos, collections.Iterable): -+ if not isinstance(pos, collections.abc.Iterable): - pos = (pos,) - length = self.len - -@@ -3575,7 +3575,7 @@ - bytesizes.append(PACK_CODE_SIZE[f]) - else: - bytesizes.extend([PACK_CODE_SIZE[f[-1]]] * int(f[:-1])) -- elif isinstance(fmt, collections.Iterable): -+ elif isinstance(fmt, collections.abc.Iterable): - bytesizes = fmt - for bytesize in bytesizes: - if not isinstance(bytesize, numbers.Integral) or bytesize < 0: -diff -uNr wine-gecko-2.47.2.org/python/bitstring/test/test_bitstream.py wine-gecko-2.47.2/python/bitstring/test/test_bitstream.py ---- wine-gecko-2.47.2.org/python/bitstring/test/test_bitstream.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/bitstring/test/test_bitstream.py 2021-10-06 16:16:55.791838455 +0200 -@@ -3456,7 +3456,7 @@ - self.assertEqual(s.len, 17) - - def testInitFromIterable(self): -- self.assertTrue(isinstance(range(10), collections.Iterable)) -+ self.assertTrue(isinstance(range(10), collections.abc.Iterable)) - s = ConstBitStream(range(12)) - self.assertEqual(s, '0x7ff') - -diff -uNr wine-gecko-2.47.2.org/python/mach/mach/config.py wine-gecko-2.47.2/python/mach/mach/config.py ---- wine-gecko-2.47.2.org/python/mach/mach/config.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mach/mach/config.py 2021-10-06 16:16:55.838840055 +0200 -@@ -246,7 +246,7 @@ - cls.config_settings[section][option] = meta - - --class ConfigSettings(collections.Mapping): -+class ConfigSettings(collections.abc.Mapping): - """Interface for configuration settings. - - This is the main interface to the configuration. -@@ -292,7 +292,7 @@ - will result in exceptions being raised. - """ - -- class ConfigSection(collections.MutableMapping, object): -+ class ConfigSection(collections.abc.MutableMapping, object): - """Represents an individual config section.""" - def __init__(self, config, name, settings): - object.__setattr__(self, '_config', config) -diff -uNr wine-gecko-2.47.2.org/python/mach/mach/decorators.py wine-gecko-2.47.2/python/mach/mach/decorators.py ---- wine-gecko-2.47.2.org/python/mach/mach/decorators.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mach/mach/decorators.py 2021-10-06 16:16:55.841840157 +0200 -@@ -151,7 +151,7 @@ - 'Conditions argument must take a list ' + \ - 'of functions. Found %s instead.' - -- if not isinstance(command.conditions, collections.Iterable): -+ if not isinstance(command.conditions, collections.abc.Iterable): - msg = msg % (command.name, type(command.conditions)) - raise MachError(msg) - -diff -uNr wine-gecko-2.47.2.org/python/mach/mach/main.py wine-gecko-2.47.2/python/mach/mach/main.py ---- wine-gecko-2.47.2.org/python/mach/mach/main.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mach/mach/main.py 2021-10-06 16:16:55.840840123 +0200 -@@ -6,7 +6,7 @@ - # (mach). It is packaged as a module because everything is a library. - - --from collections import Iterable -+from collections.abc import Iterable - - import argparse - import codecs -diff -uNr wine-gecko-2.47.2.org/python/mozbuild/mozbuild/backend/configenvironment.py wine-gecko-2.47.2/python/mozbuild/mozbuild/backend/configenvironment.py ---- wine-gecko-2.47.2.org/python/mozbuild/mozbuild/backend/configenvironment.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mozbuild/mozbuild/backend/configenvironment.py 2021-10-06 16:16:55.798838694 +0200 -@@ -7,7 +7,7 @@ - import os - import sys - --from collections import Iterable -+from collections.abc import Iterable - - import mozpack.path as mozpath - -diff -uNr wine-gecko-2.47.2.org/python/mozbuild/mozbuild/makeutil.py wine-gecko-2.47.2/python/mozbuild/mozbuild/makeutil.py ---- wine-gecko-2.47.2.org/python/mozbuild/mozbuild/makeutil.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mozbuild/mozbuild/makeutil.py 2021-10-06 16:16:55.797838660 +0200 -@@ -6,7 +6,7 @@ - - import os - import re --from collections import Iterable -+from collections.abc import Iterable - - - class Makefile(object): -diff -uNr wine-gecko-2.47.2.org/python/mozbuild/mozbuild/util.py wine-gecko-2.47.2/python/mozbuild/mozbuild/util.py ---- wine-gecko-2.47.2.org/python/mozbuild/mozbuild/util.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/mozbuild/mozbuild/util.py 2021-10-06 16:16:55.800838762 +0200 -@@ -598,7 +598,7 @@ - self._strings = StrictOrderingOnAppendList() - self._children = {} - -- class StringListAdaptor(collections.Sequence): -+ class StringListAdaptor(collections.abc.Sequence): - def __init__(self, hsl): - self._hsl = hsl - -diff -uNr wine-gecko-2.47.2.org/python/requests/requests/packages/urllib3/_collections.py wine-gecko-2.47.2/python/requests/requests/packages/urllib3/_collections.py ---- wine-gecko-2.47.2.org/python/requests/requests/packages/urllib3/_collections.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/requests/requests/packages/urllib3/_collections.py 2021-10-06 16:16:55.858840736 +0200 -@@ -1,5 +1,5 @@ - from __future__ import absolute_import --from collections import Mapping, MutableMapping -+from collections.abc import Mapping, MutableMapping - try: - from threading import RLock - except ImportError: # Platform-specific: No threads available -diff -uNr wine-gecko-2.47.2.org/python/requests/requests/sessions.py wine-gecko-2.47.2/python/requests/requests/sessions.py ---- wine-gecko-2.47.2.org/python/requests/requests/sessions.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/requests/requests/sessions.py 2021-10-06 16:16:55.867841042 +0200 -@@ -9,7 +9,7 @@ - - """ - import os --from collections import Mapping -+from collections.abc import Mapping - from datetime import datetime - - from .auth import _basic_auth_str -diff -uNr wine-gecko-2.47.2.org/python/virtualenv/virtualenv.py wine-gecko-2.47.2/python/virtualenv/virtualenv.py ---- wine-gecko-2.47.2.org/python/virtualenv/virtualenv.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/python/virtualenv/virtualenv.py 2021-10-06 17:03:17.323147059 +0200 -@@ -1010,13 +1010,13 @@ - - if is_darwin: - prefixes.extend(( -- os.path.join("/Library/Python", sys.version[:3], "site-packages"), -+ os.path.join("/Library/Python", sys.version[:4], "site-packages"), - os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"), -+ os.path.join("~", "Library", "Python", sys.version[:4], "site-packages"), - # Python 2.6 no-frameworks -- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"), -+ os.path.join("~", ".local", "lib","python", sys.version[:4], "site-packages"), - # System Python 2.7 on OSX Mountain Lion -- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages"))) -+ os.path.join("~", "Library", "Python", sys.version[:4], "lib", "python", "site-packages"))) - - if hasattr(sys, 'real_prefix'): - prefixes.append(sys.real_prefix) -@@ -1060,7 +1060,7 @@ - # special-case custom readline.so on OS X, but not for pypy: - if modname == 'readline' and sys.platform == 'darwin' and not ( - is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))): -- dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so') -+ dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:4], 'readline.so') - elif modname == 'readline' and sys.platform == 'win32': - # special-case for Windows, where readline is not a - # standard module, though it may have been installed in -@@ -1524,7 +1524,7 @@ - except ImportError: - pass - else: -- 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) -@@ -1552,7 +1552,7 @@ - - logger.debug('This system uses lib64; symlinking lib64 to lib') - -- assert os.path.basename(lib_dir) == 'python%s' % sys.version[:3], ( -+ assert os.path.basename(lib_dir) == 'python%s' % sys.version[:4], ( - "Unexpected python lib dir: %r" % lib_dir) - lib_parent = os.path.dirname(lib_dir) - top_level = os.path.dirname(lib_parent) -@@ -1610,7 +1610,7 @@ - fixup_pth_and_egg_link(home_dir) - ## FIXME: need to fix up distutils.cfg - --OK_ABS_SCRIPTS = ['python', 'python%s' % sys.version[:3], -+OK_ABS_SCRIPTS = ['python', 'python%s' % sys.version[:4], - 'activate', 'activate.bat', 'activate_this.py', - 'activate.fish', 'activate.csh'] - -@@ -1620,7 +1620,7 @@ - '%s /c' % os.path.normcase(os.environ.get('COMSPEC', 'cmd.exe')), - '', '.exe') - else: -- new_shebang_args = ('/usr/bin/env', sys.version[:3], '') -+ new_shebang_args = ('/usr/bin/env', sys.version[:4], '') - - # This is what we expect at the top of scripts: - shebang = '#!%s' % os.path.normcase(os.path.join( -diff -uNr wine-gecko-2.47.2.org/testing/marionette/client/marionette_driver/wait.py wine-gecko-2.47.2/testing/marionette/client/marionette_driver/wait.py ---- wine-gecko-2.47.2.org/testing/marionette/client/marionette_driver/wait.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/testing/marionette/client/marionette_driver/wait.py 2021-10-06 16:16:55.442826578 +0200 -@@ -76,7 +76,7 @@ - - exceptions = [] - if ignored_exceptions is not None: -- if isinstance(ignored_exceptions, collections.Iterable): -+ if isinstance(ignored_exceptions, collections.abc.Iterable): - exceptions.extend(iter(ignored_exceptions)) - else: - exceptions.append(ignored_exceptions) -diff -uNr wine-gecko-2.47.2.org/testing/mozbase/versioninfo.py wine-gecko-2.47.2/testing/mozbase/versioninfo.py ---- wine-gecko-2.47.2.org/testing/mozbase/versioninfo.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/testing/mozbase/versioninfo.py 2021-10-06 16:16:55.500828552 +0200 -@@ -9,7 +9,7 @@ - from commit messages. - """ - --from collections import Iterable -+from collections.abc import Iterable - from distutils.version import StrictVersion - import argparse - import os -diff -uNr wine-gecko-2.47.2.org/testing/web-platform/tests/tools/html5lib/html5lib/trie/_base.py wine-gecko-2.47.2/testing/web-platform/tests/tools/html5lib/html5lib/trie/_base.py ---- wine-gecko-2.47.2.org/testing/web-platform/tests/tools/html5lib/html5lib/trie/_base.py 2020-11-30 13:47:56.000000000 +0100 -+++ wine-gecko-2.47.2/testing/web-platform/tests/tools/html5lib/html5lib/trie/_base.py 2021-10-06 16:16:55.358823720 +0200 -@@ -1,6 +1,6 @@ - - --from collections import Mapping -+from collections.abc import Mapping - - - class Trie(Mapping): diff --git a/mingw-wine-gecko-python310-2.patch b/mingw-wine-gecko-python310-2.patch deleted file mode 100644 index cfcd8b6..0000000 --- a/mingw-wine-gecko-python310-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py b/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py -index b268d229a483..4f9cb0eca728 100644 ---- a/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py -+++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py -@@ -494,7 +494,7 @@ def uniquer(seq, idfun=None): - - - # Based on http://code.activestate.com/recipes/576694/. --class OrderedSet(collections.MutableSet): -+class OrderedSet(collections.abc.MutableSet): - def __init__(self, iterable=None): - self.end = end = [] - end += [None, end, end] # sentinel node for doubly linked list -diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py -index 3bc7c3a60541..cd5b8268358c 100644 ---- a/testing/mozbase/manifestparser/manifestparser/filters.py -+++ b/testing/mozbase/manifestparser/manifestparser/filters.py -@@ -8,7 +8,8 @@ dictionary of values, and returns a new iterable of test objects. It is - possible to define custom filters if the built-in ones are not enough. - """ - --from collections import defaultdict, MutableSequence -+from collections import defaultdict -+from collections.abc import MutableSequence - import itertools - import os - diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec index c1ef710..6563935 100644 --- a/mingw-wine-gecko.spec +++ b/mingw-wine-gecko.spec @@ -4,21 +4,20 @@ %undefine _auto_set_build_flags Name: mingw-wine-gecko -Version: 2.47.2 -Release: 6%{?dist} +Version: 2.47.3 +Release: 1%{?dist} Summary: Gecko library required for Wine License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://wiki.winehq.org/Gecko Source0: http://dl.winehq.org/wine/wine-gecko/%{version}/wine-gecko-%{version}-src.tar.xz -Source1: https://github.com/pypa/virtualenv/archive/refs/tags/16.7.11.tar.gz#/virtualenv-16.7.11.tar.gz # https://bugs.winehq.org/show_bug.cgi?id=52455 -Source2: https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz -# https://bugs.winehq.org/show_bug.cgi?id=51918 -Patch0: %{name}-python310-1.patch -Patch1: %{name}-python310-2.patch +Source1: https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz # https://bugs.winehq.org/show_bug.cgi?id=52085 -Patch2: %{name}-gcc11.patch +Patch1: %{name}-gcc11.patch +#Patch2: %%{name}-python311.patch +# bad hack for mingw header issue +Patch3: %{name}-header.patch BuildArch: noarch @@ -50,7 +49,11 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git BuildRequires: pkgconfig +%if 0%{?fedora} > 36 +BuildRequires: python3.10 +%else BuildRequires: python3 +%endif BuildRequires: perl-Getopt-Long BuildRequires: yasm BuildRequires: zip @@ -76,17 +79,14 @@ Windows Gecko library required for Wine. %prep %setup -q -c -n wine-gecko-%{version} -%patch0 -p0 -cd wine-gecko-%{version}/python/virtualenv/ -rm -rf ./* -gzip -dc %{SOURCE1} | tar -xf - --strip-components=1 -cd ../.. +cd wine-gecko-%{version}/ pushd js/src/ctypes/libffi rm -rf ./* -gzip -dc %{SOURCE2} | tar -xf - --strip-components=1 +gzip -dc %{SOURCE1} | tar -xf - --strip-components=1 popd %patch1 -p1 -%patch2 -p1 +#patch2 -p1 +%patch3 -p1 # fix nsprpub cross compile detection sed -i 's,cross_compiling=.*$,cross_compiling=yes,' nsprpub/configure @@ -106,11 +106,17 @@ echo "export CFLAGS=\"-DWINE_GECKO_SRC\"" >> wine/mozconfig-common cp wine/mozconfig-common wine/mozconfig-common.build # ... and build + +%if 0%{?fedora} > 36 +python3.10 -m venv env +source env/bin/activate +%endif + # Make jobserver is broken under Python 3.10 -#TOOLCHAIN_PREFIX=i686-w64-mingw32- MAKEOPTS="%{_smp_mflags}" ./wine/make_package --msi-package -win32 +#TOOLCHAIN_PREFIX=i686-w64-mingw32- MAKEOPTS="%%{_smp_mflags}" ./wine/make_package --msi-package -win32 TOOLCHAIN_PREFIX=i686-w64-mingw32- MAKEOPTS="-j1" ./wine/make_package --msi-package -win32 -#TOOLCHAIN_PREFIX=x86_64-w64-mingw32- MAKEOPTS="%{_smp_mflags}" ./wine/make_package --msi-package -win64 +#TOOLCHAIN_PREFIX=x86_64-w64-mingw32- MAKEOPTS="%%{_smp_mflags}" ./wine/make_package --msi-package -win64 TOOLCHAIN_PREFIX=x86_64-w64-mingw32- MAKEOPTS="-j1" ./wine/make_package --msi-package -win64 %install @@ -133,6 +139,9 @@ install -p -m 0644 wine-gecko-%{version}-x86_64/dist/wine-gecko-%{version}-x86_6 %{_datadir}/wine/gecko/wine-gecko-%{version}-x86_64.msi %changelog +* Tue Oct 11 2022 Michael Cronenworth - 2.47.3-1 +- version upgrade + * Fri Mar 25 2022 Sandro Mani - 2.47.2-6 - Rebuild with mingw-gcc-12 diff --git a/sources b/sources index 66c45f0..b0732e5 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (wine-gecko-2.47.2-src.tar.xz) = 88bcd25b96a40a027bb7d37106790cbdd7a8769a814a8aad733d86f57a898790f19e3d256567256590f12afb40f82e773c9bf9ac8c6ae3e01b79e96ec08e6d26 -SHA512 (virtualenv-16.7.11.tar.gz) = 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42 +SHA512 (wine-gecko-2.47.3-src.tar.xz) = 55726430f872f8627c75d90c1e572fb82b8373a079e53db10e67ea63b4bc77ceb38988d8f5b1dd769886b8c73576491ac3663e5a2be314b804f903598f37be9d SHA512 (libffi-3.4.2.tar.gz) = 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1