[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=458a0e7

The following commit has been merged in the experimental branch:
commit 458a0e7ea82232c699301499250225b4f1c5d01f
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Wed Aug 20 23:43:57 2014 +0200

    Distable WTF_USE_3D_GRAPHICS on ARM.
    
    Picked from Ubuntu packaging.
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 50d2902..8cdaaf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,12 @@ override_dh_auto_configure:
 	true
 
 override_dh_auto_build:
+#disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
 #disable forcing SSE2 on all other platforms
-ifneq (,$(filter arm64 powerpc ppc64el armhf,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 powerpc ppc64el,$(DEB_HOST_ARCH)))
 	./Tools/Scripts/build-webkit --qt
+else ifeq ($(DEB_HOST_ARCH),armhf)
+	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0
 else
 	./Tools/Scripts/build-webkit --qt --no-force-sse2
 endif

-- 
QtWebKit packaging