On Sat, Mar 23, 2019 at 12:06:46PM +0300, Dmitry Shachnev wrote:
> Please unblock package qtwebkit-opensource-src.
>
> It fixes a bug of severity important: #924402. The debdiff is attached.

Actually attaching the debdiff...

--
Dmitry Shachnev
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qtwebkit-opensource-src (5.212.0~alpha2-21) unstable; urgency=medium
+
+  * Add fastcall attribute to JSImageConstructor::construct method.
+    This fixes crash on i386 (closes: #909366, #924402). Thanks Bernhard
+    Übelacker for the patch!
+  * Remove -fpermissive from build flags. It was wrong and not needed
+    with the applied patch.
+
+ -- Dmitry Shachnev <mity...@debian.org>  Fri, 22 Mar 2019 11:42:38 +0300
+
 qtwebkit-opensource-src (5.212.0~alpha2-20) unstable; urgency=medium
 
   * Backport two upstream commits to fix page width in plain text messages
--- /dev/null
+++ b/debian/patches/i386_fastcall.diff
@@ -0,0 +1,16 @@
+Description: add attribute fastcall to derived class member JSImageConstructor::construct
+Author: Bernhard Übelacker <bernha...@mailbox.org>
+Forwarded: https://github.com/annulen/webkit/pull/803
+Last-Update: 2019-03-22
+
+--- a/Source/WebCore/bindings/js/JSImageConstructor.cpp
++++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp
+@@ -44,7 +44,7 @@ template<> JSValue JSImageConstructor::p
+     return JSHTMLElement::getConstructor(vm, &globalObject);
+ }
+ 
+-template<> EncodedJSValue JSImageConstructor::construct(ExecState* state)
++template<> EncodedJSValue JSC_HOST_CALL JSImageConstructor::construct(ExecState* state)
+ {
+     JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee());
+     Document* document = jsConstructor->document();
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ use_system_woff2.diff
 pkgconfig_includedir.diff
 doxygen_tags.diff
 fix_trojita_plaintext.diff
+i386_fastcall.diff
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),ppc64el s390x))
 	EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
 endif
 
-DEB_CXXFLAGS_MAINT_APPEND += -fpermissive
-
 %:
 	dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 

Attachment: signature.asc
Description: PGP signature

Reply via email to