From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 18 Feb 2020 16:01:07 +0000 (+0000)
Subject: Manual merge of version 2.26.3-1~deb10u1+rpi1 and 2.26.4-1~deb10u1 to produce 2.26... 
X-Git-Tag: archive/raspbian/2.26.4-1_deb10u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77eb4a0acf74820eb096fd578f5787210c4914e7;p=webkit2gtk.git

Manual merge of version 2.26.3-1~deb10u1+rpi1 and 2.26.4-1~deb10u1 to produce 2.26.4-1~deb10u1+rpi1
---

77eb4a0acf74820eb096fd578f5787210c4914e7
diff --cc debian/changelog
index 4e2944b9f2,af7f9066c7..69a9de643a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,6 +1,14 @@@
- webkit2gtk (2.26.3-1~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.26.4-1~deb10u1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 13:18:18 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 18 Feb 2020 15:31:56 +0000
 +
- webkit2gtk (2.26.3-1~deb10u1) buster-security; urgency=medium
+ webkit2gtk (2.26.4-1~deb10u1) buster-security; urgency=medium
  
-   * Rebuild for buster-security.
-     + This fixes CVE-2019-8835, CVE-2019-8844 and CVE-2019-8846.
-       See https://webkitgtk.org/security/WSA-2020-0001.html.
+   * Rebuild for buster-backports.
    * debian/patches/force-single-process.patch:
      + Force the single-process mode in Evolution and Geary
    * debian/control:
diff --cc debian/rules
index e3e9a75845,7e387dd3f8..2cd6f62578
--- a/debian/rules
+++ b/debian/rules
@@@ -32,11 -32,11 +32,16 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),arm64
  	EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF
  endif
  
 +# https://bugs.webkit.org/show_bug.cgi?id=188862
 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
 +	EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
 +endif
 +
+ # Disable Gold where it causes build problems, see #949618
+ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
+ 	EXTRA_CMAKE_ARGUMENTS += -DUSE_LD_GOLD=OFF
+ endif
+ 
  ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
  	EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
  	CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS