From 4dde459717d0f2ca31a9a2431e033ecc263b4b6a77beabc89857ffa3f57769ff Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Wed, 5 Sep 2018 04:31:00 +0000 Subject: [PATCH] Accepting request 632993 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/632993 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=172 --- webkit2gtk3-boo1088932-a11y-state-set.patch | 31 +- webkit2gtk3-python3.patch | 547 +++++++++++--------- webkit2gtk3.changes | 116 +++++ webkit2gtk3.spec | 26 +- webkitgtk-2.20.5.tar.xz | 3 - webkitgtk-2.20.5.tar.xz.asc | 6 - webkitgtk-2.22.0.tar.xz | 3 + webkitgtk-2.22.0.tar.xz.asc | 6 + webkitgtk-typelib-sharelib-link.patch | 13 - 9 files changed, 451 insertions(+), 300 deletions(-) delete mode 100644 webkitgtk-2.20.5.tar.xz delete mode 100644 webkitgtk-2.20.5.tar.xz.asc create mode 100644 webkitgtk-2.22.0.tar.xz create mode 100644 webkitgtk-2.22.0.tar.xz.asc delete mode 100644 webkitgtk-typelib-sharelib-link.patch diff --git a/webkit2gtk3-boo1088932-a11y-state-set.patch b/webkit2gtk3-boo1088932-a11y-state-set.patch index e2e9fb5..7afb909 100644 --- a/webkit2gtk3-boo1088932-a11y-state-set.patch +++ b/webkit2gtk3-boo1088932-a11y-state-set.patch @@ -1,7 +1,8 @@ -diff -urp webkitgtk-2.20.1.orig/Source/WebCore/accessibility/AccessibilityObject.cpp webkitgtk-2.20.1/Source/WebCore/accessibility/AccessibilityObject.cpp ---- webkitgtk-2.20.1.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-04-09 07:00:57.000000000 -0500 -+++ webkitgtk-2.20.1/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-04-10 21:07:52.446048647 -0500 -@@ -1771,7 +1771,7 @@ void AccessibilityObject::updateBackingS +Index: webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp +=================================================================== +--- webkitgtk-2.21.5.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-03 11:11:27.000000000 +0200 ++++ webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-24 11:54:06.402075029 +0200 +@@ -1783,7 +1783,7 @@ void AccessibilityObject::updateBackingS // Updating the layout may delete this object. RefPtr protectedThis(this); if (auto* document = this->document()) { @@ -10,10 +11,11 @@ diff -urp webkitgtk-2.20.1.orig/Source/WebCore/accessibility/AccessibilityObject document->updateLayoutIgnorePendingStylesheets(); } updateChildrenIfNecessary(); -diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.20.1/Source/WebCore/dom/Document.cpp ---- webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp 2018-03-05 05:36:37.000000000 -0600 -+++ webkitgtk-2.20.1/Source/WebCore/dom/Document.cpp 2018-04-10 21:07:52.454048680 -0500 -@@ -1940,11 +1940,10 @@ bool Document::needsStyleRecalc() const +Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp +=================================================================== +--- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.cpp 2018-07-20 08:09:06.000000000 +0200 ++++ webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp 2018-07-24 11:54:06.434075417 +0200 +@@ -1936,11 +1936,10 @@ bool Document::needsStyleRecalc() const return false; } @@ -27,7 +29,7 @@ diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.20.1 bool isAssertionDisabled = ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable(); return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess() || isAssertionDisabled; } -@@ -1967,7 +1966,7 @@ bool Document::updateStyleIfNeeded() +@@ -1963,7 +1962,7 @@ bool Document::updateStyleIfNeeded() } // The early exit above for !needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks(). @@ -36,7 +38,7 @@ diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.20.1 resolveStyle(); return true; -@@ -1983,7 +1982,7 @@ void Document::updateLayout() +@@ -1979,7 +1978,7 @@ void Document::updateLayout() ASSERT_NOT_REACHED(); return; } @@ -45,10 +47,11 @@ diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.20.1 RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView()); -diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.h webkitgtk-2.20.1/Source/WebCore/dom/Document.h ---- webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.h 2018-03-05 04:11:41.000000000 -0600 -+++ webkitgtk-2.20.1/Source/WebCore/dom/Document.h 2018-04-10 21:07:52.454048680 -0500 -@@ -1253,6 +1253,7 @@ public: +Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.h +=================================================================== +--- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.h 2018-07-20 08:09:06.000000000 +0200 ++++ webkitgtk-2.21.5/Source/WebCore/dom/Document.h 2018-07-24 11:54:06.434075417 +0200 +@@ -1293,6 +1293,7 @@ public: bool inStyleRecalc() const { return m_inStyleRecalc; } bool inRenderTreeUpdate() const { return m_inRenderTreeUpdate; } diff --git a/webkit2gtk3-python3.patch b/webkit2gtk3-python3.patch index c294152..518d19b 100644 --- a/webkit2gtk3-python3.patch +++ b/webkit2gtk3-python3.patch @@ -1,7 +1,8 @@ -diff -ur webkitgtk-2.19.91.orig/Source/cmake/WebKitCommon.cmake webkitgtk-2.19.91/Source/cmake/WebKitCommon.cmake ---- webkitgtk-2.19.91.orig/Source/cmake/WebKitCommon.cmake 2018-02-19 01:45:33.000000000 -0600 -+++ webkitgtk-2.19.91/Source/cmake/WebKitCommon.cmake 2018-03-02 16:23:17.684067947 -0600 -@@ -21,9 +21,6 @@ +Index: webkitgtk-2.21.5/Source/cmake/WebKitCommon.cmake +=================================================================== +--- webkitgtk-2.21.5.orig/Source/cmake/WebKitCommon.cmake 2018-07-03 11:11:27.000000000 +0200 ++++ webkitgtk-2.21.5/Source/cmake/WebKitCommon.cmake 2018-07-24 11:54:06.378074739 +0200 +@@ -21,9 +21,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON) find_package(PerlModules COMPONENTS JSON::PP REQUIRED) find_package(PythonInterp 2.7.0 REQUIRED) @@ -11,10 +12,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/cmake/WebKitCommon.cmake webkitgtk-2.19.9 # We cannot check for RUBY_FOUND because it is set only when the full package is installed and # the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py webkitgtk-2.19.91/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2018-03-02 16:25:53.748926795 -0600 -@@ -550,10 +550,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2018-07-24 11:54:06.378074739 +0200 +@@ -550,10 +550,10 @@ class UdOpcodeTables(object): entries = tbl.entries() for k, e in entries: if isinstance(e, UdOpcodeTable): @@ -27,10 +29,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/disassembler/udis86/ud_opc printWalk(self.root) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files webkitgtk-2.19.91/Source/JavaScriptCore/generate-bytecode-files ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/generate-bytecode-files 2018-03-02 16:23:17.688067969 -0600 -@@ -94,6 +94,12 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/generate-bytecode-files +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/generate-bytecode-files 2018-05-23 16:18:48.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/generate-bytecode-files 2018-07-24 11:54:06.378074739 +0200 +@@ -94,6 +94,12 @@ def openOrExit(path, mode): print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror)) exit(1) @@ -43,20 +46,21 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we def hashFile(file): sha1 = hashlib.sha1() file.seek(0) -@@ -112,31 +118,31 @@ +@@ -112,31 +118,31 @@ def toCpp(name): def writeInstructionAccessor(bytecodeHFile, typeName, name): -- bytecodeHFile.write(" {0}& {1}() {{ return *reinterpret_cast<{0}*>(&m_{1}); }}\n".format(typeName, name)) -- bytecodeHFile.write(" const {0}& {1}() const {{ return *reinterpret_cast(&m_{1}); }}\n".format(typeName, name)) -+ dowrite(bytecodeHFile, " {0}& {1}() {{ return *reinterpret_cast<{0}*>(&m_{1}); }}\n".format(typeName, name)) -+ dowrite(bytecodeHFile, " const {0}& {1}() const {{ return *reinterpret_cast(&m_{1}); }}\n".format(typeName, name)) +- bytecodeHFile.write(" {0}& {1}() {{ return *bitwise_cast<{0}*>(&m_{1}); }}\n".format(typeName, name)) +- bytecodeHFile.write(" const {0}& {1}() const {{ return *bitwise_cast(&m_{1}); }}\n".format(typeName, name)) ++ dowrite(bytecodeHFile, " {0}& {1}() {{ return *bitwise_cast<{0}*>(&m_{1}); }}\n".format(typeName, name)) ++ dowrite(bytecodeHFile, " const {0}& {1}() const {{ return *bitwise_cast(&m_{1}); }}\n".format(typeName, name)) def writeInstructionMember(bytecodeHFile, typeName, name): - bytecodeHFile.write(" std::aligned_storage::type m_{1};\n".format(typeName, name)) +- bytecodeHFile.write(" static_assert(sizeof({0}) <= sizeof(Instruction), \"Size of {0} shouldn't be bigger than an Instruction.\");\n".format(typeName, name)) + dowrite(bytecodeHFile, " std::aligned_storage::type m_{1};\n".format(typeName, name)) - ++ dowrite(bytecodeHFile, " static_assert(sizeof({0}) <= sizeof(Instruction), \"Size of {0} shouldn't be bigger than an Instruction.\");\n".format(typeName, name)) def writeStruct(bytecodeHFile, bytecode): - bytecodeHFile.write("struct {0} {{\n".format(toCpp(bytecode["name"]))) @@ -85,7 +89,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we if __name__ == "__main__": -@@ -220,25 +226,25 @@ +@@ -220,25 +226,25 @@ if __name__ == "__main__": print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) if bytecodeHFilename: @@ -122,7 +126,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we firstMacro = True defaultLength = 1 if "defaultLength" in section: -@@ -247,7 +253,7 @@ +@@ -247,7 +253,7 @@ if __name__ == "__main__": bytecodeNum = 0 for bytecode in section["bytecodes"]: if not firstMacro: @@ -131,7 +135,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we length = defaultLength if "length" in bytecode: -@@ -256,39 +262,39 @@ +@@ -256,39 +262,39 @@ if __name__ == "__main__": # Add one for the opcode length = len(bytecode["offsets"]) + 1 @@ -167,7 +171,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we bytecodeNum = bytecodeNum + 1 - bytecodeHFile.write("\n") -+ dowrite(bytecodeHFile, "\n") ++ dowrite(bytecodeHFile, "\n") if initASMFileName and section['emitInASMFile']: prefix = "" @@ -179,10 +183,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/generate-bytecode-files we initASMBytecodeNum = initASMBytecodeNum + 1 if bytecodeHFilename: -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2018-03-03 10:29:27.006362019 -0600 -@@ -28,8 +28,8 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2018-07-24 11:54:06.378074739 +0200 +@@ -28,8 +28,8 @@ import logging import os.path import re @@ -193,10 +198,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-03-03 10:29:27.042362171 -0600 -@@ -30,8 +30,8 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-07-24 11:54:06.378074739 +0200 +@@ -30,8 +30,8 @@ import string import re from string import Template @@ -207,7 +213,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -52,7 +52,7 @@ +@@ -52,7 +52,7 @@ class CppAlternateBackendDispatcherHeade sections = [] sections.append(self.generate_license()) sections.append(Template(CppTemplates.AlternateDispatchersHeaderPrelude).substitute(None, **template_args)) @@ -216,10 +222,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(CppTemplates.AlternateDispatchersHeaderPostlude).substitute(None, **template_args)) return '\n\n'.join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-03-03 10:29:27.110362457 -0600 -@@ -30,10 +30,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-07-24 11:54:06.378074739 +0200 +@@ -30,10 +30,10 @@ import re import string from string import Template @@ -234,7 +241,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ class CppBackendDispatcherHeaderGenerato return "%sBackendDispatchers.h" % self.protocol_name() def domains_to_generate(self): @@ -243,7 +250,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): typedefs = [('String', 'ErrorString')] -@@ -62,8 +62,8 @@ +@@ -62,8 +62,8 @@ class CppBackendDispatcherHeaderGenerato sections.append(Template(CppTemplates.HeaderPrelude).substitute(None, **header_args)) if self.model().framework.setting('alternate_dispatchers', False): sections.append(self._generate_alternate_handler_forward_declarations_for_domains(domains)) @@ -254,7 +261,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(CppTemplates.HeaderPostlude).substitute(None, **header_args)) return "\n\n".join(sections) -@@ -198,7 +198,7 @@ +@@ -198,7 +198,7 @@ class CppBackendDispatcherHeaderGenerato commands = self.commands_for_domain(domain) if len(commands) > 0: declarations.append('private:') @@ -263,10 +270,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ declaration_args = { 'domainName': domain.domain_name, -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-03-03 10:29:27.210362879 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-07-24 11:54:06.378074739 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -281,7 +289,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -45,7 +45,7 @@ +@@ -45,7 +45,7 @@ class CppBackendDispatcherImplementation return "%sBackendDispatchers.cpp" % self.protocol_name() def domains_to_generate(self): @@ -290,7 +298,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): secondary_includes = self._generate_secondary_header_includes() -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ class CppBackendDispatcherImplementation sections.append(self.generate_license()) sections.append(Template(CppTemplates.ImplementationPrelude).substitute(None, **header_args)) sections.append("\n".join(map(self._generate_handler_class_destructor_for_domain, self.domains_to_generate()))) @@ -299,10 +307,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(CppTemplates.ImplementationPostlude).substitute(None, **header_args)) return "\n\n".join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-03-03 10:29:27.250363047 -0600 -@@ -30,10 +30,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-07-24 11:54:06.378074739 +0200 +@@ -30,10 +30,10 @@ import re import string from string import Template @@ -317,7 +326,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ class CppFrontendDispatcherHeaderGenerat return "%sFrontendDispatchers.h" % self.protocol_name() def domains_to_generate(self): @@ -326,7 +335,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): header_args = { -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ class CppFrontendDispatcherHeaderGenerat sections = [] sections.append(self.generate_license()) sections.append(Template(CppTemplates.HeaderPrelude).substitute(None, **header_args)) @@ -335,10 +344,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(CppTemplates.HeaderPostlude).substitute(None, **header_args)) return "\n\n".join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-03-03 10:29:27.286363199 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-07-24 11:54:06.378074739 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -353,7 +363,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -45,7 +45,7 @@ +@@ -45,7 +45,7 @@ class CppFrontendDispatcherImplementatio return "%sFrontendDispatchers.cpp" % self.protocol_name() def domains_to_generate(self): @@ -362,7 +372,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): header_args = { -@@ -56,7 +56,7 @@ +@@ -56,7 +56,7 @@ class CppFrontendDispatcherImplementatio sections = [] sections.append(self.generate_license()) sections.append(Template(CppTemplates.ImplementationPrelude).substitute(None, **header_args)) @@ -371,10 +381,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(CppTemplates.ImplementationPostlude).substitute(None, **header_args)) return "\n\n".join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-03-03 10:29:27.418363755 -0600 -@@ -31,10 +31,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-07-24 11:54:06.378074739 +0200 +@@ -31,10 +31,10 @@ import string from operator import methodcaller from string import Template @@ -389,7 +400,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -62,8 +62,8 @@ +@@ -62,8 +62,8 @@ class CppProtocolTypesHeaderGenerator(Cp sections.append(self._generate_forward_declarations(domains)) sections.append(self._generate_typedefs(domains)) sections.extend(self._generate_enum_constant_value_conversion_methods()) @@ -400,7 +411,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(self._generate_forward_declarations_for_binding_traits()) sections.extend(self._generate_declarations_for_enum_conversion_methods()) sections.append('} // namespace Protocol') -@@ -87,8 +87,8 @@ +@@ -87,8 +87,8 @@ class CppProtocolTypesHeaderGenerator(Cp for domain in domains: declaration_types = [decl.type for decl in self.type_declarations_for_domain(domain)] @@ -411,7 +422,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sorted(object_types, key=methodcaller('raw_name')) sorted(enum_types, key=methodcaller('raw_name')) -@@ -113,8 +113,8 @@ +@@ -113,8 +113,8 @@ class CppProtocolTypesHeaderGenerator(Cp """ % '\n\n'.join(sections) def _generate_typedefs(self, domains): @@ -422,7 +433,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(sections) == 0: return '' -@@ -125,8 +125,8 @@ +@@ -125,8 +125,8 @@ class CppProtocolTypesHeaderGenerator(Cp def _generate_typedefs_for_domain(self, domain): type_declarations = self.type_declarations_for_domain(domain) @@ -433,7 +444,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(primitive_declarations) == 0 and len(array_declarations) == 0: return '' -@@ -186,7 +186,7 @@ +@@ -186,7 +186,7 @@ class CppProtocolTypesHeaderGenerator(Cp elif isinstance(type_declaration.type, ObjectType): sections.append(self._generate_class_for_object_declaration(type_declaration, domain)) @@ -442,7 +453,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(sections) == 0: return '' -@@ -200,9 +200,9 @@ +@@ -200,9 +200,9 @@ class CppProtocolTypesHeaderGenerator(Cp if len(type_declaration.type_members) == 0: return '' @@ -455,7 +466,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ object_name = type_declaration.type_name lines = [] -@@ -261,7 +261,7 @@ +@@ -261,7 +261,7 @@ class CppProtocolTypesHeaderGenerator(Cp else: return ' ' + line @@ -464,7 +475,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ return '\n'.join(indented_lines) def _generate_struct_for_enum_type(self, enum_name, enum_type): -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ class CppProtocolTypesHeaderGenerator(Cp def _generate_builder_state_enum(self, type_declaration): lines = [] @@ -473,7 +484,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ enum_values = [] lines.append(' enum {') -@@ -343,7 +343,7 @@ +@@ -343,7 +343,7 @@ class CppProtocolTypesHeaderGenerator(Cp for domain in self.domains_to_generate(): type_declarations = self.type_declarations_for_domain(domain) @@ -482,7 +493,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for type_declaration in declarations_to_generate: for type_member in type_declaration.type_members: -@@ -394,8 +394,8 @@ +@@ -392,8 +392,8 @@ class CppProtocolTypesHeaderGenerator(Cp for domain in self.domains_to_generate(): type_declarations = self.type_declarations_for_domain(domain) declaration_types = [decl.type for decl in type_declarations] @@ -493,10 +504,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(object_types) + len(enum_types) == 0: continue -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-03-03 10:29:27.494364075 -0600 -@@ -30,10 +30,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-07-24 11:54:06.378074739 +0200 +@@ -30,10 +30,10 @@ import string from string import Template from operator import methodcaller @@ -511,7 +523,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -65,8 +65,8 @@ +@@ -65,8 +65,8 @@ class CppProtocolTypesImplementationGene sections.append('namespace Protocol {') sections.extend(self._generate_enum_mapping_and_conversion_methods(domains)) sections.append(self._generate_open_field_names()) @@ -522,7 +534,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append('} // namespace Protocol') sections.append(Template(CppTemplates.ImplementationPostlude).substitute(None, **header_args)) -@@ -128,8 +128,8 @@ +@@ -128,8 +128,8 @@ class CppProtocolTypesImplementationGene type_declarations = self.type_declarations_for_domain(domain) declaration_types = [decl.type for decl in type_declarations] @@ -533,7 +545,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(object_types) + len(enum_types) == 0: return '' -@@ -156,8 +156,8 @@ +@@ -156,8 +156,8 @@ class CppProtocolTypesImplementationGene sections = [] sections.append('namespace %s {' % self.helpers_namespace()) sections.extend(self._generate_enum_mapping()) @@ -544,7 +556,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(sections) == 1: return [] # No declarations to emit, just the namespace. -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ class CppProtocolTypesImplementationGene lines = [] for domain in self.domains_to_generate(): type_declarations = self.type_declarations_for_domain(domain) @@ -553,7 +565,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ open_members = Generator.open_fields(type_declaration) for type_member in sorted(open_members, key=lambda member: member.member_name): field_name = '::'.join(['Inspector', 'Protocol', domain.domain_name, ucfirst(type_declaration.type_name), ucfirst(type_member.member_name)]) -@@ -179,7 +179,7 @@ +@@ -179,7 +179,7 @@ class CppProtocolTypesImplementationGene def _generate_builders_for_domain(self, domain): sections = [] type_declarations = self.type_declarations_for_domain(domain) @@ -562,7 +574,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for type_declaration in declarations_to_generate: for type_member in type_declaration.type_members: -@@ -200,8 +200,8 @@ +@@ -200,8 +200,8 @@ class CppProtocolTypesImplementationGene return Template(CppTemplates.ProtocolObjectRuntimeCast).substitute(None, **args) def _generate_assertion_for_object_declaration(self, object_declaration): @@ -573,10 +585,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ should_count_properties = not Generator.type_has_open_fields(object_declaration.type) lines = [] -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py 2018-03-03 10:29:27.534364244 -0600 -@@ -30,9 +30,9 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py 2018-07-24 11:54:06.382074787 +0200 +@@ -30,9 +30,9 @@ import logging import string from string import Template @@ -589,7 +602,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -46,16 +46,16 @@ +@@ -46,16 +46,16 @@ class JSBackendCommandsGenerator(Generat def should_generate_domain(self, domain): type_declarations = self.type_declarations_for_domain(domain) @@ -609,7 +622,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ return "\n\n".join(sections) def generate_domain(self, domain): -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ class JSBackendCommandsGenerator(Generat commands = self.commands_for_domain(domain) events = self.events_for_domain(domain) @@ -618,10 +631,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if len(events) > 0 or has_async_commands: lines.append('InspectorBackend.register%(domain)sDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "%(domain)s");' % args) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-03-03 10:29:27.574364412 -0600 -@@ -30,11 +30,11 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -30,11 +30,11 @@ import string import re from string import Template @@ -638,7 +652,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ class ObjCBackendDispatcherHeaderGenerat return '%sBackendDispatchers.h' % self.protocol_name() def domains_to_generate(self): @@ -647,7 +661,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): headers = [ -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ class ObjCBackendDispatcherHeaderGenerat sections = [] sections.append(self.generate_license()) sections.append(Template(ObjCTemplates.BackendDispatcherHeaderPrelude).substitute(None, **header_args)) @@ -656,10 +670,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.BackendDispatcherHeaderPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2018-03-03 10:29:27.650364732 -0600 -@@ -30,11 +30,11 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2018-07-24 11:54:06.382074787 +0200 +@@ -30,11 +30,11 @@ import string import re from string import Template @@ -676,7 +691,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ class ObjCBackendDispatcherImplementatio return '%sBackendDispatchers.mm' % self.protocol_name() def domains_to_generate(self): @@ -685,7 +700,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): secondary_headers = [ -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ class ObjCBackendDispatcherImplementatio sections = [] sections.append(self.generate_license()) sections.append(Template(ObjCTemplates.BackendDispatcherImplementationPrelude).substitute(None, **header_args)) @@ -694,7 +709,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.BackendDispatcherImplementationPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -@@ -114,7 +114,7 @@ +@@ -114,7 +114,7 @@ class ObjCBackendDispatcherImplementatio if command.return_parameters: lines.append(' Ref resultObject = JSON::Object::create();') @@ -703,7 +718,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for parameter in required_pointer_parameters: var_name = ObjCGenerator.identifier_to_objc_identifier(parameter.parameter_name) lines.append(' THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(%s, @"%s");' % (var_name, var_name)) -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ class ObjCBackendDispatcherImplementatio if objc_array_class and objc_array_class.startswith(self.objc_prefix()): lines.append(' THROW_EXCEPTION_FOR_BAD_TYPE_IN_ARRAY(%s, [%s class]);' % (var_name, objc_array_class)) @@ -712,10 +727,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for parameter in optional_pointer_parameters: var_name = ObjCGenerator.identifier_to_objc_identifier(parameter.parameter_name) lines.append(' THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(%s, @"%s");' % (var_name, var_name)) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2018-03-03 10:29:27.674364834 -0600 -@@ -29,9 +29,9 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,9 +29,9 @@ import logging import string from string import Template @@ -728,10 +744,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2018-03-03 10:29:27.714365002 -0600 -@@ -29,9 +29,9 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,9 +29,9 @@ import logging import string from string import Template @@ -744,10 +761,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2018-03-03 10:29:27.766365221 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -762,7 +780,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -45,7 +45,7 @@ +@@ -45,7 +45,7 @@ class ObjCFrontendDispatcherImplementati return '%sEventDispatchers.mm' % self.protocol_name() def domains_to_generate(self): @@ -771,7 +789,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): secondary_headers = [ -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ class ObjCFrontendDispatcherImplementati sections = [] sections.append(self.generate_license()) sections.append(Template(ObjCTemplates.ImplementationPrelude).substitute(None, **header_args)) @@ -780,7 +798,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.ImplementationPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -@@ -100,7 +100,7 @@ +@@ -100,7 +100,7 @@ class ObjCFrontendDispatcherImplementati lines.append(' const FrontendRouter& router = _controller->frontendRouter();') lines.append('') @@ -789,7 +807,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for parameter in required_pointer_parameters: var_name = ObjCGenerator.identifier_to_objc_identifier(parameter.parameter_name) lines.append(' THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(%s, @"%s");' % (var_name, var_name)) -@@ -108,7 +108,7 @@ +@@ -108,7 +108,7 @@ class ObjCFrontendDispatcherImplementati if objc_array_class and objc_array_class.startswith(self.objc_prefix()): lines.append(' THROW_EXCEPTION_FOR_BAD_TYPE_IN_ARRAY(%s, [%s class]);' % (var_name, objc_array_class)) @@ -798,10 +816,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ for parameter in optional_pointer_parameters: var_name = ObjCGenerator.identifier_to_objc_identifier(parameter.parameter_name) lines.append(' THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(%s, @"%s");' % (var_name, var_name)) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2018-03-03 10:29:27.850365575 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -816,7 +835,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -60,9 +60,9 @@ +@@ -60,9 +60,9 @@ class ObjCHeaderGenerator(ObjCGenerator) } domains = self.domains_to_generate() @@ -829,7 +848,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ # FIXME: Web Inspector: Reduce unnecessary enums/types generated in ObjC Protocol Interfaces # Currently we generate enums/types for all types in the type_domains. For the built-in -@@ -72,14 +72,14 @@ +@@ -72,14 +72,14 @@ class ObjCHeaderGenerator(ObjCGenerator) sections = [] sections.append(self.generate_license()) sections.append(Template(ObjCTemplates.HeaderPrelude).substitute(None, **header_args)) @@ -849,7 +868,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.HeaderPostlude).substitute(None)) return '\n\n'.join(sections) -@@ -171,8 +171,8 @@ +@@ -171,8 +171,8 @@ class ObjCHeaderGenerator(ObjCGenerator) lines.append('- (instancetype)initWithPayload:(NSDictionary *)payload;') lines.append('- (instancetype)initWithProtocolObject:(RWIProtocolJSONObject *)jsonObject;') @@ -860,10 +879,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if required_members: lines.append(self._generate_init_method_for_required_members(domain, declaration, required_members)) for member in required_members: -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2018-03-03 10:29:27.870365659 -0600 -@@ -29,9 +29,9 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,9 +29,9 @@ import logging import string from string import Template @@ -876,7 +896,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -55,12 +55,12 @@ +@@ -55,12 +55,12 @@ class ObjCInternalHeaderGenerator(ObjCGe 'includes': '\n'.join(['#import ' + header for header in sorted(headers)]), } @@ -891,10 +911,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.GenericHeaderPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2018-03-03 10:29:27.930365912 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2018-06-25 08:30:04.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -909,7 +930,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ class ObjCProtocolTypeConversionsHeaderG return '%sTypeConversions.h' % self.protocol_name() def domains_to_generate(self): @@ -918,7 +939,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): headers = [ -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ class ObjCProtocolTypeConversionsHeaderG sections.append(Template(ObjCTemplates.TypeConversionsHeaderPrelude).substitute(None, **header_args)) sections.append(Template(ObjCTemplates.TypeConversionsHeaderStandard).substitute(None)) sections.append(self._generate_enum_conversion_for_platforms()) @@ -927,10 +948,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.TypeConversionsHeaderPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2018-03-03 10:29:27.974366097 -0600 -@@ -28,10 +28,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2018-07-24 11:54:06.382074787 +0200 +@@ -28,10 +28,10 @@ import logging import string from string import Template @@ -945,7 +967,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ class ObjCProtocolTypeConversionsImpleme return '%sTypeConversions.mm' % self.protocol_name() def domains_to_generate(self): @@ -954,10 +976,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): secondary_headers = [ -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2018-03-03 10:29:28.046366401 -0600 -@@ -29,10 +29,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,10 +29,10 @@ import logging import string from string import Template @@ -972,7 +995,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ class ObjCProtocolTypesImplementationGen return '%sTypes.mm' % self.protocol_name() def domains_to_generate(self): @@ -981,7 +1004,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def generate_output(self): secondary_headers = [ -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ class ObjCProtocolTypesImplementationGen sections = [] sections.append(self.generate_license()) sections.append(Template(ObjCTemplates.ImplementationPrelude).substitute(None, **header_args)) @@ -990,7 +1013,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ sections.append(Template(ObjCTemplates.ImplementationPostlude).substitute(None, **header_args)) return '\n\n'.join(sections) -@@ -95,7 +95,7 @@ +@@ -95,7 +95,7 @@ class ObjCProtocolTypesImplementationGen lines.append('') lines.append(self._generate_init_method_for_payload(domain, declaration)) lines.append(self._generate_init_method_for_protocol_object(domain, declaration)) @@ -999,7 +1022,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if required_members: lines.append('') lines.append(self._generate_init_method_for_required_members(domain, declaration, required_members)) -@@ -167,7 +167,7 @@ +@@ -167,7 +167,7 @@ class ObjCProtocolTypesImplementationGen lines.append(' return nil;') lines.append('') @@ -1008,10 +1031,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ if required_pointer_members: for member in required_pointer_members: var_name = ObjCGenerator.identifier_to_objc_identifier(member.member_name) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generator.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generator.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2018-02-19 04:47:53.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2018-03-03 10:29:28.178366957 -0600 -@@ -29,8 +29,8 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generator.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2018-07-24 11:54:06.382074787 +0200 +@@ -29,8 +29,8 @@ import os.path import re from string import Template @@ -1022,7 +1046,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -140,7 +140,7 @@ +@@ -140,7 +140,7 @@ class Generator: # These methods are overridden by subclasses. def non_supplemental_domains(self): @@ -1031,7 +1055,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def domains_to_generate(self): return self.non_supplemental_domains() -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ class Generator: fields = set(_TYPES_WITH_OPEN_FIELDS.get(type_declaration.type.qualified_name(), [])) if not fields: return type_declaration.type_members @@ -1040,7 +1064,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def type_needs_shape_assertions(self, _type): if not hasattr(self, "_types_needing_shape_assertions"): -@@ -189,7 +189,7 @@ +@@ -189,7 +189,7 @@ class Generator: # set of types will not be automatically regenerated on subsequent calls to # Generator.types_needing_shape_assertions(). def calculate_types_requiring_shape_assertions(self, domains): @@ -1049,7 +1073,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log.debug("> Calculating types that need shape assertions (eligible domains: %s)" % ", ".join(domain_names)) # Mutates the passed-in set; this simplifies checks to prevent infinite recursion. -@@ -245,7 +245,7 @@ +@@ -245,7 +245,7 @@ class Generator: for _type in all_types: if not isinstance(_type, EnumType): continue @@ -1058,7 +1082,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ def _assign_encoding_for_enum_value(self, enum_value): if enum_value in self._enum_value_encodings: -@@ -279,7 +279,7 @@ +@@ -279,7 +279,7 @@ class Generator: return _ALWAYS_SPECIALCASED_ENUM_VALUE_LOOKUP_TABLE[match.group(1).upper()] # Split on hyphen, introduce camelcase, and force uppercasing of acronyms. @@ -1067,9 +1091,10 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ return re.sub(re.compile(regex, re.IGNORECASE), replaceCallback, "".join(subwords)) @staticmethod -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2018-03-03 10:27:16.885813621 -0600 +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2018-07-24 11:54:06.382074787 +0200 @@ -1,25 +1,25 @@ # Required for Python to search this directory for module files @@ -1118,10 +1143,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ +from .generate_objc_protocol_types_implementation import * +from .generate_objc_protocol_type_conversions_header import * +from .generate_objc_protocol_type_conversions_implementation import * -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/models.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/models.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2018-03-03 10:29:28.370367765 -0600 -@@ -35,7 +35,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/models.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2018-07-24 11:54:06.382074787 +0200 +@@ -35,7 +35,7 @@ def ucfirst(str): def find_duplicates(l): @@ -1130,9 +1156,10 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ _FRAMEWORK_CONFIG_MAP = { -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2018-02-19 01:45:15.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2018-03-03 10:29:28.534368456 -0600 +Index: webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2018-07-24 11:54:06.382074787 +0200 @@ -24,8 +24,8 @@ # THE POSSIBILITY OF SUCH DAMAGE. @@ -1144,7 +1171,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ log = logging.getLogger('global') -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ _OBJC_IDENTIFIER_RENAME_MAP = { 'id': 'identifier', # Page.Frame.id, Runtime.ExecutionContextDescription.id, Debugger.BreakpointAction.id } @@ -1153,10 +1180,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/inspector/scripts/codegen/ class ObjCTypeCategory: -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py 2018-03-03 10:31:53.878980553 -0600 -@@ -158,7 +158,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py 2018-07-24 11:54:06.382074787 +0200 +@@ -158,7 +158,7 @@ extern const JSC::ConstructAbility s_%(c lines = [] lines.append("#define %(macroPrefix)s_FOREACH_BUILTIN_FUNCTION_PRIVATE_GLOBAL_NAME(macro) \\" % args) @@ -1165,10 +1193,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ functions.sort(key=lambda x: x.function_name) for function in functions: function_args = { -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2018-03-03 10:31:53.878980553 -0600 -@@ -36,7 +36,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2018-07-24 11:54:06.386074836 +0200 +@@ -36,7 +36,7 @@ log = logging.getLogger('global') class BuiltinsInternalsWrapperHeaderGenerator(BuiltinsGenerator): def __init__(self, model): BuiltinsGenerator.__init__(self, model) @@ -1177,10 +1206,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ def output_filename(self): return "%sJSBuiltinInternals.h" % self.model().framework.setting('namespace') -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2018-03-03 10:31:53.878980553 -0600 -@@ -36,7 +36,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2018-07-24 11:54:06.386074836 +0200 +@@ -36,7 +36,7 @@ log = logging.getLogger('global') class BuiltinsInternalsWrapperImplementationGenerator(BuiltinsGenerator): def __init__(self, model): BuiltinsGenerator.__init__(self, model) @@ -1189,9 +1219,10 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ def output_filename(self): return "%sJSBuiltinInternals.cpp" % self.model().framework.setting('namespace') -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_model.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_model.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_model.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/builtins/builtins_model.py 2018-03-03 10:31:53.878980553 -0600 +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_model.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/builtins/builtins_model.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/builtins/builtins_model.py 2018-07-24 11:54:06.386074836 +0200 @@ -26,6 +26,7 @@ import logging import re @@ -1200,7 +1231,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ from builtins_templates import BuiltinsGeneratorTemplates as Templates -@@ -155,6 +156,8 @@ +@@ -155,6 +156,8 @@ class BuiltinFunction: return interface @@ -1209,7 +1240,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ class BuiltinsCollection: def __init__(self, framework_name): -@@ -210,7 +213,7 @@ +@@ -210,7 +213,7 @@ class BuiltinsCollection: result = [] @@ -1218,16 +1249,17 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/builtins/builtins_ sorted_years = list(years) sorted_years.sort() result.append("%s %s" % (', '.join(sorted_years), owner)) -@@ -303,4 +306,4 @@ +@@ -303,4 +306,4 @@ class BuiltinsCollection: functionBounds.append((start, end)) functionStrings = [text[start:end].strip() for (start, end) in functionBounds] - return map(BuiltinFunction.fromString, functionStrings) + return list(map(BuiltinFunction.fromString, functionStrings)) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/cssmin.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/cssmin.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/cssmin.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/cssmin.py 2018-03-06 10:13:10.065229770 -0600 -@@ -46,4 +46,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/cssmin.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/cssmin.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/cssmin.py 2018-07-24 11:54:06.386074836 +0200 +@@ -46,4 +46,7 @@ if __name__ == "__main__": if sys.version_info[0] == 3 and sys.stdin.encoding != 'UTF-8': import io sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8') @@ -1235,10 +1267,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/cssmin.py webkitgt + import io + sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='UTF-8') sys.stdout.write(cssminify(sys.stdin.read())) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builtins.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/generate-js-builtins.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2018-03-03 10:31:03.854769938 -0600 -@@ -31,20 +31,33 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/generate-js-builtins.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2018-07-24 11:54:06.386074836 +0200 +@@ -31,20 +31,33 @@ import fnmatch import logging import optparse import os @@ -1274,7 +1307,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builti def generate_bindings_for_builtins_files(builtins_files=[], output_path=None, -@@ -59,7 +72,7 @@ +@@ -59,7 +72,7 @@ def generate_bindings_for_builtins_files model = BuiltinsCollection(framework_name=framework_name) for filepath in builtins_files: @@ -1283,7 +1316,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builti file_text = file.read() file_name = os.path.basename(filepath) -@@ -146,7 +159,7 @@ +@@ -146,7 +159,7 @@ if __name__ == '__main__': for filepath in os.listdir(arg_options.input_directory): input_filepaths.append(os.path.join(arg_options.input_directory, filepath)) @@ -1292,7 +1325,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builti options = { 'output_path': arg_options.output_directory, -@@ -159,7 +172,7 @@ +@@ -159,7 +172,7 @@ if __name__ == '__main__': log.debug("Generating code for builtins.") log.debug("Parsed options:") @@ -1301,10 +1334,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generate-js-builti log.debug(" %s: %s" % (option, value)) log.debug("") log.debug("Input files:") -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py 2018-03-05 10:40:12.417625895 -0600 -@@ -90,7 +90,10 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py 2018-06-20 10:33:05.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py 2018-07-24 11:54:06.386074836 +0200 +@@ -90,7 +90,10 @@ aliases = None def openOrExit(path, mode): try: @@ -1316,7 +1350,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod except IOError as e: print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror)) exit(1) -@@ -214,6 +217,12 @@ +@@ -214,6 +217,12 @@ class Aliases: return "" return self.aliasToScript[name] @@ -1329,7 +1363,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod class PropertyData: allPropertyData = [] -@@ -322,7 +331,7 @@ +@@ -322,7 +331,7 @@ class PropertyData: insertLocation = None lowCodePoint = None highCodePoint = None @@ -1338,7 +1372,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod match = matches[idx] if codePoint == match + 1: lowCodePoint = match -@@ -351,22 +360,22 @@ +@@ -351,22 +360,22 @@ class PropertyData: lowCodePoint = codePoint highCodePoint = codePoint @@ -1370,7 +1404,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod if lowCodePoint != highCodePoint: ranges.insert(idx, (lowCodePoint, highCodePoint)) self.codePointCount = self.codePointCount + (highCodePoint - lowCodePoint) + 1 -@@ -384,7 +393,7 @@ +@@ -384,7 +393,7 @@ class PropertyData: def addRangeUnorderedForMatchesAndRanges(self, lowCodePoint, highCodePoint, matches, ranges): if len(matches) and highCodePoint >= matches[0] and lowCodePoint <= matches[-1]: @@ -1379,7 +1413,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod match = matches[idx] if lowCodePoint <= match and highCodePoint >= match: while idx < len(matches) and highCodePoint >= matches[idx]: -@@ -414,22 +423,22 @@ +@@ -414,22 +423,22 @@ class PropertyData: elif highCodePoint < match: break @@ -1411,7 +1445,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod ranges.insert(idx, (lowCodePoint, highCodePoint)) self.codePointCount = self.codePointCount + (highCodePoint - lowCodePoint) + 1 return -@@ -459,13 +468,13 @@ +@@ -459,13 +468,13 @@ class PropertyData: self.addRangeUnorderedForMatchesAndRanges(firstUnicodeCodePoint, highCodePoint, self.unicodeMatches, self.unicodeRanges) def removeMatchFromRanges(self, codePoint, ranges): @@ -1431,7 +1465,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod # Since list.insert inserts before the index given, handle the high range first if highRange[0] == highRange[1]: self.addMatchUnordered(highRange[0]) -@@ -476,14 +485,14 @@ +@@ -476,14 +485,14 @@ class PropertyData: else: ranges.insert(idx, lowRange) else: @@ -1452,7 +1486,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod self.codePointCount = self.codePointCount - 1 return -@@ -505,59 +514,59 @@ +@@ -505,59 +514,59 @@ class PropertyData: valuesThisLine = 0 firstValue = True @@ -1539,7 +1573,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod numberOfKeys = len(propertyKeys) hashSize = ceilingToPowerOf2(numberOfKeys * 2) hashMask = hashSize - 1 -@@ -587,7 +596,7 @@ +@@ -587,7 +596,7 @@ class PropertyData: hashTable[hash] = (len(valueTable), None) valueTable.append((key, keyValue[1])) @@ -1548,7 +1582,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod for tableIndex in hashTable: value = -1 -@@ -597,17 +606,17 @@ +@@ -597,17 +606,17 @@ class PropertyData: if tableIndex[1] is not None: next = tableIndex[1] @@ -1573,7 +1607,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod class Scripts: -@@ -742,21 +751,21 @@ +@@ -742,21 +751,21 @@ class Scripts: lowCodePoint = int(codePoints[:dotDot], 16) highCodePoint = int(codePoints[dotDot + 2:], 16) currentPropertyData.addRange(lowCodePoint, highCodePoint) @@ -1599,7 +1633,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod PropertyData.createAndDumpHashTable(file, self.scriptExtensionsByName, "scriptExtension") -@@ -877,7 +886,7 @@ +@@ -877,7 +886,7 @@ class GeneralCategory: propertyDatas[1].addRange(self.lastAddedCodePoint + 1, MaxUnicode) def dump(self, file): @@ -1608,7 +1642,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod PropertyData.createAndDumpHashTable(file, self.propertyDataByCategory, "generalCategory") -@@ -920,7 +929,7 @@ +@@ -920,7 +929,7 @@ class BinaryProperty: currentPropertyData.addRange(int(codePoints[:dotDot], 16), int(codePoints[dotDot + 2:], 16)) def dump(self, file): @@ -1617,7 +1651,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod PropertyData.createAndDumpHashTable(file, self.propertyDataByProperty, "binaryProperty") if __name__ == "__main__": -@@ -950,7 +959,7 @@ +@@ -950,7 +959,7 @@ if __name__ == "__main__": propertyDataHFile = openOrExit(unicodeProertyDataHPath, "wb") @@ -1626,7 +1660,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod aliases.parsePropertyAliasesFile(propertyAliasesFile) aliases.parsePropertyValueAliasesFile(propertyValueAliasesFile) -@@ -974,6 +983,6 @@ +@@ -974,6 +983,6 @@ if __name__ == "__main__": binaryProperty.dump(propertyDataHFile) scripts.dump(propertyDataHFile) @@ -1634,10 +1668,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/generateYarrUnicod + dowrite(propertyDataHFile, footer) exit(0) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/hasher.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/hasher.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/hasher.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/hasher.py 2018-03-03 10:24:55.761218389 -0600 -@@ -36,7 +36,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/hasher.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/hasher.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/hasher.py 2018-07-24 11:54:06.386074836 +0200 +@@ -36,7 +36,7 @@ def stringHash(str): hash = stringHashingStartValue strLength = len(str) @@ -1646,10 +1681,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/hasher.py webkitgt remainder = strLength & 1 # Main loop -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/jsmin.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/jsmin.py 2018-03-03 11:31:35.142780467 -0600 -@@ -79,10 +79,13 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/jsmin.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/jsmin.py 2016-08-30 18:10:50.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/jsmin.py 2018-07-24 11:54:06.386074836 +0200 +@@ -79,10 +79,13 @@ class JavascriptMinify(object): def write(char): # all of this is to support literal regular expressions. # sigh @@ -1665,7 +1701,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk if self.is_return: self.return_buf = '' -@@ -118,8 +121,8 @@ +@@ -118,8 +121,8 @@ class JavascriptMinify(object): write(previous) elif not previous: return @@ -1676,7 +1712,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk in_quote = previous write(previous) previous_non_space = previous -@@ -166,7 +169,7 @@ +@@ -166,7 +169,7 @@ class JavascriptMinify(object): if numslashes % 2 == 0: in_quote = '' write(''.join(quote_buf)) @@ -1685,7 +1721,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk if previous_non_space in newlineend_strings \ or previous_non_space > '~': while 1: -@@ -179,7 +182,7 @@ +@@ -179,7 +182,7 @@ class JavascriptMinify(object): or next2 > '~' or next2 == '/': do_newline = True break @@ -1694,7 +1730,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk if (previous_non_space in space_strings \ or previous_non_space > '~') \ and (next2 in space_strings or next2 > '~'): -@@ -217,14 +220,14 @@ +@@ -217,14 +220,14 @@ class JavascriptMinify(object): do_newline = False write(next1) @@ -1711,10 +1747,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/jsmin.py webkitgtk previous_non_space = previous if previous == '\\': -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/make-js-file-arrays.py webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/make-js-file-arrays.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/make-js-file-arrays.py 2018-02-19 01:45:14.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/Scripts/make-js-file-arrays.py 2018-03-03 14:39:11.326990464 -0600 -@@ -25,7 +25,11 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/make-js-file-arrays.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/Scripts/make-js-file-arrays.py 2018-04-18 08:26:38.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/Scripts/make-js-file-arrays.py 2018-07-24 11:54:06.386074836 +0200 +@@ -25,7 +25,11 @@ from __future__ import print_function import io import os from optparse import OptionParser @@ -1727,7 +1764,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/make-js-file-array from jsmin import JavascriptMinify -@@ -37,7 +41,7 @@ +@@ -37,7 +41,7 @@ def stringifyCodepoint(code): def chunk(list, chunkSize): @@ -1736,7 +1773,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/make-js-file-array yield list[i:i + chunkSize] -@@ -85,7 +89,7 @@ +@@ -85,7 +89,7 @@ def main(): print('extern const char {0:s}JavaScript[{1:d}];'.format(variableName, size), file=headerFile) print('const char {0:s}JavaScript[{1:d}] = {{'.format(variableName, size), file=sourceFile) @@ -1745,10 +1782,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/Scripts/make-js-file-array for codepointChunk in chunk(codepoints, 16): print(' {0:s},'.format(','.join(map(stringifyCodepoint, codepointChunk))), file=sourceFile) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/wasm/generateWasm.py webkitgtk-2.19.91/Source/JavaScriptCore/wasm/generateWasm.py ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/wasm/generateWasm.py 2018-02-19 01:45:17.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/wasm/generateWasm.py 2018-03-02 16:27:21.193406681 -0600 -@@ -71,7 +71,7 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/wasm/generateWasm.py +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/wasm/generateWasm.py 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/wasm/generateWasm.py 2018-07-24 11:54:06.386074836 +0200 +@@ -71,7 +71,7 @@ class Wasm: # We need to do this because python is dumb and won't let me use self in the lambda, which is ridiculous. if ret == None: ret = lambda op: {"name": op, "opcode": self.opcodes[op]} @@ -1757,10 +1795,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/wasm/generateWasm.py webki if filter(self.opcodes[op]): yield ret(op) -diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode webkitgtk-2.19.91/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode ---- webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode 2018-02-19 01:45:17.000000000 -0600 -+++ webkitgtk-2.19.91/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode 2018-03-03 10:35:11.555812290 -0600 -@@ -31,7 +31,6 @@ +Index: webkitgtk-2.21.5/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode +=================================================================== +--- webkitgtk-2.21.5.orig/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode 2018-04-18 08:26:39.000000000 +0200 ++++ webkitgtk-2.21.5/Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode 2018-07-24 11:54:06.386074836 +0200 +@@ -31,7 +31,6 @@ import optparse import os import re import sys @@ -1768,7 +1807,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonical header = """/* * Copyright (C) 2016 Apple Inc. All rights reserved. -@@ -78,11 +77,21 @@ +@@ -78,11 +77,21 @@ def openOrExit(path, mode): dirname = os.path.dirname(path) if not os.path.isdir(dirname): os.makedirs(dirname) @@ -1792,7 +1831,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonical class Canonicalize: def __init__(self): self.canonicalGroups = {}; -@@ -93,7 +102,7 @@ +@@ -93,7 +102,7 @@ class Canonicalize: self.canonicalGroups[mapping].append(code) def readCaseFolding(self, file): @@ -1801,7 +1840,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonical for line in file: line = line.split('#', 1)[0] line = line.rstrip() -@@ -157,26 +166,26 @@ +@@ -157,26 +166,26 @@ class Canonicalize: set = characterSets[i] for ch in set: characters = characters + "0x{character:04x}, ".format(character=ch) @@ -1840,7 +1879,7 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonical if __name__ == "__main__": -@@ -194,9 +203,9 @@ +@@ -194,9 +203,9 @@ if __name__ == "__main__": canonicalize = Canonicalize() canonicalize.readCaseFolding(caseFoldingTxtFile) @@ -1852,10 +1891,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/JavaScriptCore/yarr/generateYarrCanonical caseFoldingTxtFile.close() canonicalizeHFile.close() -diff -ur webkitgtk-2.19.91.orig/Source/WebCore/platform/network/create-http-header-name-table webkitgtk-2.19.91/Source/WebCore/platform/network/create-http-header-name-table ---- webkitgtk-2.19.91.orig/Source/WebCore/platform/network/create-http-header-name-table 2018-02-19 01:45:32.000000000 -0600 -+++ webkitgtk-2.19.91/Source/WebCore/platform/network/create-http-header-name-table 2018-03-03 11:28:42.253809307 -0600 -@@ -41,7 +41,7 @@ +Index: webkitgtk-2.21.5/Source/WebCore/platform/network/create-http-header-name-table +=================================================================== +--- webkitgtk-2.21.5.orig/Source/WebCore/platform/network/create-http-header-name-table 2018-05-16 09:13:10.000000000 +0200 ++++ webkitgtk-2.21.5/Source/WebCore/platform/network/create-http-header-name-table 2018-07-24 11:54:06.386074836 +0200 +@@ -42,7 +42,7 @@ input_file = open(input_path) http_header_name_to_id = { } http_header_names = [] @@ -1864,10 +1904,11 @@ diff -ur webkitgtk-2.19.91.orig/Source/WebCore/platform/network/create-http-head http_header_name = line.strip() if not http_header_name or http_header_name[:2] == '//': continue -diff -ur webkitgtk-2.19.91.orig/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl webkitgtk-2.19.91/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl ---- webkitgtk-2.19.91.orig/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-02-19 01:45:32.000000000 -0600 -+++ webkitgtk-2.19.91/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-03-05 16:17:47.582174114 -0600 -@@ -163,6 +163,8 @@ +Index: webkitgtk-2.21.5/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl +=================================================================== +--- webkitgtk-2.21.5.orig/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-07-11 09:18:36.000000000 +0200 ++++ webkitgtk-2.21.5/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-07-24 11:54:06.386074836 +0200 +@@ -176,6 +176,8 @@ my $eslintLicense = readLicenseFile(File my $threejsLicense = readLicenseFile(File::Spec->catfile($threejsPath, 'LICENSE')); make_path($protocolDir, $targetResourcePath); diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 747c242..0e19d4c 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Tue Sep 4 10:18:37 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.22.0: + + New JavaScriptCore GLib API. + + Switched to use complex text code path unconditionally. + + Added playbin3 support to GStreamer media backend. + + Support for WebDriver advance user insteraction commands. + + Default option menu implementation now uses a GtkTreeView. + +------------------------------------------------------------------- +Fri Aug 24 11:28:26 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.21.92: + + Add new API to inject/register user content in isolated worlds. + + Add more API to JSCException to handle column number, convert + exception to string, get the exception backtrace, create + exceptions with a custom error name and report exception + message with full details. + + Fix excessive CPU usage when getting the process memory + footprint. + + Fix several crashes and rendering issues. + + Updated translations. + +------------------------------------------------------------------- +Thu Aug 16 12:44:22 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.21.91: + + Add enable-media-capabilities setting. + + Stop pushing buffers when seeking status changes in media + player. + + Fix rendering of theme styled buttons. + + Fix several crashes and rendering issues. + + Updated translations. +- Add explict pkgconfig(gstreamer-app-1.0), + pkgconfig(gstreamer-audio-1.0), + pkgconfig(gstreamer-codecparsers-1.0), + pkgconfig(gstreamer-fft-1.0), pkgconfig(gstreamer-mpegts-1.0), + pkgconfig(gstreamer-pbutils-1.0), pkgconfig(gstreamer-tag-1.0) + and pkgconfig(gstreamer-video-1.0) BuildRequires: align with what + configure checks for. +- Disable webkit2gtk3-python3.patch via bcond_with: Patch currently + breaks the build. + ------------------------------------------------------------------- Mon Aug 13 07:59:48 UTC 2018 - bjorn.lie@gmail.com @@ -5,6 +49,78 @@ Mon Aug 13 07:59:48 UTC 2018 - bjorn.lie@gmail.com + Fix rendering artifacts in some web sites due to a bug introduced in 2.20.4. +------------------------------------------------------------------- +Wed Aug 8 02:21:05 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.21.5: + + Add API to evaluate code in a new object to JavaScriptCore GLib + API. + + Add API to check for syntax errors in given code to + JavaScriptCore GLib API. + + Update jsc_context_evaluate_with_source_uri() to receive also a + starting line number. + + Add API to allow creating variadic functions to JavaScriptCore + GLib API. + + Add –host option to WebDriver process. + + Handle acceptInsecureCertificates capability in WebDriver. + + Fix video freezes when GStreamerGL is not installed. + + Fix several crashes and rendering issues. + + Updated translations. +- Refresh webkit2gtk3-boo1088932-a11y-state-set.patch and + webkit2gtk3-python3.patch with quilt. + +------------------------------------------------------------------- +Wed Aug 8 02:21:04 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.21.4: + + Switch to use a popup window with a tree view instead of a menu + for option menu default implementation. + + Add API to run javascript from a WebKitWebView in an isolated + world. + + Fix UI process crash in WebKitFaviconDatabase when pageURL is + unset. + + Fix several crashes and rendering issues. + +------------------------------------------------------------------- +Wed Aug 8 02:21:03 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 2.21.3: + + Ensure memory monitor properly notifies all child processes. + + Add maximize, minimize and fullscreen window commands to + WebDriver. + + Fix a network process crash when trying to get cookies of + about:blank page. + + Fix UI process crash when closing the window under Wayland. + + Disable Gigacage if mmap fails to allocate in Linux. + + Fix several crashes and rendering issues. +- Changes from version 2.21.2: + + Remove resource load statistics API, it's not ready yet. + + Add initial implementation of WebDriver advance user + insteraction commands. + + Add introspectable alternatives for functions using vargars to + JavaScriptCore GLib API. + + Implement MouseEvent.buttons. + + Fix downloads started by context menu failing in some websites + due to missing user agent HTTP header. +- Rebase webkit2gtk3-python3.patch generate-bytecode-files chunks. + +------------------------------------------------------------------- +Wed Aug 8 02:21:01 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 2.21.1: + + Add initial JavaScriptCore GLib API. + + Use JavaScriptCore GLib API in WebKit layer and deprecate most + of the DOM bindings API as well as + + methods using the JavaScriptCore C API. + + Switch to use complex text code path unconditionally. + + Properly close the connection to the Wayland nested compositor + in the WebProcess. + + Add playbin3 support to GStreamer media backend. + + Fix a deadlock when destroying the media player in non + accelerated compositing mode. +- Drop webkitgtk-typelib-sharelib-link.patch: there is no + JavaScriptCore.gir.in file to be patched anymore. + ------------------------------------------------------------------- Tue Aug 7 08:59:06 UTC 2018 - bjorn.lie@gmail.com diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index c7fb534..7a28caf 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -36,9 +36,9 @@ %define _gold_linker 0 %endif %endif -%bcond_without python3 +%bcond_with python3 Name: webkit2gtk3 -Version: 2.20.5 +Version: 2.22.0 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0-or-later AND BSD-3-Clause @@ -48,13 +48,10 @@ Source0: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz Source1: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz.asc Source98: baselibs.conf Source99: webkit2gtk3.keyring -# PATCH-FIX-OPENSUSE webkitgtk-typelib-sharelib-link.patch dimstar@opensuse.org -- Fixup the .gir file to contain the full library name for libjavascriptcore. -Patch0: webkitgtk-typelib-sharelib-link.patch # PATCH-FIX-UPSTREAM webkit2gtk3-python3.patch bsc#1079812 mgorse@suse.com -- port to Python 3. -Patch1: webkit2gtk3-python3.patch +Patch0: webkit2gtk3-python3.patch # PATCh-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed. -Patch2: webkit2gtk3-boo1088932-a11y-state-set.patch - +Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLESv1_CM-devel @@ -81,8 +78,16 @@ BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5 BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gnutls) >= 3.0.0 BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.3 +BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildRequires: pkgconfig(gstreamer-audio-1.0) +BuildRequires: pkgconfig(gstreamer-codecparsers-1.0) +BuildRequires: pkgconfig(gstreamer-fft-1.0) BuildRequires: pkgconfig(gstreamer-gl-1.0) +BuildRequires: pkgconfig(gstreamer-mpegts-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-tag-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.2 @@ -259,11 +264,10 @@ invoking a Perl or Python script. %prep %setup -q -n webkitgtk-%{version} -%patch0 -p1 %if %{with python3} -%patch1 -p1 +%patch0 -p1 %endif -%patch2 -p1 +%patch1 -p1 %build # Here we must muzzle our dog so it doesn't eat all the memory @@ -328,7 +332,7 @@ make -j $max_link_jobs # Exclude jsc - we package that on its own %exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc # Exclude MiniBrowser, we package that in devel -%exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser +%exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser %{_libexecdir}/libwebkit2gtk%{_wk2sover}/ %{_libdir}/libwebkit2gtk-4.0.so.* %{_bindir}/WebKitWebDriver diff --git a/webkitgtk-2.20.5.tar.xz b/webkitgtk-2.20.5.tar.xz deleted file mode 100644 index bb94b9b..0000000 --- a/webkitgtk-2.20.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990 -size 16625200 diff --git a/webkitgtk-2.20.5.tar.xz.asc b/webkitgtk-2.20.5.tar.xz.asc deleted file mode 100644 index 2cfd630..0000000 --- a/webkitgtk-2.20.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCW3EwWwAKCRDz0yLQ7EWC -w3VNAJ9RhnJ7eeDq7xfC56Ntrhwg0SAujQCggfPvQIu6mr+LABQwPbg3U7Buddc= -=y0hs ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.22.0.tar.xz b/webkitgtk-2.22.0.tar.xz new file mode 100644 index 0000000..8e656d4 --- /dev/null +++ b/webkitgtk-2.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa42b54a98831405c8a3e7f40371eec3f0bd5cdbb124813a5e329e7a9f8c6f2a +size 17095588 diff --git a/webkitgtk-2.22.0.tar.xz.asc b/webkitgtk-2.22.0.tar.xz.asc new file mode 100644 index 0000000..a0e0852 --- /dev/null +++ b/webkitgtk-2.22.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCW4z52QAKCRDz0yLQ7EWC +w6fFAKC0Vm+dGN6kXbpQJlQXzfA+6Uao+wCdFwaZOaCXwG8aALjU5BD7o+iDv0M= +=LB/+ +-----END PGP SIGNATURE----- diff --git a/webkitgtk-typelib-sharelib-link.patch b/webkitgtk-typelib-sharelib-link.patch deleted file mode 100644 index 53064fc..0000000 --- a/webkitgtk-typelib-sharelib-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webkitgtk-2.15.4/Source/JavaScriptCore/JavaScriptCore.gir.in -=================================================================== ---- webkitgtk-2.15.4.orig/Source/JavaScriptCore/JavaScriptCore.gir.in -+++ webkitgtk-2.15.4/Source/JavaScriptCore/JavaScriptCore.gir.in -@@ -3,7 +3,7 @@ - xmlns="http://www.gtk.org/introspection/core/1.0" - xmlns:c="http://www.gtk.org/introspection/c/1.0"> - -