diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-01-19 12:10:49 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2017-01-25 21:51:18 (GMT) |
| commit | 9a6c17c0e363a31a8fd483b10970225b5f2fe2cb (patch) | |
| tree | af4b21e08f90b1fb18805ed93dc4138aa5c31336 /src/qtwebkit-1-fixes.patch | |
| parent | 4ac6a5db65fe44976c8ddd246340ea123bccc5a5 (diff) | |
| download | mxe-9a6c17c0e363a31a8fd483b10970225b5f2fe2cb.zip mxe-9a6c17c0e363a31a8fd483b10970225b5f2fe2cb.tar.gz mxe-9a6c17c0e363a31a8fd483b10970225b5f2fe2cb.tar.bz2 | |
qtwebkit: fix missing _mm_mfence declaration
Diffstat (limited to 'src/qtwebkit-1-fixes.patch')
| -rw-r--r-- | src/qtwebkit-1-fixes.patch | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/src/qtwebkit-1-fixes.patch b/src/qtwebkit-1-fixes.patch index 9bcc452..4590929 100644 --- a/src/qtwebkit-1-fixes.patch +++ b/src/qtwebkit-1-fixes.patch @@ -1,11 +1,20 @@ This file is part of MXE. See LICENSE.md for licensing information. +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Wed, 18 Jan 2017 19:38:56 +1100 +Subject: [PATCH] fix msys build + Taken from: https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch ---- a/Source/WebCore/DerivedSources.pri 2012-12-21 14:10:41 +0300 -+++ b/Source/WebCore/DerivedSources.pri 2012-12-21 14:12:19 +0300 -@@ -704,7 +704,7 @@ +diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri +index 1111111..2222222 100644 +--- a/Source/WebCore/DerivedSources.pri ++++ b/Source/WebCore/DerivedSources.pri +@@ -752,7 +752,7 @@ IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt preprocessIdls.input = IDL_ATTRIBUTES_FILE preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT # FIXME : We need to use only perl at some point. @@ -14,3 +23,25 @@ https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-b else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC for(binding, IDL_BINDINGS) { # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 25 Sep 2016 22:21:54 +0200 +Subject: [PATCH] Include intrin.h for declaration of _mm_mfence + +taken from: +https://aur.archlinux.org/cgit/aur.git/tree/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch?h=mingw-w64-qt5-webkit + +diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h +index 1111111..2222222 100644 +--- a/Source/WTF/wtf/Atomics.h ++++ b/Source/WTF/wtf/Atomics.h +@@ -68,6 +68,8 @@ + #elif !COMPILER(GCC) + extern "C" void _ReadWriteBarrier(void); + #pragma intrinsic(_ReadWriteBarrier) ++#else ++#include <intrin.h> + #endif + #include <windows.h> + #elif OS(QNX) |