diff options
34 files changed, 53 insertions, 74 deletions
diff --git a/src/qt3d.mk b/src/qt3d.mk index 237da0e..7fdd013 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 := 97925132f0583ccd76f5e104c849341df3abba73dd4d9b647622a23bdae6273f +$(PKG)_CHECKSUM := 12457e7227c793274329371c60b9028ab3e44db837e875e2c460367c1dbd34ab $(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 1c535e1..fa39617 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 := 59ece2126e36321509a0506c32ab8b02ae5736c26b9fea3cd0b01a75fc505399 +$(PKG)_CHECKSUM := f9d74034ffe6e54278f1720d4c8c678f80882b9fffa3b698bd212f0a4b5cd674 $(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 afbbcfa..16e7e08 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 175468257ac65fc97370330d25b014c50642f572 Mon Sep 17 00:00:00 2001 +From 217773585b1b6db3dd7cd1df5581da0f6f5dc1c4 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 @@ -35,7 +35,7 @@ index 55c74aad66..d7bcffeb9c 100644 2.14.1 -From 5739bd00432dba348b6a598a525390566b061c3f Mon Sep 17 00:00:00 2001 +From 5e4b97c8a228274121bafc2ed003d84552bf97cc 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 @@ -63,10 +63,10 @@ Task-number: 30898 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 36f632e8ca..b07085ac42 100644 +index c0a8dcc251..d5e24ac1cc 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -263,6 +263,10 @@ load(qt_installs) +@@ -265,6 +265,10 @@ load(qt_installs) load(qt_targets) @@ -77,7 +77,7 @@ index 36f632e8ca..b07085ac42 100644 # this builds on top of qt_common !internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc -@@ -273,12 +277,12 @@ load(qt_targets) +@@ -275,12 +279,12 @@ load(qt_targets) QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME @@ -94,7 +94,7 @@ index 36f632e8ca..b07085ac42 100644 pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -312,5 +316,3 @@ win32 { +@@ -314,5 +318,3 @@ win32 { # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 } @@ -104,7 +104,7 @@ index 36f632e8ca..b07085ac42 100644 2.14.1 -From 9701b36a23339705ae8d4d936a0cb210c41aac02 Mon Sep 17 00:00:00 2001 +From 1ef5456da03ae02672f71a276f06fe9b9c80f454 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) @@ -112,10 +112,10 @@ Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific) Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f diff --git a/src/gui/configure.json b/src/gui/configure.json -index 28c8034c75..cf9753ba21 100644 +index 0a591e110c..4791b34525 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -905,7 +905,7 @@ +@@ -928,7 +928,7 @@ }, "fontconfig": { "label": "Fontconfig", @@ -144,7 +144,7 @@ index ca33689cd7..194523eee0 100644 2.14.1 -From f4a3e4168f52bac9a7db7ac9c539d52a986ce34b Mon Sep 17 00:00:00 2001 +From e9432e47e3c25e9630ce34dd11a2d72472e90a85 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 29 Jan 2017 16:22:03 +0100 Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS @@ -168,7 +168,7 @@ index b69b51b679..d37423adbd 100644 2.14.1 -From 973a39266b682f248588a388e136ea7239339ac3 Mon Sep 17 00:00:00 2001 +From 50e1a4a60a2348cbcdb261056559cad0d2c16f15 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 5/6] use pkg-config for harfbuzz @@ -176,10 +176,10 @@ Subject: [PATCH 5/6] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index cf9753ba21..4061920b8d 100644 +index 4791b34525..5f6062170d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -218,7 +218,8 @@ +@@ -220,7 +220,8 @@ ] }, "sources": [ @@ -193,7 +193,7 @@ index cf9753ba21..4061920b8d 100644 2.14.1 -From 677fbc1c2f68e4b73bff065620a73078191c5a70 Mon Sep 17 00:00:00 2001 +From 1d43b7d2db26cace31f12b8d9229dc8866618d42 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 7 Oct 2017 11:39:29 +0200 Subject: [PATCH 6/6] Revert "qmake: don't limit command line length when not @@ -204,10 +204,10 @@ This breaks cross compiling for mingw. This reverts commit 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c. diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 185afaaa49..20a2a6fab0 100644 +index 884286ea30..780e551282 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf -@@ -50,10 +50,8 @@ QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console +@@ -52,10 +52,8 @@ QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows QMAKE_LFLAGS_DLL = -shared QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections diff --git a/src/qtbase.mk b/src/qtbase.mk index 8d7d600..446742e 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -4,11 +4,11 @@ PKG := qtbase $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := -$(PKG)_VERSION := 5.9.3 -$(PKG)_CHECKSUM := 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 -$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := https://download.qt.io/official_releases/qt/5.9/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_VERSION := 5.10.0 +$(PKG)_CHECKSUM := fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762 +$(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.10/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib define $(PKG)_UPDATE diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 89c3079..8f000c9 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 := 5e38b17844af801be57844da0379cc6882750b9019034f4fe884aae70c300abc +$(PKG)_CHECKSUM := d289626f06236f2c0e3065416fd6a8a72b8895cb5253ee2d9b6320df5b452987 $(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 d70b0af..1abd09c 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 := ec1783a81d5715fc48a3276e67b90a66cac3e283ac14fc3bf88b2058994d69e9 +$(PKG)_CHECKSUM := 12ce2c4a8467d349ecfdba831cc03c539f2b207aa21082a4e1043dcf8f1b31ef $(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 fb11ad4..deadda1 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 := e2891e6e8d91e82e3c4d5667f3146062458067c0b706d65ac0fc7562afce0649 +$(PKG)_CHECKSUM := 2e3fe2e872449065ec3326955fb97c629106f62b9441e8dfd2e0adfc9fb169a6 $(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 db66500..f6e80e3 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 := 709f69487dea9a8b44764c0dc92d65080bc0949038ed774897792a427a34c368 +$(PKG)_CHECKSUM := 9206c4d7a093a20b57d0e5013aadd6fc52bccb321eb0d3329efccc44481f6618 $(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.mk b/src/qtdeclarative.mk index da4e949..06d2db6 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 := 505f66d2062c1d84ce743a0b4969531e1cf94e30970dc64efffe10f74f989407 +$(PKG)_CHECKSUM := 5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e $(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 ccd7f72..cd9ab69 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 := c69fcacdc81338e1eba43138ecedf3e7a1b34315349522c0070a04cc4acc6a93 +$(PKG)_CHECKSUM := 537550f988a71942392b3df21044e4cd566378bad2d9727663c9e8e7743e87e6 $(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 ce780a3..d6b4b79 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 := 790b029bc8bdbb5c9548ecad2ff6e73b7da3deabbdba6bacac4a6aacd3a0f0d9 +$(PKG)_CHECKSUM := 97b969112f21161fc924c1b1c98f1dad2bf7027e31b27ea9eec532db7b045e30 $(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 a42ae50..cea8ff8 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 := d4b309ddbac2275cafadffc62047a26ed8f169bde015925761894843eae725dd +$(PKG)_CHECKSUM := 91bfb884f965af6d6c187f8ac4f9bb1f9fe0af59cbbe36e035ee5f5510b7f4fc $(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 14a4429..279fd8c 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 := 80fd425cde8747c1fc79aa90994a9caf921d7c79ff41babec692fe43cdc74ce1 +$(PKG)_CHECKSUM := d84dcec7cfbc99a13e048f935783b0c2e1cb540defc82d77ac869a5b76aa85c7 $(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 6b3bcad..d91b87f 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 := e79558d24ace9b4444d91d807b85778b6a0a592e7d1500ffadf45f7d3b8238a6 +$(PKG)_CHECKSUM := 008333fdc3bc2d87977392397d38ebaae1329059997319cb1b0613fb6489806f $(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/qtpurchasing.mk b/src/qtpurchasing.mk index f65d98a..2e68351 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 := 1268781935d6f8a1eb9fcfe5d2e8eb4b116658b07e039db43bee6507406bce03 +$(PKG)_CHECKSUM := 8c773d399cab724b02cb1d7c9d352b181bb4d6f08bd2672f65da308c18d57d56 $(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 dc8581c..387e8b0 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 := 300eeebd7d2c243c0123bc2324b5643b3f967c0816aead0ba7b993aeeac0e226 +$(PKG)_CHECKSUM := a133ef7724d5d2eef4085920d463af78024f327d0ae320f24202a51b554e6129 $(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 42c8dd3..86dc312 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 := 21aaa26956ad0ccc3ce86ced7925ceae4b4cef25c6c5ef2f7ded608431420843 +$(PKG)_CHECKSUM := 818770247a3a211714dfc17f7f5a07c6cf49999ff405d36fd00fab1d5559a1a1 $(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/qtscript.mk b/src/qtscript.mk index 001caa3..85efb1d 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 := b80bfaaf58f154b68101e438a1881f669cb9974026926be7755adb00af355566 +$(PKG)_CHECKSUM := 6cf2f2f09ccafa9c9cd5d16641ae2b75b7f98947de6ec0ec1717489f3a09cafc $(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 dc7b3fa..6c1085c 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 := d8f51fa8eddd09fef29d8fad6e570e9ca9403469543ab10cb5cfad738786a81b +$(PKG)_CHECKSUM := 4bbb19d6b169ab04aec62d09ed4324639cda13d2c25cf584c9061c5d9af65890 $(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 3c9461a..94c8e2e 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 := b95ea20b3d616655435357671558631da6fe6970500b7e6d35d1111f0b8cdac1 +$(PKG)_CHECKSUM := cd98c5afb25bdb243b03a8e1da1a9643fbad334549c8128328446d0818fe3971 $(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 191d7fe..d871bb4 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 := ef62745e1793515e03fa586171de13eb17ee7699c9eb626f76a4dc5a00c46938 +$(PKG)_CHECKSUM := 3f594784d952dd40e6d7740cd6267a9259a877330cecd83feebef81f5200391b $(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 0f78b80..cc8e050 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 := 4cdd3e9157ec3e91078f993cd28651989fa2429a409e19d398fb9cced231abdf +$(PKG)_CHECKSUM := e580fed9ffd2a978df72775205a96b21d619b5fd5f5754f653864a206e831457 $(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 792f6d2..ec60d26 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 := 01526024437dfc1e4f652e0b883fc3333260321aacee4c51774018bf86bb99b0 +$(PKG)_CHECKSUM := 79159e1a9502ccb67145e0f6bdc43e3c2248835ff22be04a10c18db15a845ac1 $(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 2bb4767..219697f 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 := df6628a60c8fbbcff99e6a24955c29494268d741509a3367a2294031ab4f5df2 +$(PKG)_CHECKSUM := 4a2aa7cae70a3156846655422b9ed884d8b08b3707b95858e49c7cf9afe5e7b0 $(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-test/CMakeLists.txt b/src/qttools-test/CMakeLists.txt index 320056a..9f8f163 100644 --- a/src/qttools-test/CMakeLists.txt +++ b/src/qttools-test/CMakeLists.txt @@ -16,6 +16,8 @@ target_link_libraries( ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES} + netapi32 + userenv opengl32 harfbuzz jpeg diff --git a/src/qttools.mk b/src/qttools.mk index 0043e08..e4c9673 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 := 442c38de3e35f9dcc355dadff35436e23a5a7abd7dd1167a3bf6325e3d9284ff +$(PKG)_CHECKSUM := 1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32 $(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 632ff66..5bbb802 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 := 40ac57ec79dd4fd27dff7a9d8abe8ebe2106c19a4b60daf007353f4671909bd9 +$(PKG)_CHECKSUM := ec4dbd3601afe06d1814f4bc81af9cffbbe7de2b9f4aef4eb4595b049c8eb9be $(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 9542ebf..de5b6ef 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 := b9313f744026f0dcf6e1008212880cd34851499d8b6bc9fc9fbaa1e4e52532ff +$(PKG)_CHECKSUM := 2c2ddd65a335ecdd15e9ff1032a1634330e0d2359760f2a968b21dbc9f4e0b57 $(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 f4b440b..bd2c2da 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 := 632795b293f1318e9aaa1e124b6a39b1625c8c1e35b0a9f05a02ea0066458358 +$(PKG)_CHECKSUM := f22424dc6235110bb7f587b01ce692738af1497fba2a9739fa90a5e57ba135a3 $(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 823d5a7..445d768 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 := ce069dff5b552bc6039bcf17e211d2c8837757e2194773bb54054105866111de +$(PKG)_CHECKSUM := 17ab0fa22007e5485bf98cb5fef5387628274548d5e96923f45d097838f49403 $(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 2c992e1..8d34458 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 := ee5663e4294c09e7c762c6cc8ed7cf8e7bd9776ac557c29c76b7f967907729c5 +$(PKG)_CHECKSUM := aa8f69e507467f8d0c1ccb6f5cb4d8a6b41af2f9f358e1813a4d0875d874a5a4 $(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 d9ff8bf..e67e093 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 := 145e6325ad8207dccdddb4680be34c63063b9671dddcb6c0dc17561f8ac244d2 +$(PKG)_CHECKSUM := cd136ede985b64ec883b1b24054b5ce308f43b64e28f9932c35c0d5861c4a5d7 $(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-1.patch b/src/qtxmlpatterns-1.patch deleted file mode 100644 index f90018c..0000000 --- a/src/qtxmlpatterns-1.patch +++ /dev/null @@ -1,23 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 5a2c60539f7cf6626bbeef3cca44aa172a64cc23 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 18 May 2013 17:03:55 +0200 -Subject: [PATCH] mingw build fix: _fileno - - -diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro -index 0f1ee4f..2fdebb1 100644 ---- a/tools/xmlpatterns/xmlpatterns.pro -+++ b/tools/xmlpatterns/xmlpatterns.pro -@@ -11,6 +11,7 @@ HEADERS = main.h \ - qapplicationargument.cpp \ - qapplicationargumentparser.cpp - -+win32-g++*:QMAKE_CXXFLAGS += -U__STRICT_ANSI__ - load(qt_tool) - - # with c++11 / __STRICT_ANSI__ mingw.org stdio.h doesn't declare e.g. _fileno --- -1.8.4.5 - diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 9ba71f2..e8aa90f 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 := cf9c66a612a963382f7b4b51ac8ee5e920bd035b26ecb5c5957f8f3d3286f0ba +$(PKG)_CHECKSUM := b08abca6227e942a128e478b2eb81416c40925418d89064ee151c155e3d203c3 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) |