[SCM] qt5webkit packaging branch, master, updated. debian/5.212.0_alpha2-5-8-g0e009e0

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=7ffb82a

The following commit has been merged in the master branch:
commit 7ffb82ab3f9b564e99395413ba40b0c2c9dd4698
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 9 18:19:42 2018 +0300

    Backport upstream changes to fix build on Alpha.
    
    Closes: #880640.
---
 debian/changelog                    |  1 +
 debian/patches/fix_ftbfs_alpha.diff | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b0dca54..b0c46b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-6) UNRELEASED; urgency=medium
     - Make sure JIT is not enabled on x32.
     - Backport upstream patch to use JSVALUE32_64 on x32.
     - Use gold linker on x32, to avoid undefined reference error.
+  * Backport upstream changes to fix build on Alpha (closes: #880640).
 
   [ Pino Toscano ]
   * Fix build on hurd-i386:
diff --git a/debian/patches/fix_ftbfs_alpha.diff b/debian/patches/fix_ftbfs_alpha.diff
new file mode 100644
index 0000000..322f36d
--- /dev/null
+++ b/debian/patches/fix_ftbfs_alpha.diff
@@ -0,0 +1,36 @@
+Description: fix HPPA and Alpha builds
+Origin: upstream, https://github.com/annulen/webkit/commit/63c79407eb4c0a96
+Last-Update: 2018-01-09
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,6 +61,8 @@
+     set(WTF_CPU_ARM 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+     set(WTF_CPU_ARM64 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha*")
++    set(WTF_CPU_ALPHA 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+     set(WTF_CPU_MIPS 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -1279,6 +1279,7 @@
+ 
+ if (WTF_CPU_ARM)
+ elseif (WTF_CPU_ARM64)
++elseif (WTF_CPU_ALPHA)
+ elseif (WTF_CPU_HPPA)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -348,7 +348,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3dd2ba9..8ce2fe8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_copyChars_segfault.diff
 fix_selectedHtml_segfault.diff
 fix_ftbfs_x32.diff
 path_max.diff
+fix_ftbfs_alpha.diff

-- 
qt5webkit packaging