diff -Nru qtwebkit-2.3.4.dfsg/debian/changelog qtwebkit-2.3.4.dfsg/debian/changelog
--- qtwebkit-2.3.4.dfsg/debian/changelog	2020-05-12 19:08:21.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/changelog	2020-05-12 23:43:04.000000000 +0000
@@ -1,3 +1,9 @@
+qtwebkit (2.3.4.dfsg-10rock2) focal; urgency=medium
+
+  * Hack it until it compiles
+
+ -- Sylvain Joyeux <sylvain.joyeux@tidewise.io>  Tue, 12 May 2020 20:43:04 -0300
+
 qtwebkit (2.3.4.dfsg-10rock1) focal; urgency=medium
 
   * Rebuild for focal
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/hack_it_until_it_compiles_001 qtwebkit-2.3.4.dfsg/debian/patches/hack_it_until_it_compiles_001
--- qtwebkit-2.3.4.dfsg/debian/patches/hack_it_until_it_compiles_001	1970-01-01 00:00:00.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/patches/hack_it_until_it_compiles_001	2020-05-12 23:42:56.000000000 +0000
@@ -0,0 +1,80 @@
+Description: Hack the code until it compiles
+ .
+ qtwebkit (2.3.4.dfsg-10rock1) focal; urgency=medium
+ .
+   * Rebuild for focal
+Author: Sylvain Joyeux <sylvain.joyeux@tidewise.io>
+
+---
+Last-Update: 2020-05-12
+
+--- qtwebkit-2.3.4.dfsg.orig/Source/JavaScriptCore/API/JSStringRef.cpp
++++ qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -36,7 +36,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(chars, numChars).leakRef();
++    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -77,7 +77,7 @@ size_t JSStringGetLength(JSStringRef str
+ 
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+-    return string->characters();
++    return reinterpret_cast<const JSChar*>(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- qtwebkit-2.3.4.dfsg.orig/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
++++ qtwebkit-2.3.4.dfsg/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
+@@ -61,20 +61,8 @@ namespace QUnicodeTables {
+ }
+ QT_END_NAMESPACE
+ 
+-// ugly hack to make UChar compatible with JSChar in API/JSStringRef.h
+-#if defined(Q_OS_WIN) || (COMPILER(RVCT) && !OS(LINUX))
+-typedef wchar_t UChar;
+-#else
+-typedef uint16_t UChar;
+-#endif
+-
+-#if !USE(ICU_UNICODE)
+-#ifdef __sparc_v9__
++typedef char16_t UChar;
+ typedef int32_t UChar32;
+-#else
+-typedef uint32_t UChar32;
+-#endif
+-#endif
+ 
+ namespace WTF {
+ namespace Unicode {
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/dom/Document.cpp
++++ qtwebkit-2.3.4.dfsg/Source/WebCore/dom/Document.cpp
+@@ -3874,12 +3874,12 @@ static bool isValidNameNonASCII(const UC
+     unsigned i = 0;
+ 
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (!isValidNameStart(c))
+         return false;
+ 
+     while (i < length) {
+-        U16_NEXT(characters, i, length, c)
++        U16_NEXT(characters, i, length, c);
+         if (!isValidNamePart(c))
+             return false;
+     }
+@@ -3942,7 +3942,7 @@ bool Document::parseQualifiedName(const
+     const UChar* s = qualifiedName.characters();
+     for (unsigned i = 0; i < length;) {
+         UChar32 c;
+-        U16_NEXT(s, i, length, c)
++        U16_NEXT(s, i, length, c);
+         if (c == ':') {
+             if (sawColon) {
+                 ec = NAMESPACE_ERR;
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/javascriptcore_ruby_includepath qtwebkit-2.3.4.dfsg/debian/patches/javascriptcore_ruby_includepath
--- qtwebkit-2.3.4.dfsg/debian/patches/javascriptcore_ruby_includepath	1970-01-01 00:00:00.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/patches/javascriptcore_ruby_includepath	2020-05-12 20:36:59.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Explicitly add offlineasm in the include path
+ .
+ qtwebkit (2.3.4.dfsg-10rock1) focal; urgency=medium
+ .
+   * Rebuild for focal
+Author: Sylvain Joyeux <sylvain.joyeux@tidewise.io>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Last-Update: 2020-05-12
+
+--- qtwebkit-2.3.4.dfsg.orig/Source/JavaScriptCore/CMakeLists.txt
++++ qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/CMakeLists.txt
+@@ -346,7 +346,7 @@ IF (ENABLE_LLINT)
+         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
+         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb
+         DEPENDS ${LLINT_ASM} ${OFFLINE_ASM}
+-        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
++        COMMAND ${RUBY_EXECUTABLE} -I ${JAVASCRIPTCORE_DIR}/offlineasm ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
+         VERBATIM)
+ 
+     # We add the header file directly to the ADD_EXECUTABLE call instead of setting the
+@@ -374,7 +374,7 @@ IF (ENABLE_LLINT)
+         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
+         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb
+         DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM}
+-        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
++        COMMAND ${RUBY_EXECUTABLE} -I ${JAVASCRIPTCORE_DIR}/offlineasm ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
+         COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
+         VERBATIM)
+ 
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/ruby_unshift_local_dir qtwebkit-2.3.4.dfsg/debian/patches/ruby_unshift_local_dir
--- qtwebkit-2.3.4.dfsg/debian/patches/ruby_unshift_local_dir	1970-01-01 00:00:00.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/patches/ruby_unshift_local_dir	2020-05-12 20:43:53.000000000 +0000
@@ -0,0 +1,36 @@
+Description: fix require of local files by unshift'ing the path instead of pushing it
+ .
+ qtwebkit (2.3.4.dfsg-10rock1) focal; urgency=medium
+ .
+   * Rebuild for focal
+Author: Sylvain Joyeux <sylvain.joyeux@tidewise.io>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Last-Update: 2020-05-12
+
+--- qtwebkit-2.3.4.dfsg.orig/Source/JavaScriptCore/offlineasm/asm.rb
++++ qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/offlineasm/asm.rb
+@@ -23,7 +23,7 @@
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ # THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$: << File.dirname(__FILE__)
++$:.unshift File.dirname(__FILE__)
+ 
+ require "config"
+ require "backends"
+--- qtwebkit-2.3.4.dfsg.orig/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb
++++ qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb
+@@ -23,7 +23,7 @@
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ # THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$: << File.dirname(__FILE__)
++$:.unshift File.dirname(__FILE__)
+ 
+ require "config"
+ require "backends"
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/series qtwebkit-2.3.4.dfsg/debian/patches/series
--- qtwebkit-2.3.4.dfsg/debian/patches/series	2018-06-21 00:59:53.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/patches/series	2020-05-12 23:42:37.000000000 +0000
@@ -27,3 +27,6 @@
 disable-jit-nonsse2.patch
 m68k_support.diff
 riscv64-support.patch
+javascriptcore_ruby_includepath
+ruby_unshift_local_dir
+hack_it_until_it_compiles_001
diff -Nru qtwebkit-2.3.4.dfsg/debian/rules qtwebkit-2.3.4.dfsg/debian/rules
--- qtwebkit-2.3.4.dfsg/debian/rules	2016-10-21 11:53:04.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/rules	2020-05-12 20:32:40.000000000 +0000
@@ -47,15 +47,16 @@
 	true
 
 override_dh_auto_build:
+	export RUBYLIB=$(CURDIR)/Source/JavaScriptCore/offlineasm
 	#disable JIT assembler on archs where it doesn't compile
 	#disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
 	#disable forcing SSE2 on all other platforms
 ifneq (,$(filter alpha arm64 armel hppa m68k mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)))
-	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)
+	./Tools/Scripts/build-webkit --qt --qmake=/usr/bin/qmake-qt4 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)
 else ifeq ($(DEB_HOST_ARCH),armhf)
-	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)
+	./Tools/Scripts/build-webkit --qt --qmake=/usr/bin/qmake-qt4 DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS) $(MAKE_ARGS)
 else
-	./Tools/Scripts/build-webkit --qt $(QMAKE_ARGS) $(MAKE_ARGS) --no-force-sse2
+	./Tools/Scripts/build-webkit --qt --qmake=/usr/bin/qmake-qt4 $(QMAKE_ARGS) $(MAKE_ARGS) --no-force-sse2
 endif
 
 override_dh_auto_install:
diff -Nru qtwebkit-2.3.4.dfsg/debian/source/include-binaries qtwebkit-2.3.4.dfsg/debian/source/include-binaries
--- qtwebkit-2.3.4.dfsg/debian/source/include-binaries	2013-05-16 19:06:24.000000000 +0000
+++ qtwebkit-2.3.4.dfsg/debian/source/include-binaries	2020-05-12 20:42:20.000000000 +0000
@@ -1 +1,66 @@
 debian/plugins/qwebview/images/qwebview.png
+WebKitBuild/Release/Source/WTF/obj/release/ArrayBuffer.o
+WebKitBuild/Release/Source/WTF/obj/release/ArrayBufferView.o
+WebKitBuild/Release/Source/WTF/obj/release/Assertions.o
+WebKitBuild/Release/Source/WTF/obj/release/AtomicString.o
+WebKitBuild/Release/Source/WTF/obj/release/Atomics.o
+WebKitBuild/Release/Source/WTF/obj/release/Base64.o
+WebKitBuild/Release/Source/WTF/obj/release/BitVector.o
+WebKitBuild/Release/Source/WTF/obj/release/CString.o
+WebKitBuild/Release/Source/WTF/obj/release/CollatorDefault.o
+WebKitBuild/Release/Source/WTF/obj/release/CollatorICU.o
+WebKitBuild/Release/Source/WTF/obj/release/CryptographicallyRandomNumber.o
+WebKitBuild/Release/Source/WTF/obj/release/CurrentTime.o
+WebKitBuild/Release/Source/WTF/obj/release/DataLog.o
+WebKitBuild/Release/Source/WTF/obj/release/DateMath.o
+WebKitBuild/Release/Source/WTF/obj/release/DecimalNumber.o
+WebKitBuild/Release/Source/WTF/obj/release/FastMalloc.o
+WebKitBuild/Release/Source/WTF/obj/release/FilePrintStream.o
+WebKitBuild/Release/Source/WTF/obj/release/GOwnPtr.o
+WebKitBuild/Release/Source/WTF/obj/release/GRefPtr.o
+WebKitBuild/Release/Source/WTF/obj/release/GregorianDateTime.o
+WebKitBuild/Release/Source/WTF/obj/release/HashTable.o
+WebKitBuild/Release/Source/WTF/obj/release/MD5.o
+WebKitBuild/Release/Source/WTF/obj/release/MainThread.o
+WebKitBuild/Release/Source/WTF/obj/release/MainThreadQt.o
+WebKitBuild/Release/Source/WTF/obj/release/MediaTime.o
+WebKitBuild/Release/Source/WTF/obj/release/MemoryInstrumentation.o
+WebKitBuild/Release/Source/WTF/obj/release/MetaAllocator.o
+WebKitBuild/Release/Source/WTF/obj/release/NullPtr.o
+WebKitBuild/Release/Source/WTF/obj/release/NumberOfCores.o
+WebKitBuild/Release/Source/WTF/obj/release/OSAllocatorPosix.o
+WebKitBuild/Release/Source/WTF/obj/release/OSRandomSource.o
+WebKitBuild/Release/Source/WTF/obj/release/PageAllocationAligned.o
+WebKitBuild/Release/Source/WTF/obj/release/PageBlock.o
+WebKitBuild/Release/Source/WTF/obj/release/ParallelJobsGeneric.o
+WebKitBuild/Release/Source/WTF/obj/release/PrintStream.o
+WebKitBuild/Release/Source/WTF/obj/release/RAMSize.o
+WebKitBuild/Release/Source/WTF/obj/release/RandomNumber.o
+WebKitBuild/Release/Source/WTF/obj/release/RefCountedLeakCounter.o
+WebKitBuild/Release/Source/WTF/obj/release/SHA1.o
+WebKitBuild/Release/Source/WTF/obj/release/StackBounds.o
+WebKitBuild/Release/Source/WTF/obj/release/StringBuilder.o
+WebKitBuild/Release/Source/WTF/obj/release/StringImpl.o
+WebKitBuild/Release/Source/WTF/obj/release/StringPrintStream.o
+WebKitBuild/Release/Source/WTF/obj/release/StringQt.o
+WebKitBuild/Release/Source/WTF/obj/release/StringStatics.o
+WebKitBuild/Release/Source/WTF/obj/release/TCSystemAlloc.o
+WebKitBuild/Release/Source/WTF/obj/release/ThreadIdentifierDataPthreads.o
+WebKitBuild/Release/Source/WTF/obj/release/Threading.o
+WebKitBuild/Release/Source/WTF/obj/release/ThreadingPthreads.o
+WebKitBuild/Release/Source/WTF/obj/release/TypeTraits.o
+WebKitBuild/Release/Source/WTF/obj/release/UTF8.o
+WebKitBuild/Release/Source/WTF/obj/release/WTFString.o
+WebKitBuild/Release/Source/WTF/obj/release/WTFThreadData.o
+WebKitBuild/Release/Source/WTF/obj/release/bignum-dtoa.o
+WebKitBuild/Release/Source/WTF/obj/release/bignum.o
+WebKitBuild/Release/Source/WTF/obj/release/cached-powers.o
+WebKitBuild/Release/Source/WTF/obj/release/diy-fp.o
+WebKitBuild/Release/Source/WTF/obj/release/double-conversion.o
+WebKitBuild/Release/Source/WTF/obj/release/dtoa.o
+WebKitBuild/Release/Source/WTF/obj/release/fast-dtoa.o
+WebKitBuild/Release/Source/WTF/obj/release/fixed-dtoa.o
+WebKitBuild/Release/Source/WTF/obj/release/strtod.o
+WebKitBuild/Release/Source/WTF/release/libWTF.a
+Source/JavaScriptCore/disassembler/udis86/ud_opcode.pyc
+Source/JavaScriptCore/disassembler/udis86/ud_optable.pyc