summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2015-07-01 12:06:12 (GMT)
committerMark Brand <mabrand@mabrand.nl>2015-08-06 23:26:02 (GMT)
commit1d6ea923deebe2a6caebda68727afddef397f6b3 (patch)
treedc1a4d105e8805845b680400349bdd4245d914d2
parentfb90595e848df59fbc1da36f1a5189ac36ed640b (diff)
downloadmxe-1d6ea923deebe2a6caebda68727afddef397f6b3.zip
mxe-1d6ea923deebe2a6caebda68727afddef397f6b3.tar.gz
mxe-1d6ea923deebe2a6caebda68727afddef397f6b3.tar.bz2
update qt5 modules
-rw-r--r--src/qtactiveqt-1.patch36
-rw-r--r--src/qtactiveqt.mk2
-rw-r--r--src/qtbase-1.patch95
-rw-r--r--src/qtbase.mk6
-rw-r--r--src/qtconnectivity.mk2
-rw-r--r--src/qtdeclarative.mk2
-rw-r--r--src/qtenginio.mk2
-rw-r--r--src/qtgraphicaleffects.mk2
-rw-r--r--src/qtimageformats.mk2
-rw-r--r--src/qtlocation.mk2
-rw-r--r--src/qtmultimedia.mk2
-rw-r--r--src/qtquick1.mk2
-rw-r--r--src/qtquickcontrols.mk2
-rw-r--r--src/qtscript.mk2
-rw-r--r--src/qtsensors.mk2
-rw-r--r--src/qtserialport.mk2
-rw-r--r--src/qtsvg.mk2
-rw-r--r--src/qttools.mk2
-rw-r--r--src/qttranslations.mk2
-rw-r--r--src/qtwebchannel.mk2
-rw-r--r--src/qtwebengine.mk2
-rw-r--r--src/qtwebkit.mk2
-rw-r--r--src/qtwebsockets.mk2
-rw-r--r--src/qtwinextras-1.patch31
-rw-r--r--src/qtwinextras.mk2
-rw-r--r--src/qtxmlpatterns.mk2
26 files changed, 116 insertions, 96 deletions
diff --git a/src/qtactiveqt-1.patch b/src/qtactiveqt-1.patch
index 38d24aa..76d9177 100644
--- a/src/qtactiveqt-1.patch
+++ b/src/qtactiveqt-1.patch
@@ -1,10 +1,10 @@
This file is part of MXE.
See index.html for further information.
-From 470bf2340d0c275d9e02492f11e4103e081d1f93 Mon Sep 17 00:00:00 2001
+From 6b7bd2f322cf0ff02c1954c7947216af829d4b15 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 21 May 2014 08:59:53 +0200
-Subject: [PATCH] Revert "idc is a host tool"
+Subject: [PATCH 1/2] Revert "idc is a host tool"
This reverts commit a52db1a707f84eae74ce1cc3d1058f026e81ac13.
@@ -21,5 +21,35 @@ index 1898ed5..524ee2e 100644
SOURCES = main.cpp
--
-1.8.4.5
+2.1.4
+
+
+From 31d513a1814e600433a213931c79fb4f9f875122 Mon Sep 17 00:00:00 2001
+From: Eric Lemanissier <eric.lemanissier@gmail.com>
+Date: Wed, 29 Jul 2015 16:11:59 +0200
+Subject: [PATCH 2/2] fix build with MinGW header version >= 4.0
+
+Commit 66e1ecc2 broke the compilation with MinGW64 4.0 and above.
+The work-around for mingw-w64 bug #464 must be applied to
+all MinGW versions that are affected.
+
+Change-Id: Ie6665d076dc1e38e459ae3c9cc51202b4a12e736
+Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
+(cherry picked from commit 46159b840cfcfeaea5b1c78d1d0e4fa40d679366)
+
+diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
+index 81bcb8f..1d1711b 100644
+--- a/src/activeqt/container/qaxscript.cpp
++++ b/src/activeqt/container/qaxscript.cpp
+@@ -41,7 +41,7 @@
+ #include "qaxscript.h"
+ #include "../shared/qaxutils_p.h"
+
+-#if defined(Q_CC_GNU) && __MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0
++#if defined(Q_CC_GNU) && (__MINGW64_VERSION_MAJOR == 3 && __MINGW64_VERSION_MINOR > 0 || __MINGW64_VERSION_MAJOR >= 4)
+ // Workaround for mingw-w64 bug #464
+ // See https://sourceforge.net/p/mingw-w64/bugs/464/
+ # define _NO_SCRIPT_GUIDS
+--
+2.1.4
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 22b297a..c9da4fd 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -4,7 +4,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := ff020cb348fd392209c1c7d87bdbf43cb4622a0b
+$(PKG)_CHECKSUM := 0d3b92b1b0f86025d742226dadb6cb3c698912eb
$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL))
diff --git a/src/qtbase-1.patch b/src/qtbase-1.patch
index b802e9e..ef17c96 100644
--- a/src/qtbase-1.patch
+++ b/src/qtbase-1.patch
@@ -1,67 +1,32 @@
This file is part of MXE.
See index.html for further information.
-From 90cd274c70f9532cfc58b1a741ccd480715f006d Mon Sep 17 00:00:00 2001
+From 2a005d22af074aff326d57b25e1cea1abda8ee6e Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 26 Feb 2013 13:23:33 +0100
-Subject: [PATCH 1/4] use pkg-config for freetype
+Date: Thu, 6 Aug 2015 23:35:08 +0200
+Subject: [PATCH 1/4] fix qwindows plugin linking with system-freetype (MXE
+ specific)
-Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
+Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
-diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri
-index c2b882e..3834d83 100644
---- a/src/platformsupport/fontdatabases/basic/basic.pri
-+++ b/src/platformsupport/fontdatabases/basic/basic.pri
-@@ -83,5 +83,7 @@ contains(QT_CONFIG, freetype) {
+diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
+index 39280de..e152b0d 100644
+--- a/src/3rdparty/freetype_dependency.pri
++++ b/src/3rdparty/freetype_dependency.pri
+@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
} else:contains(QT_CONFIG, system-freetype) {
# pull in the proper freetype2 include directory
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-+ CONFIG += link_pkgconfig
-+ PKGCONFIG += freetype2
++ win32:shared:LIBS_PRIVATE += -lfreetype
}
-
---
-2.1.4
-
-
-From f43e7ee33db38727c574cf14b42a1d377e91cfd1 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 18 May 2013 23:07:46 +0200
-Subject: [PATCH 2/4] use pkgconfig for icu detection (MXE specific)
-
-Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
-
-diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
-index 16267ff..dd9fb6c 100644
---- a/config.tests/unix/icu/icu.pro
-+++ b/config.tests/unix/icu/icu.pro
-@@ -2,16 +2,5 @@ SOURCES = icu.cpp
- CONFIG += console
- CONFIG -= qt dylib
-
--win32 {
-- CONFIG(static, static|shared) {
-- CONFIG(debug, debug|release) {
-- LIBS += -lsicuind -lsicuucd -lsicudtd
-- } else {
-- LIBS += -lsicuin -lsicuuc -lsicudt
-- }
-- } else {
-- LIBS += -licuin -licuuc -licudt
-- }
--} else {
-- LIBS += -licui18n -licuuc -licudata
--}
-+CONFIG += link_pkgconfig
-+PKGCONFIG += icu-i18n
--
2.1.4
-From 536262f746f5110edf5c50949a4ce1c94bd8b8e4 Mon Sep 17 00:00:00 2001
+From 2baad6771338e3c2361f515a4ba6bf0f26812a6b Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 21 Jun 2014 13:12:49 +0200
-Subject: [PATCH 3/4] use pkg-config for harfbuzz (MXE specific)
+Subject: [PATCH 2/4] use pkg-config for harfbuzz (MXE specific)
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
@@ -75,10 +40,10 @@ index 32edd6e..a7f2c28 100644
-LIBS += -lharfbuzz
+CONFIG += link_pkgconfig
+PKGCONFIG += harfbuzz
-diff --git a/src/3rdparty/harfbuzzng.pri b/src/3rdparty/harfbuzzng.pri
+diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
index 7443368..c24e684 100644
---- a/src/3rdparty/harfbuzzng.pri
-+++ b/src/3rdparty/harfbuzzng.pri
+--- a/src/3rdparty/harfbuzz_dependency.pri
++++ b/src/3rdparty/harfbuzz_dependency.pri
@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
INCLUDEPATH += $$PWD/harfbuzz-ng/include
LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
@@ -91,10 +56,10 @@ index 7443368..c24e684 100644
2.1.4
-From 8f057f09c41b12133643a3080cca0076b9153d05 Mon Sep 17 00:00:00 2001
+From c526e9fc734f91d5174399ab539b75dd3de3f8a4 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 8 Dec 2014 14:15:12 +0100
-Subject: [PATCH 4/4] fix oci config test on windows
+Subject: [PATCH 3/4] fix oci config test on windows
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
@@ -110,3 +75,27 @@ index 3ffda1d..39b6f3759 100644
--
2.1.4
+
+From 35759dbe5a613f9006190cd135cc8ec994cf71e5 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 6 Aug 2015 13:24:56 +0200
+Subject: [PATCH 4/4] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+
+Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
+
+diff --git a/configure b/configure
+index 8a4c89e..eb432b5 100755
+--- a/configure
++++ b/configure
+@@ -4451,7 +4451,7 @@ fi
+ [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
+
+ # check IPC support
+-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
++if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then
+ # SYSV IPC is not supported - check POSIX IPC
+ if compileTest unix/ipc_posix "ipc_posix" ; then
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
+--
+2.1.4
+
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 5c1c8bd..f04e3cc 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -3,11 +3,11 @@
PKG := qtbase
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 5.4.2
-$(PKG)_CHECKSUM := 3703c6a584193e759f5b9cbf0ea6022d685ab827
+$(PKG)_VERSION := 5.5.0
+$(PKG)_CHECKSUM := 3d6734bc6d00e1017c1db40d68309997bdf7bf6f
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://download.qt.io/official_releases/qt/5.4/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt.io/official_releases/qt/5.5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc postgresql freetds openssl harfbuzz zlib libpng jpeg sqlite pcre fontconfig freetype dbus
define $(PKG)_UPDATE
diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk
index 759e7ad..ee56c76 100644
--- a/src/qtconnectivity.mk
+++ b/src/qtconnectivity.mk
@@ -4,7 +4,7 @@
PKG := qtconnectivity
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 66b9b3034b84cef7b21c71bafa755930d2f1e4ce
+$(PKG)_CHECKSUM := b393471529502028b0d5318088a27e48e944bc90
$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL))
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 6b9b8b6..a627f45 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -4,7 +4,7 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 3d5f346e3dd377f66bf193316c259d21e3eccb8d
+$(PKG)_CHECKSUM := f41766db6f6bc8b9cefff05543891c271436043e
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL))
diff --git a/src/qtenginio.mk b/src/qtenginio.mk
index 4c6c19a..a7fbc37 100644
--- a/src/qtenginio.mk
+++ b/src/qtenginio.mk
@@ -4,7 +4,7 @@
PKG := qtenginio
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 3be31b3178801ddc258d9f381fe034d77d1da5a3
+$(PKG)_CHECKSUM := 14b961bea8cf2f2d4510283d6120038dbf90d29d
$(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL))
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index cdd86f2..60e946a 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -4,7 +4,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 72abe24fe63d56ce2142cf7aeb43ad7f7ee06b39
+$(PKG)_CHECKSUM := 1e9ca2b5d1fdfe6a73dfd646868c5351989ecccc
$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 50aaf0e..56acf22 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -4,7 +4,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 15dab37445225f979509a4d0a1cef776955ca01b
+$(PKG)_CHECKSUM := cffd35f9742f13a0c5afc04eab27b7b47338e800
$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
diff --git a/src/qtlocation.mk b/src/qtlocation.mk
index b48892a..2b3587a 100644
--- a/src/qtlocation.mk
+++ b/src/qtlocation.mk
@@ -4,7 +4,7 @@
PKG := qtlocation
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := c3b49b1ae4eb4a02ae525b14a8096f0d1cac02e6
+$(PKG)_CHECKSUM := afa2f83e83ba85749d8784bc9d11132702ae404a
$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL))
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index c2f1fb1..071ed8c 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -4,7 +4,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 4a76bfc2567de7a72ae22156e4d49e186d889848
+$(PKG)_CHECKSUM := 3438c16f498e40eaa68cd518b76ddd81c02a5471
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL))
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 1f91be1..79df827 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -4,7 +4,7 @@
PKG := qtquick1
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := d47f8488f24e5de8328a844725afa6bd541a1699
+$(PKG)_CHECKSUM := 27d67436cd902bb8b89b5808e4cc4a34fd61ac75
$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL))
diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk
index cf97369..758b1a7 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -4,7 +4,7 @@
PKG := qtquickcontrols
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := fdd3e0cafe69bcf27870b1d1b8a2c94e91c1aaff
+$(PKG)_CHECKSUM := 9b12048acb3555f7e98bd6c1333437fb04cf60d6
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL))
diff --git a/src/qtscript.mk b/src/qtscript.mk
index a808e65..f09ab45 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -4,7 +4,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 91ca6d9c6a017ed47d9c731867a03c5be1f3ea88
+$(PKG)_CHECKSUM := ed5cf73c8217a249535442c49a8a0e5c43f6e648
$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL))
diff --git a/src/qtsensors.mk b/src/qtsensors.mk
index 40f480d..3bd1f6d 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -4,7 +4,7 @@
PKG := qtsensors
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := f585798e4620721224edc86220153de35077ccae
+$(PKG)_CHECKSUM := bd4b2fb7685f80ef1661ced90ff665b4b27216aa
$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL))
diff --git a/src/qtserialport.mk b/src/qtserialport.mk
index a9a2287..1d78d96 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -4,7 +4,7 @@
PKG := qtserialport
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := aa843f96fe1a49d91eb7582d3be5035de5b5508e
+$(PKG)_CHECKSUM := 371da46f2f2ad652a22b0f04e4b48f088976d3ce
$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL))
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index 28828fd..91ef09f 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -4,7 +4,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := aaf98efe775cfba210b2a72281365f0612884f6a
+$(PKG)_CHECKSUM := 9238a1aedd126f84a73014c12b6391267238da0a
$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
diff --git a/src/qttools.mk b/src/qttools.mk
index 69cde16..26d62ca 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -4,7 +4,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 346f0c000203623559a24e75a7808390721f35bb
+$(PKG)_CHECKSUM := be69ccb338bcc7b397a8b31d7ba0a45fe677390e
$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index 7a5b703..4c032d7 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -4,7 +4,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := a7825e593526108e70bceaa274f184105a2bd465
+$(PKG)_CHECKSUM := ddd3357ee9ce3e1221585a938461f92238c770c4
$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk
index 9b4ba58..3422c78 100644
--- a/src/qtwebchannel.mk
+++ b/src/qtwebchannel.mk
@@ -4,7 +4,7 @@
PKG := qtwebchannel
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 6f5c15f50c45df6392ab0e01c47043fd0100a389
+$(PKG)_CHECKSUM := 7c45ecb9c4226207f184b5cf25d1a18d650075da
$(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL))
diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk
index 42e9afc..d69704d 100644
--- a/src/qtwebengine.mk
+++ b/src/qtwebengine.mk
@@ -4,7 +4,7 @@
PKG := qtwebengine
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 5d6f4bfadc5e2aeca44266147b0e76a43feda987
+$(PKG)_CHECKSUM := e080d91b707af6ad096e356189488ffd65115553
$(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL))
diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk
index a670ec8..6887644 100644
--- a/src/qtwebkit.mk
+++ b/src/qtwebkit.mk
@@ -4,7 +4,7 @@
PKG := qtwebkit
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 402cd585ed7fea63b338fa6f89aec8b21db3564a
+$(PKG)_CHECKSUM := 8489ffa9253ab429b75f65117e435624dd78f769
$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL))
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index b616d98..46b4f09 100644
--- a/src/qtwebsockets.mk
+++ b/src/qtwebsockets.mk
@@ -4,7 +4,7 @@
PKG := qtwebsockets
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 726523b736d252f7ef2247456858e27ca92697b9
+$(PKG)_CHECKSUM := 215f4e8d8170933d68e9395d966ecf6213fc0a74
$(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL))
diff --git a/src/qtwinextras-1.patch b/src/qtwinextras-1.patch
index ebe93ee..7259d7a 100644
--- a/src/qtwinextras-1.patch
+++ b/src/qtwinextras-1.patch
@@ -1,25 +1,26 @@
This file is part of MXE.
See index.html for further information.
-From 45d94cc9d6d7a9e2e1349e826c44fa342149a867 Mon Sep 17 00:00:00 2001
+From dc0cb681cde6899b40923570c29adcf1c20c54cb Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 24 Oct 2013 22:29:51 +0200
-Subject: [PATCH] Fix MinGW-w64 GCC 4.8.2 compilation
+Date: Thu, 6 Aug 2015 20:41:14 +0200
+Subject: [PATCH] fix undefined reference to `__imp_CreateRectRgn'
+Change-Id: I707d168173b210034e3dff9580388fb630d858f8
-diff --git a/src/winextras/winshobjidl_p.h b/src/winextras/winshobjidl_p.h
-index 91faed5..352c405 100644
---- a/src/winextras/winshobjidl_p.h
-+++ b/src/winextras/winshobjidl_p.h
-@@ -222,7 +222,7 @@ public:
+diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
+index 7f6bba4..835b2e7 100644
+--- a/src/winextras/winextras.pro
++++ b/src/winextras/winextras.pro
+@@ -47,7 +47,7 @@ QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf
- #if (defined _MSC_VER && _MSC_VER < 1600) || defined(Q_CC_MINGW)
+ DEFINES += NTDDI_VERSION=0x06010000 _WIN32_WINNT=0x0601
+ LIBS_PRIVATE += -lole32 -lshlwapi -lshell32
+-win32:!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32
++win32:shared|!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32
--# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301
-+# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 300
-
- typedef struct SHARDAPPIDINFOLINK
- {
+ OTHER_FILES += \
+ doc/qtwinextras.qdocconf \
--
-1.8.4.5
+2.1.4
diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk
index 949a335..cdc8e0c 100644
--- a/src/qtwinextras.mk
+++ b/src/qtwinextras.mk
@@ -4,7 +4,7 @@
PKG := qtwinextras
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 884b7b99eb29f8540f0c0fb3c8dcb2ee66ed31f2
+$(PKG)_CHECKSUM := 1e53f18a4c373df2f4e0206a836041fd1d06f1d7
$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL))
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 495c9db..9068273 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -4,7 +4,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 6c98c6a5b8fd4f07bf709e0470f9988c86dfe15c
+$(PKG)_CHECKSUM := d961f998980264f19916f70c8585da8479a84724
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))