From 6ea4b16624756cac0315627708fad5586898d961 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 23 Feb 2018 14:23:56 -0600 Subject: [PATCH] Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091) --- 0031-Disable-ES6-Proxy-object.patch | 24 ++++++++++++++++++++++++ qt5-qtwebkit.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0031-Disable-ES6-Proxy-object.patch diff --git a/0031-Disable-ES6-Proxy-object.patch b/0031-Disable-ES6-Proxy-object.patch new file mode 100644 index 0000000..bd2d57e --- /dev/null +++ b/0031-Disable-ES6-Proxy-object.patch @@ -0,0 +1,24 @@ +From 5648446933f52fe479d0a9006f6393a81a790116 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 25 May 2017 00:49:22 +0300 +Subject: [PATCH 031/143] Disable ES6 Proxy object + +Change-Id: Ifd6404e254b242afa8dd563c03f9588b4b05ab93 +--- + Source/JavaScriptCore/runtime/JSGlobalObject.cpp | 3 + + 91 files changed, 17 insertions(+), 1379 deletions(-) +diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp +index 9e613a21215..7d57590b4c5 100644 +--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp ++++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp +@@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c + putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum); + putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum); + ++#if !PLATFORM(QT) ++ // Disable ES6 Proxy because our implementation is not compliant with what real world code expects + putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum); ++#endif + + + #define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \ diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2ae2f96..d566b89 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.19.%{?prerel}%{?dist} +Release: 0.20.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -37,6 +37,9 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch # Patch to fix for missing source file. Patch3: qtwebkit-5.212.0_fix_missing_sources.patch +# disable ES6 Proxy +Patch31: 0031-Disable-ES6-Proxy-object.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -229,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Fri Feb 23 2018 Rex Dieter - 5.212.0-0.20.alpha2 +- Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091) + * Wed Feb 14 2018 Jan Grulich - 5.212.0-0.19.alpha2 - rebuild (qt5)