Merge version 5.212.0~alpha2-20+rpi1 and 5.212.0~alpha2-21 to produce 5.212.0~alpha2... buster-staging archive/raspbian/5.212.0_alpha2-21+rpi1 raspbian/5.212.0_alpha2-21+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Tue, 2 Apr 2019 19:29:56 +0000 (20:29 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Tue, 2 Apr 2019 19:29:56 +0000 (20:29 +0100)
1  2 
debian/changelog
debian/patches/series
debian/rules

index 919aef04125af5b24d1818bc87f50e16ec351492,f5973170b24277451c2eb1cbe6666bac028ddf1f..5452d44811a8ee8739f129a7e5c4ca520f26766f
@@@ -1,13 -1,12 +1,23 @@@
- qtwebkit-opensource-src (5.212.0~alpha2-20+rpi1) buster-staging; urgency=medium
++qtwebkit-opensource-src (5.212.0~alpha2-21+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 05 Mar 2019 17:51:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Apr 2019 19:29:55 +0000
++
+ 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 <mitya57@debian.org>  Fri, 22 Mar 2019 11:42:38 +0300
  
  qtwebkit-opensource-src (5.212.0~alpha2-20) unstable; urgency=medium
  
index 1caaf04f4926e233269c6e6e59cc232147419d7d,f6c027ff8db696a27fc81f3d6dc72fed62e8012a..27ff794b913c1adf46112afef4b44d7282a33f5a
@@@ -11,5 -11,4 +11,6 @@@ use_system_woff2.dif
  pkgconfig_includedir.diff
  doxygen_tags.diff
  fix_trojita_plaintext.diff
+ i386_fastcall.diff
 +hack-offlineasm-to-prevent-generation-of.patch
 +make-further-unsuccesful-changes-to-offl.patch
diff --cc debian/rules
Simple merge