diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/changelog qtwebkit-opensource-src-5.212.0~alpha2/debian/changelog --- qtwebkit-opensource-src-5.212.0~alpha2/debian/changelog 2018-01-18 08:33:51.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/changelog 2018-01-24 08:28:18.000000000 +0000 @@ -1,3 +1,14 @@ +qtwebkit-opensource-src (5.212.0~alpha2-7+rpi1) buster-staging; urgency=medium + + [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green at Sat, 09 Dec 2017 00:03:30 +0000] + * Update symbols file for raspbian. + * Fix clean target. + [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green + * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt + * Disable JIT + + -- Raspbian forward porter Wed, 24 Jan 2018 08:28:18 +0000 + qtwebkit-opensource-src (5.212.0~alpha2-7) unstable; urgency=medium * Build with -O1 instead of -O2 on sh3/sh4 (closes: #887462). diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/libqt5webkit5.symbols qtwebkit-opensource-src-5.212.0~alpha2/debian/libqt5webkit5.symbols --- qtwebkit-opensource-src-5.212.0~alpha2/debian/libqt5webkit5.symbols 2018-01-18 08:33:51.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/libqt5webkit5.symbols 2018-01-24 08:28:18.000000000 +0000 @@ -2398,8 +2398,8 @@ _ZTV25QQuickWebViewExperimental@Base 5.0.2 _ZTV25QWebNotificationPresenter@Base 5.212.0~alpha2 (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE@Base 5.212.0~alpha2 - (arch=armel)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2 - (arch=alpha amd64 arm64 armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2 + (optional=appeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2 + (optional=disappeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2 _ZZZN21QWebIconImageProvider10identifierEvENKUlvE_clEvE15qstring_literal@Base 5.2.0 _ZlsR11QDataStreamRK11QWebHistory@Base 5.0.2 _ZrsR11QDataStreamR11QWebHistory@Base 5.0.2 diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/hack-offlineasm-to-prevent-generation-of.patch qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/hack-offlineasm-to-prevent-generation-of.patch --- qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/hack-offlineasm-to-prevent-generation-of.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/hack-offlineasm-to-prevent-generation-of.patch 2018-01-24 08:28:18.000000000 +0000 @@ -0,0 +1,39 @@ +From: Peter Michael Green +Date: Thu, 18 Jan 2018 05:43:19 +0000 +X-Dgit-Generated: 5.212.0~alpha2-6+rpi1 606e469962abb31adcae85807b29f23418b47e25 +Subject: hack offlineasm to prevent generation of movw/movt + + +--- + +--- qtwebkit-opensource-src-5.212.0~alpha2.orig/Source/JavaScriptCore/offlineasm/arm.rb ++++ qtwebkit-opensource-src-5.212.0~alpha2/Source/JavaScriptCore/offlineasm/arm.rb +@@ -103,11 +103,11 @@ def armMoveImmediate(value, register) + $asm.puts "mov #{register.armOperand}, \##{value}" + elsif (~value) >= 0 && (~value) < 256 + $asm.puts "mvn #{register.armOperand}, \##{~value}" +- elsif isARMv7 or isARMv7Traditional +- $asm.puts "movw #{register.armOperand}, \##{value & 0xffff}" +- if (value & 0xffff0000) != 0 +- $asm.puts "movt #{register.armOperand}, \##{(value >> 16) & 0xffff}" +- end ++ #elsif isARMv7 or isARMv7Traditional ++ # $asm.puts "movw #{register.armOperand}, \##{value & 0xffff}" ++ # if (value & 0xffff0000) != 0 ++ # $asm.puts "movt #{register.armOperand}, \##{(value >> 16) & 0xffff}" ++ # end + else + $asm.puts "ldr #{register.armOperand}, =#{value}" + end +@@ -502,8 +502,9 @@ class Instruction + $asm.puts "mov #{armFlippedOperands(operands)}" + end + when "mvlbl" +- $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" +- $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" ++ raise "cant use this on armv6, #{codeorigin}" ++ #$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" ++ #$asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" + when "nop" + $asm.puts "nop" + when "bieq", "bpeq", "bbeq" diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/make-further-unsuccesful-changes-to-offl.patch qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/make-further-unsuccesful-changes-to-offl.patch --- qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/make-further-unsuccesful-changes-to-offl.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/make-further-unsuccesful-changes-to-offl.patch 2018-01-24 08:28:18.000000000 +0000 @@ -0,0 +1,20 @@ +From: Peter Michael Green +Date: Thu, 18 Jan 2018 06:17:41 +0000 +X-Dgit-Generated: 5.212.0~alpha2-6+rpi1 849b2363e4c2b0597f3dd895bee26228e1996c9e +Subject: Make further unsuccesful changes to offlineasm + +Disable JIT. + +--- + +--- qtwebkit-opensource-src-5.212.0~alpha2.orig/Source/JavaScriptCore/offlineasm/arm.rb ++++ qtwebkit-opensource-src-5.212.0~alpha2/Source/JavaScriptCore/offlineasm/arm.rb +@@ -502,7 +502,7 @@ class Instruction + $asm.puts "mov #{armFlippedOperands(operands)}" + end + when "mvlbl" +- raise "cant use this on armv6, #{codeorigin}" ++ $asm.puts "ldr #{operands[1].armOperand}, \=:#{operands[0].value}" + #$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" + #$asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" + when "nop" diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/series qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/series --- qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/series 2018-01-18 08:33:51.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/patches/series 2018-01-24 08:28:18.000000000 +0000 @@ -7,3 +7,5 @@ path_max.diff fix_ftbfs_alpha.diff pkgconfig_description.diff +hack-offlineasm-to-prevent-generation-of.patch +make-further-unsuccesful-changes-to-offl.patch diff -Nru qtwebkit-opensource-src-5.212.0~alpha2/debian/rules qtwebkit-opensource-src-5.212.0~alpha2/debian/rules --- qtwebkit-opensource-src-5.212.0~alpha2/debian/rules 2018-01-18 08:33:51.000000000 +0000 +++ qtwebkit-opensource-src-5.212.0~alpha2/debian/rules 2018-01-24 08:28:18.000000000 +0000 @@ -32,9 +32,9 @@ endif # JIT is only supported on x86 / armhf / aarch64 / mips32 -ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)) +#ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF -endif +#endif # Copied from Fedora; see also https://github.com/annulen/webkit/issues/480 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),ppc64el s390x)) @@ -80,3 +80,7 @@ override_dh_strip: dh_strip --dbgsym-migration='libqt5webkit5-dbg (<< 5.212.0~alpha2-1~)' + +override_dh_auto_clean: + rm -f `find . -name '*.pyc'` + dh_auto_clean