History

qtwebkit: re-enable build

Tony Theodore committed 10 years ago

Commit 19d0acd1 parent 1a94ae02 files · +17 −6Browse files

Unified · Split

2 files
  1. src/qtwebkit-1-fixes.patch +17 −0
  2. src/qtwebkit.mk +0 −6
src/qtwebkit-1-fixes.patch+17−0
@@ -0,0 +1,17 @@
1+This file is part of MXE.
2+See index.html for further information.
3+
4+Taken from:
5+https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch
6+
7+--- a/Source/WebCore/DerivedSources.pri 2012-12-21 14:10:41 +0300
8++++ b/Source/WebCore/DerivedSources.pri 2012-12-21 14:12:19 +0300
9+@@ -704,7 +704,7 @@
10+ preprocessIdls.input = IDL_ATTRIBUTES_FILE
11+ preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT
12+ # FIXME : We need to use only perl at some point.
13+-win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
14++win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC
15+ else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC
16+ for(binding, IDL_BINDINGS) {
17+ # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304)
src/qtwebkit.mk+0−6
@@ -10,17 +10,11 @@ $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) · 9 unmodified lines
1010 $(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL))
1111 $(PKG)_DEPS := gcc qtbase qtmultimedia qtquick1 sqlite
1212
13−$(PKG)_MESSAGE :=*** qtwebkit is deprecated in Qt 5.5 ***
14−
1513 define $(PKG)_UPDATE
1614 echo $(qtbase_VERSION)
1715 endef
1816
1917 define $(PKG)_BUILD_SHARED
20− echo qtwebkit is deprecated in Qt 5.5
21−endef
22−
23−define $(PKG)_BUILD_SHARED_DISABLED
2418 # looks for build tools with .exe suffix and tries to use win_flex
2519 $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf'
2620 # invoke qmake with removed debug options as a workaround for

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t