diff options
author | Mark Brand <mabrand@mabrand.nl> | 2019-02-01 22:09:20 (GMT) |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2019-02-02 10:03:41 (GMT) |
commit | 8df83ccd322f3f8b23148f640064336922b93d62 (patch) | |
tree | c044d4c0eae9998010da738914f5a99fa8e1d074 | |
parent | 00bd4d7cc1557eb8b1c4dfc38acf46bfe9f3a7b7 (diff) | |
download | mxe-8df83ccd322f3f8b23148f640064336922b93d62.zip mxe-8df83ccd322f3f8b23148f640064336922b93d62.tar.gz mxe-8df83ccd322f3f8b23148f640064336922b93d62.tar.bz2 |
qt5: update to 5.12.1
36 files changed, 50 insertions, 188 deletions
diff --git a/src/qt3d.mk b/src/qt3d.mk index 24698bc..f7cc071 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da +$(PKG)_CHECKSUM := ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1 $(PKG)_SUBDIR = $(subst qtbase,qt3d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qt3d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qt3d,$(qtbase_URL)) diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index e6bfbf7..3509124 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e +$(PKG)_CHECKSUM := a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45 $(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 f4a7e16..8fd432e 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -1,9 +1,9 @@ This file is part of MXE. See LICENSE.md for licensing information. -From f1dbf592c625533c9f8a704e4d5f12f3111a1fb3 Mon Sep 17 00:00:00 2001 +From 01ee0b5260f1b83a81769132c0705aab05481641 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 1/6] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -35,10 +35,10 @@ index 3ed6dd5889..cc5bc9dc16 100644 2.19.1 -From b822f7ff799d10297b0b36408e7cfa44fd416118 Mon Sep 17 00:00:00 2001 +From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/6] Fix pkgconfig file and library naming +Subject: [PATCH 2/5] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 @@ -104,18 +104,18 @@ index 51b5bde67a..faba17aedd 100644 2.19.1 -From 7773e45dfdd82ede2415a6818332de3e36e7c824 Mon Sep 17 00:00:00 2001 +From 6a7989a069a7aa88e898c4f68bd753b480af0cdf Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific) +Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0332631ec8..e2d87e77b3 100644 +index 89934c8f1d..456643a22c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -1003,7 +1003,7 @@ +@@ -1209,7 +1209,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", @@ -145,20 +145,20 @@ index 0c04608fca..a26e02fbf3 100644 2.19.1 -From 82d08b0378db0a30007ca5ee965ffa034859af5c Mon Sep 17 00:00:00 2001 +From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 4/6] use pkg-config for harfbuzz +Subject: [PATCH 4/5] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index e2d87e77b3..4eb37aea17 100644 +index 456643a22c..f36e15603b 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -224,7 +224,8 @@ - ] +@@ -301,7 +301,8 @@ }, + "headers": "harfbuzz/hb.h", "sources": [ - "-lharfbuzz" + { "type": "pkgConfig", "args": "harfbuzz" }, @@ -170,10 +170,10 @@ index e2d87e77b3..4eb37aea17 100644 2.19.1 -From 8ea9633854e8c2ad94df00866a9b9e3a4394d161 Mon Sep 17 00:00:00 2001 +From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 5/6] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 Workaround for gcc internal error compiling for mingw32: global/qrandom.cpp: In function 'qsizetype qt_random_cpu(void*, qsizetype)': @@ -191,7 +191,7 @@ Based on https://codereview.qt-project.org/#/c/212360/ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 23e5e499b2..d0b3159c0d 100644 +index 6195c324e7..94902bcfc2 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -206,65 +206,3 @@ index 23e5e499b2..d0b3159c0d 100644 -- 2.19.1 - -From ef8e04865ce94182a04c5ce9c08e3e648b8ee39e Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen <ville.voutilainen@qt.io> -Date: Wed, 21 Nov 2018 14:07:18 +0200 -Subject: [PATCH 6/6] Fix compilation of qendian's qswap specializations on gcc - 4.8 - -Task-number: QTBUG-71945 -Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b -Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> -(cherry picked from commit 1eeebae7e3b5eb8dda37755b32aafe6719b5cf7b) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 0e67a1ab8e..f2e5833468 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) - return qFromUnaligned<Float>(&temp); - } - --template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) -+inline qfloat16 qbswap(qfloat16 source) - { - return qbswapFloatHelper(source); - } - --template <> inline float qbswap<float>(float source) -+inline float qbswap(float source) - { - return qbswapFloatHelper(source); - } - --template <> inline double qbswap<double>(double source) -+inline double qbswap(double source) - { - return qbswapFloatHelper(source); - } -@@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source) - */ - template <typename T> inline void qbswap(const T src, void *dest) - { -- qToUnaligned<T>(qbswap<T>(src), dest); -+ qToUnaligned<T>(qbswap(src), dest); - } - - template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept; -@@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp - #else // Q_LITTLE_ENDIAN - - template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) - { return source; } - template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) --- -2.19.1 - diff --git a/src/qtbase.mk b/src/qtbase.mk index f4ba026..03f9ab0 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -4,8 +4,8 @@ PKG := qtbase $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := -$(PKG)_VERSION := 5.12.0 -$(PKG)_CHECKSUM := 5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb +$(PKG)_VERSION := 5.12.1 +$(PKG)_CHECKSUM := 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://download.qt.io/official_releases/qt/5.12/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index f2d1f68..9a76f7f 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128 +$(PKG)_CHECKSUM := c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254 $(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) diff --git a/src/qtcharts.mk b/src/qtcharts.mk index 365cdf5..a5373dc 100644 --- a/src/qtcharts.mk +++ b/src/qtcharts.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450 +$(PKG)_CHECKSUM := 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0 $(PKG)_SUBDIR = $(subst qtbase,qtcharts,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtcharts,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtcharts,$(qtbase_URL)) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 61509ba..80e1dd2 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4 +$(PKG)_CHECKSUM := 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c $(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/qtdatavis3d.mk b/src/qtdatavis3d.mk index 5f9af68..041d17a 100644 --- a/src/qtdatavis3d.mk +++ b/src/qtdatavis3d.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433 +$(PKG)_CHECKSUM := 8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0 $(PKG)_SUBDIR = $(subst qtbase,qtdatavis3d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdatavis3d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdatavis3d,$(qtbase_URL)) diff --git a/src/qtdeclarative-1-fixes.patch b/src/qtdeclarative-1-fixes.patch deleted file mode 100644 index b792f3c..0000000 --- a/src/qtdeclarative-1-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -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: Richard Moe Gustavsen <richard.gustavsen@qt.io> -Date: Mon, 26 Nov 2018 11:07:22 +0100 -Subject: [PATCH 1/1] QQuickTableView: connect directly to the model, and not - to the QPointer - -Fixes building with gcc 4.8.4 - -From: https://codereview.qt-project.org/#/c/246558/2//ALL,unified - -Change-Id: I61810102bba20c21321112c63e7197bbe05ec27d -Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> -Reviewed-by: Michael Brasser <michael.brasser@live.com> - -diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp -index 1111111..2222222 100644 ---- a/src/quick/items/qquicktableview.cpp -+++ b/src/quick/items/qquicktableview.cpp -@@ -1647,8 +1647,9 @@ void QQuickTableViewPrivate::connectToModel() - QObjectPrivate::connect(model, &QQmlInstanceModel::initItem, this, &QQuickTableViewPrivate::initItemCallback); - - if (tableModel) { -- QObjectPrivate::connect(tableModel, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); -- QObjectPrivate::connect(tableModel, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); -+ const auto tm = tableModel.data(); -+ QObjectPrivate::connect(tm, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); -+ QObjectPrivate::connect(tm, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); - } - - if (auto const aim = model->abstractItemModel()) { -@@ -1678,8 +1679,9 @@ void QQuickTableViewPrivate::disconnectFromModel() - QObjectPrivate::disconnect(model, &QQmlInstanceModel::initItem, this, &QQuickTableViewPrivate::initItemCallback); - - if (tableModel) { -- QObjectPrivate::disconnect(tableModel, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); -- QObjectPrivate::disconnect(tableModel, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); -+ const auto tm = tableModel.data(); -+ QObjectPrivate::disconnect(tm, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); -+ QObjectPrivate::disconnect(tm, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); - } - - if (auto const aim = model->abstractItemModel()) { diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index cbfd239..35c3b0b 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b +$(PKG)_CHECKSUM := a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409 $(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/qtgamepad.mk b/src/qtgamepad.mk index 9b07abc..f6f4c57 100644 --- a/src/qtgamepad.mk +++ b/src/qtgamepad.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091 +$(PKG)_CHECKSUM := 717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62 $(PKG)_SUBDIR = $(subst qtbase,qtgamepad,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgamepad,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgamepad,$(qtbase_URL)) diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 030b848..a9b6d33 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455 +$(PKG)_CHECKSUM := 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7 $(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 803a943..e6b3c5d 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e +$(PKG)_CHECKSUM := 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421 $(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 13e17df..d97d6b1 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449 +$(PKG)_CHECKSUM := 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50 $(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-fixes.patch b/src/qtmultimedia-1-fixes.patch deleted file mode 100644 index d16c1c8..0000000 --- a/src/qtmultimedia-1-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -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: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 17 Sep 2018 12:38:35 +0200 -Subject: [PATCH 1/1] mingw-w64 6 fix - - -diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h -index 1111111..2222222 100644 ---- a/src/plugins/common/evr/evrdefs.h -+++ b/src/plugins/common/evr/evrdefs.h -@@ -83,6 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**); - #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L) - #endif - -+#if __MINGW64_VERSION_MAJOR < 6 - #ifdef __GNUC__ - typedef struct MFVideoNormalizedRect { - float left; -@@ -91,6 +92,7 @@ typedef struct MFVideoNormalizedRect { - float bottom; - } MFVideoNormalizedRect; - #endif -+#endif - - #include <initguid.h> - diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index b13cc08..57cf959 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9 +$(PKG)_CHECKSUM := 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18 $(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/qtnetworkauth.mk b/src/qtnetworkauth.mk index 59ab7af..6c55171 100644 --- a/src/qtnetworkauth.mk +++ b/src/qtnetworkauth.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775 +$(PKG)_CHECKSUM := 090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c $(PKG)_SUBDIR = $(subst qtbase,qtnetworkauth,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtnetworkauth,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtnetworkauth,$(qtbase_URL)) diff --git a/src/qtpurchasing.mk b/src/qtpurchasing.mk index f3f42a6..5348b5d 100644 --- a/src/qtpurchasing.mk +++ b/src/qtpurchasing.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da +$(PKG)_CHECKSUM := 80485095ab64f48951b27795c72e7ed7c13e1ab3db2670c061548834584b1d19 $(PKG)_SUBDIR = $(subst qtbase,qtpurchasing,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtpurchasing,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtpurchasing,$(qtbase_URL)) diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 6802975..e64a947 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73 +$(PKG)_CHECKSUM := 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c $(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 index 4f39472..24a72c2 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6 +$(PKG)_CHECKSUM := caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7 $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL)) diff --git a/src/qtremoteobjects.mk b/src/qtremoteobjects.mk index 45926a2..b19d4bb 100644 --- a/src/qtremoteobjects.mk +++ b/src/qtremoteobjects.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f +$(PKG)_CHECKSUM := f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740 $(PKG)_SUBDIR = $(subst qtbase,qtremoteobjects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtremoteobjects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtremoteobjects,$(qtbase_URL)) diff --git a/src/qtscript.mk b/src/qtscript.mk index 73aa773..769f8e5 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8 +$(PKG)_CHECKSUM := e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624 $(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/qtscxml.mk b/src/qtscxml.mk index 3875c93..f62f765 100644 --- a/src/qtscxml.mk +++ b/src/qtscxml.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b +$(PKG)_CHECKSUM := 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7 $(PKG)_SUBDIR = $(subst qtbase,qtscxml,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtscxml,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtscxml,$(qtbase_URL)) diff --git a/src/qtsensors.mk b/src/qtsensors.mk index da14265..7d1e223 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6 +$(PKG)_CHECKSUM := ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4 $(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/qtserialbus.mk b/src/qtserialbus.mk index 5b1acf8..79a78a9 100644 --- a/src/qtserialbus.mk +++ b/src/qtserialbus.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a +$(PKG)_CHECKSUM := 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74 $(PKG)_SUBDIR = $(subst qtbase,qtserialbus,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtserialbus,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtserialbus,$(qtbase_URL)) diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 5a25612..3c33428 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb +$(PKG)_CHECKSUM := 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19 $(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/qtspeech.mk b/src/qtspeech.mk index 9338b8f..964ff7b 100644 --- a/src/qtspeech.mk +++ b/src/qtspeech.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE = $(qtbase_WEBSITE) $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb +$(PKG)_CHECKSUM := 147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121 $(PKG)_SUBDIR = $(subst qtbase,qtspeech,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtspeech,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtspeech,$(qtbase_URL)) diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 2b654e4..118653d 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce +$(PKG)_CHECKSUM := 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8 $(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 a1c45c9..3448152 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3 +$(PKG)_CHECKSUM := ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3 $(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 f0896e1..19b6b32 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508 +$(PKG)_CHECKSUM := 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7 $(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/qtvirtualkeyboard.mk b/src/qtvirtualkeyboard.mk index 4d3b47b..6dbc761 100644 --- a/src/qtvirtualkeyboard.mk +++ b/src/qtvirtualkeyboard.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da +$(PKG)_CHECKSUM := a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683 $(PKG)_SUBDIR = $(subst qtbase,qtvirtualkeyboard,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtvirtualkeyboard,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtvirtualkeyboard,$(qtbase_URL)) diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index 8bc266c..df24f4f 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0 +$(PKG)_CHECKSUM := 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf $(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/qtwebsockets.mk b/src/qtwebsockets.mk index 6c40adf..0b39c64 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f +$(PKG)_CHECKSUM := 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79 $(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 index 94eeb02..aef4283 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185 +$(PKG)_CHECKSUM := 092624ba45913f6c90f7311c96bb5c3e97f2c2b427d834d3669434f97234bc97 $(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL)) diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 73152d7..073b680 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c64f5acde4d73d4bf45fab377cf3db7f4cf7044fb8854bb24aabbbbc0109dad0 +$(PKG)_CHECKSUM := 8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557 $(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 99dbaaa..d586f4d 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375 +$(PKG)_CHECKSUM := 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) |