qt: fix build on aarch64.

2015-06-09 18:04:25 +00:00 · 2015-06-09 18:04:25 +00:00 · 8138061893
parent bd5f37d58d
commit 8138061893
2 changed files with 62 additions and 0 deletions
--- a/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@ -0,0 +1,34 @@
+From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
+From: Pavel Heimlich <tropikhajma@gmail.com>
+Date: Wed, 26 Sep 2012 20:31:10 +0200
+Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
+ building nativesdk-qt4-tools
+
+Patch has apparently been rejected upstream, not because it is invalid
+but because the submitter did not submit a merge request for it, so the
+validity of the patch upstream is uncertain. For further details see:
+https://bugreports.qt-project.org/browse/QTBUG-17962
+
+Upstream-Status: Denied [possible retry]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/dbus/qdbusintegrator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index 0f0b647..aa4cbab 100644
+--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
+@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
+-- 
+1.8.0
+
--- a/srcpkgs/qt/patches/aarch64-webkit.patch
+++ b/srcpkgs/qt/patches/aarch64-webkit.patch
@ -0,0 +1,28 @@
+--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2015-05-07 14:14:45.000000000 +0000  
+++ qt-everywhere-opensource-src-4.8.7.patched/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2015-06-09 14:55:33.493388000 +0000  
+@@ -369,6 +369,15 @@
+ 
+ #endif /* ARM */
+ 
+/* CPU(AARCH64) - AArch64 */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64EB__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
+
+ #if CPU(ARM) || CPU(MIPS) || CPU(SH4)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+@@ -1003,7 +1012,8 @@
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+     || CPU(PPC64) \
+-    || CPU(MIPS64)
+    || CPU(MIPS64) \
+    || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1