From 19d0acd474e39fbc2c2f7f136f9abaafdfcdc337 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 22:27:06 +1100 Subject: [PATCH] qtwebkit: re-enable build --- src/qtwebkit-1-fixes.patch | 17 +++++++++++++++++ src/qtwebkit.mk | 6 ------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 src/qtwebkit-1-fixes.patch diff --git a/src/qtwebkit-1-fixes.patch b/src/qtwebkit-1-fixes.patch new file mode 100644 index 00000000..b9d88532 --- /dev/null +++ b/src/qtwebkit-1-fixes.patch @@ -0,0 +1,17 @@ +This file is part of MXE. +See index.html for further information. + +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 @@ + preprocessIdls.input = IDL_ATTRIBUTES_FILE + preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT + # FIXME : We need to use only perl at some point. +-win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC ++win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC + 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) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 2e8b4858..c502e197 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -10,17 +10,11 @@ $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL)) $(PKG)_DEPS := gcc qtbase qtmultimedia qtquick1 sqlite -$(PKG)_MESSAGE :=*** qtwebkit is deprecated in Qt 5.5 *** - define $(PKG)_UPDATE echo $(qtbase_VERSION) endef define $(PKG)_BUILD_SHARED - echo qtwebkit is deprecated in Qt 5.5 -endef - -define $(PKG)_BUILD_SHARED_DISABLED # looks for build tools with .exe suffix and tries to use win_flex $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' # invoke qmake with removed debug options as a workaround for