summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--index.html10
-rw-r--r--src/qtactiveqt.mk2
-rw-r--r--src/qtbase-1-fixes.patch86
-rw-r--r--src/qtbase.mk6
-rw-r--r--src/qtcanvas3d.mk (renamed from src/qtquick1.mk)12
-rw-r--r--src/qtconnectivity.mk2
-rw-r--r--src/qtdeclarative.mk2
-rw-r--r--src/qtenginio.mk10
-rw-r--r--src/qtgraphicaleffects.mk2
-rw-r--r--src/qtimageformats.mk2
-rw-r--r--src/qtlocation.mk2
-rw-r--r--src/qtmultimedia-1.patch29
-rw-r--r--src/qtmultimedia.mk2
-rw-r--r--src/qtquickcontrols.mk2
-rw-r--r--src/qtquickcontrols2.mk23
-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.mk4
-rw-r--r--src/qtwebkit.mk25
-rw-r--r--src/qtwebsockets.mk2
-rw-r--r--src/qtwebview.mk23
-rw-r--r--src/qtwinextras.mk2
-rw-r--r--src/qtxmlpatterns.mk2
28 files changed, 172 insertions, 92 deletions
diff --git a/index.html b/index.html
index 51b0022..06e2730 100644
--- a/index.html
+++ b/index.html
@@ -2282,6 +2282,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
+ <td class="package">qtcanvas3d</td>
+ <td class="website"><a href="http://qt-project.org/">Qt</a></td>
+ </tr>
+ <tr>
<td class="package">qtconnectivity</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
@@ -2310,11 +2314,11 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
- <td class="package">qtquick1</td>
+ <td class="package">qtquickcontrols</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
- <td class="package">qtquickcontrols</td>
+ <td class="package">qtquickcontrols2</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
@@ -2362,7 +2366,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
- <td class="package">qtwebkit</td>
+ <td class="package">qtwebview</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index a7039fe..2e6fd6b 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -4,7 +4,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 753c734183f33066030667101361f347ecca1445bc1bfe846e49f577a42cbf25
+$(PKG)_CHECKSUM := 6adc7be3859d2c0e54ed7edf6caa35e3863dfa3d476ea40cd9acf7c965ca3277
$(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-fixes.patch b/src/qtbase-1-fixes.patch
index e720936..e754135 100644
--- a/src/qtbase-1-fixes.patch
+++ b/src/qtbase-1-fixes.patch
@@ -3,16 +3,16 @@ See index.html for further information.
Contains ad hoc patches for cross building.
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 6 Aug 2015 23:35:08 +0200
-Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE
+Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
specific)
Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
-index 1111111..2222222 100644
+index 39280de..e152b0d 100644
--- a/src/3rdparty/freetype_dependency.pri
+++ b/src/3rdparty/freetype_dependency.pri
@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
@@ -21,16 +21,19 @@ index 1111111..2222222 100644
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
+ win32:shared:LIBS_PRIVATE += -lfreetype
}
+--
+2.5.0
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+
+From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 21 Jun 2014 13:12:49 +0200
-Subject: [PATCH] use pkg-config for harfbuzz (MXE specific)
+Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
-index 1111111..2222222 100644
+index 32edd6e..a7f2c28 100644
--- a/config.tests/unix/harfbuzz/harfbuzz.pro
+++ b/config.tests/unix/harfbuzz/harfbuzz.pro
@@ -1,3 +1,4 @@
@@ -40,7 +43,7 @@ index 1111111..2222222 100644
+CONFIG += link_pkgconfig
+PKGCONFIG += harfbuzz
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
-index 1111111..2222222 100644
+index 7443368..c24e684 100644
--- a/src/3rdparty/harfbuzz_dependency.pri
+++ b/src/3rdparty/harfbuzz_dependency.pri
@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
@@ -51,16 +54,19 @@ index 1111111..2222222 100644
+ CONFIG += link_pkgconfig
+ PKGCONFIG += harfbuzz
}
+--
+2.5.0
+
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 8 Dec 2014 14:15:12 +0100
-Subject: [PATCH] fix oci config test on windows
+Subject: [PATCH 3/8] fix oci config test on windows
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
-index 1111111..2222222 100644
+index 3ffda1d..39b6f3759 100644
--- a/config.tests/unix/oci/oci.pro
+++ b/config.tests/unix/oci/oci.pro
@@ -1,3 +1,3 @@
@@ -68,19 +74,22 @@ index 1111111..2222222 100644
CONFIG -= qt dylib
-LIBS += -lclntsh
+!win32:LIBS += -lclntsh
+--
+2.5.0
+
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 6 Aug 2015 13:24:56 +0200
-Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
diff --git a/configure b/configure
-index 1111111..2222222 100755
+index 7651e29..4a4b478 100755
--- a/configure
+++ b/configure
-@@ -4464,7 +4464,7 @@ fi
+@@ -4575,7 +4575,7 @@ fi
[ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
# check IPC support
@@ -89,16 +98,19 @@ index 1111111..2222222 100755
# SYSV IPC is not supported - check POSIX IPC
if compileTest unix/ipc_posix "ipc_posix" ; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
+--
+2.5.0
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+
+From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 6 Oct 2015 09:53:20 +0200
-Subject: [PATCH] fix building mysql driver under mingw
+Subject: [PATCH 5/8] fix building mysql driver under mingw
Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
-index 1111111..2222222 100644
+index 3cfb614..8b7063f 100644
--- a/src/sql/drivers/mysql/qsql_mysql.pri
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
@@ -110,11 +122,14 @@ index 1111111..2222222 100644
isEmpty(QT_LFLAGS_MYSQL) {
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
use_libmysqlclient_r:LIBS += -lmysqlclient_r
+--
+2.5.0
+
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 18 Oct 2015 23:11:28 +0300
-Subject: [PATCH] configure: fix log corruption with option -v
+Subject: [PATCH 6/8] configure: fix log corruption with option -v
This bug occurs if ./configure is called with -v on systems on
which fd proc entries point to the files/devices they are open
@@ -150,10 +165,10 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36)
diff --git a/configure b/configure
-index 1111111..2222222 100755
+index 4a4b478..a5c0fd5 100755
--- a/configure
+++ b/configure
-@@ -3571,10 +3571,9 @@ END {
+@@ -3639,10 +3639,9 @@ END {
print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n";
}'
@@ -165,13 +180,16 @@ index 1111111..2222222 100755
+eval "$awkprog_result"
+[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result"
- #setup the build parts
- if [ -z "$CFG_BUILD_PARTS" ]; then
+ echo "Done running configuration tests."
+
+--
+2.5.0
+
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 26 Aug 2015 12:45:43 +0100
-Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets
+Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets
Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
for header-only modules when building Qt5 statically.
@@ -180,7 +198,7 @@ Source: https://git.io/vzWJz
See also: https://github.com/mxe/mxe/issues/1185
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 1111111..2222222 100644
+index d2358ca..6b1dc95 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -200,17 +218,22 @@ index 1111111..2222222 100644
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
!!ENDIF
!!ENDIF
+--
+2.5.0
+
-From 3ebc085c4d7488df899f35e9ac63da819dffc1b9 Mon Sep 17 00:00:00 2001
+From e74803bac8aa2fd2106f678b2b11584fdb582bc3 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 24 Feb 2016 19:39:46 +0300
-Subject: [PATCH] Fix ar error: `u' modifier ignored since `D' is the default (see `U')
+Subject: [PATCH 8/8] Fix ar error: `u' modifier ignored since `D' is the
+ default (see `U')
+
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index 1111111..2222222 100644
+index 61963c7..25cf750 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
-@@ -94,7 +94,7 @@
+@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2
QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
QMAKE_IDL = midl
@@ -219,3 +242,6 @@ index 1111111..2222222 100644
QMAKE_RC = $${CROSS_COMPILE}windres
QMAKE_STRIP = $${CROSS_COMPILE}strip
+--
+2.5.0
+
diff --git a/src/qtbase.mk b/src/qtbase.mk
index f2c6bf2..f2c64f0 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -3,11 +3,11 @@
PKG := qtbase
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 5.5.1
-$(PKG)_CHECKSUM := dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
+$(PKG)_VERSION := 5.6.0
+$(PKG)_CHECKSUM := 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a
$(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.5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt.io/official_releases/qt/5.6/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib
define $(PKG)_UPDATE
diff --git a/src/qtquick1.mk b/src/qtcanvas3d.mk
index d949306..dca97f2 100644
--- a/src/qtquick1.mk
+++ b/src/qtcanvas3d.mk
@@ -1,14 +1,14 @@
# This file is part of MXE.
# See index.html for further information.
-PKG := qtquick1
+PKG := qtcanvas3d
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
-$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
-$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE))
-$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL))
-$(PKG)_DEPS := gcc qtbase qtscript qtsvg qttools qtxmlpatterns
+$(PKG)_CHECKSUM := 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf
+$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR))
+$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE))
+$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL))
+$(PKG)_DEPS := gcc qtbase qtdeclarative
define $(PKG)_UPDATE
echo $(qtbase_VERSION)
diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk
index 3010452..31a4839 100644
--- a/src/qtconnectivity.mk
+++ b/src/qtconnectivity.mk
@@ -4,7 +4,7 @@
PKG := qtconnectivity
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023
+$(PKG)_CHECKSUM := 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb
$(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 57d08e5..d122395 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -4,7 +4,7 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
+$(PKG)_CHECKSUM := 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c
$(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 51b89c8..83e566e 100644
--- a/src/qtenginio.mk
+++ b/src/qtenginio.mk
@@ -3,11 +3,11 @@
PKG := qtenginio
$(PKG)_IGNORE :=
-$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2
-$(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR))
-$(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE))
-$(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL))
+$(PKG)_VERSION = 1.6.0
+$(PKG)_CHECKSUM := 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c
+$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL := $(subst $(qtbase_FILE),$($(PKG)_FILE),$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 12c867f..5706c26 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -4,7 +4,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
+$(PKG)_CHECKSUM := 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8
$(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 dab188c..e76cd37 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -4,7 +4,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5
+$(PKG)_CHECKSUM := 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada
$(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 57c3d9e..f354203 100644
--- a/src/qtlocation.mk
+++ b/src/qtlocation.mk
@@ -4,7 +4,7 @@
PKG := qtlocation
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316
+$(PKG)_CHECKSUM := 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9
$(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-1.patch b/src/qtmultimedia-1.patch
new file mode 100644
index 0000000..82471da
--- /dev/null
+++ b/src/qtmultimedia-1.patch
@@ -0,0 +1,29 @@
+From a0ac50f7a95b3f66519fac62e892b98376576036 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 16 Mar 2016 15:18:00 +0100
+Subject: [PATCH] fix include case
+
+Change-Id: I135deca455ca2ff6bb3969aca990fe9d1c2dd345
+
+diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
+index 3b2c253..7b1af05 100644
+--- a/src/plugins/common/evr/evrdefs.h
++++ b/src/plugins/common/evr/evrdefs.h
+@@ -35,12 +35,12 @@
+ #define EVRDEFS_H
+
+ #include <d3d9.h>
+-#include <Evr9.h>
++#include <evr9.h>
+ #include <evr.h>
+ #include <dxva2api.h>
+ #include <mfapi.h>
+ #include <mfidl.h>
+-#include <Mferror.h>
++#include <mferror.h>
+
+ extern const CLSID clsid_EnhancedVideoRenderer;
+ extern const GUID mr_VIDEO_RENDER_SERVICE;
+--
+2.5.0
+
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index 9a95539..df798fc 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -4,7 +4,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
+$(PKG)_CHECKSUM := 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686
$(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/qtquickcontrols.mk b/src/qtquickcontrols.mk
index 8fd4151..46a2d6b 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -4,7 +4,7 @@
PKG := qtquickcontrols
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
+$(PKG)_CHECKSUM := ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b
$(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/qtquickcontrols2.mk b/src/qtquickcontrols2.mk
new file mode 100644
index 0000000..e7fc90c
--- /dev/null
+++ b/src/qtquickcontrols2.mk
@@ -0,0 +1,23 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := qtquickcontrols2
+$(PKG)_IGNORE :=
+$(PKG)_VERSION = $(qtbase_VERSION)
+$(PKG)_CHECKSUM := 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0
+$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR))
+$(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE))
+$(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL))
+$(PKG)_DEPS := gcc qtbase qtdeclarative
+
+define $(PKG)_UPDATE
+ echo $(qtbase_VERSION)
+endef
+
+define $(PKG)_BUILD
+ # invoke qmake with removed debug options as a workaround for
+ # https://bugreports.qt-project.org/browse/QTBUG-30898
+ cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release'
+ $(MAKE) -C '$(1)' -j '$(JOBS)'
+ $(MAKE) -C '$(1)' -j 1 install
+endef
diff --git a/src/qtscript.mk b/src/qtscript.mk
index efc5649..d8ce6df 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -4,7 +4,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
+$(PKG)_CHECKSUM := ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042
$(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 90ba5cc..2ace18d 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -4,7 +4,7 @@
PKG := qtsensors
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea
+$(PKG)_CHECKSUM := 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e
$(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 b4d993b..0f12d86 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -4,7 +4,7 @@
PKG := qtserialport
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a
+$(PKG)_CHECKSUM := 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f
$(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 ea0ae80..6aa713d 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -4,7 +4,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
+$(PKG)_CHECKSUM := 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f
$(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 a6bce29..d2ec864 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -4,7 +4,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
+$(PKG)_CHECKSUM := 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d
$(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 e4193a3..1667336 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -4,7 +4,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
+$(PKG)_CHECKSUM := 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49
$(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 a0cd4a8..136b25b 100644
--- a/src/qtwebchannel.mk
+++ b/src/qtwebchannel.mk
@@ -4,7 +4,7 @@
PKG := qtwebchannel
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
+$(PKG)_CHECKSUM := c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f
$(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 2f2bd54..bc1c60f 100644
--- a/src/qtwebengine.mk
+++ b/src/qtwebengine.mk
@@ -4,11 +4,11 @@
PKG := qtwebengine
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 7c4d328dd305991aaf0c3450615f4a8e5d80152194bee6f5925bd8d3477e2b90
+$(PKG)_CHECKSUM := 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03
$(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL))
-$(PKG)_DEPS := gcc qtbase qtquickcontrols qtwebkit
+$(PKG)_DEPS := gcc qtbase qtquickcontrols
define $(PKG)_UPDATE
echo $(qtbase_VERSION)
diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk
deleted file mode 100644
index c502e19..0000000
--- a/src/qtwebkit.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG := qtwebkit
-$(PKG)_IGNORE :=
-$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
-$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
-$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE))
-$(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL))
-$(PKG)_DEPS := gcc qtbase qtmultimedia qtquick1 sqlite
-
-define $(PKG)_UPDATE
- echo $(qtbase_VERSION)
-endef
-
-define $(PKG)_BUILD_SHARED
- # 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
- # https://bugreports.qt-project.org/browse/QTBUG-30898
- cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex CONFIG-='debug debug_and_release'
- $(MAKE) -C '$(1)' -j '$(JOBS)'
- $(MAKE) -C '$(1)' -j 1 install
-endef
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index 8ea0f6f..60a898a 100644
--- a/src/qtwebsockets.mk
+++ b/src/qtwebsockets.mk
@@ -4,7 +4,7 @@
PKG := qtwebsockets
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb
+$(PKG)_CHECKSUM := 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f
$(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/qtwebview.mk b/src/qtwebview.mk
new file mode 100644
index 0000000..fa23999
--- /dev/null
+++ b/src/qtwebview.mk
@@ -0,0 +1,23 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := qtwebview
+$(PKG)_IGNORE :=
+$(PKG)_VERSION = $(qtbase_VERSION)
+$(PKG)_CHECKSUM := a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57
+$(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR))
+$(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE))
+$(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL))
+$(PKG)_DEPS := gcc qtbase
+
+define $(PKG)_UPDATE
+ echo $(qtbase_VERSION)
+endef
+
+define $(PKG)_BUILD
+ # invoke qmake with removed debug options as a workaround for
+ # https://bugreports.qt-project.org/browse/QTBUG-30898
+ cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release'
+ $(MAKE) -C '$(1)' -j '$(JOBS)'
+ $(MAKE) -C '$(1)' -j 1 install
+endef
diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk
index ed40f50..9a30719 100644
--- a/src/qtwinextras.mk
+++ b/src/qtwinextras.mk
@@ -4,7 +4,7 @@
PKG := qtwinextras
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := cb00d2ac7a6039fe1119d458f16f319882cb9a250f4caea55657edcde38d851f
+$(PKG)_CHECKSUM := 58951c5334a7dc7f9c3fd62747c1420cced6318dec9ec845a3d14b1e10a8bb93
$(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 07126a2..c628e52 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -4,7 +4,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec
+$(PKG)_CHECKSUM := baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
generated by cgit v0.12 at 2024-09-28 20:54:11 (GMT)