From 66f535d6446091c6caa595ae7b83ef63747f3f17 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 5 Sep 2019 14:01:12 +0200 Subject: [PATCH] qt5: update to 5.13.1 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 30 +++++++++---------- src/qtbase.mk | 4 +-- src/qtcharts.mk | 2 +- src/qtconnectivity.mk | 2 +- src/qtdatavis3d.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtgamepad.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats-1.patch | 59 ++------------------------------------ src/qtimageformats.mk | 2 +- src/qtlocation-1.patch | 15 +++++----- src/qtlocation.mk | 2 +- src/qtmultimedia.mk | 2 +- src/qtnetworkauth.mk | 2 +- src/qtpurchasing.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtquickcontrols2.mk | 2 +- src/qtremoteobjects.mk | 2 +- src/qtscript.mk | 2 +- src/qtscxml.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialbus.mk | 2 +- src/qtserialport.mk | 2 +- src/qtspeech.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtvirtualkeyboard.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 35 files changed, 58 insertions(+), 112 deletions(-) diff --git a/src/qt3d.mk b/src/qt3d.mk index a51bcd7f..69d1c7f3 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 := 9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f +$(PKG)_CHECKSUM := 092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452 $(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 027f0de3..291c4442 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 := 7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323 +$(PKG)_CHECKSUM := d2ad456c4b354fa08dc6b42894453ba18db52b09ba7b7921c3f6225772099495 $(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 a43e70f4..b392597f 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 86164c585b85559746c0eb80a7354a01d311bf64 Mon Sep 17 00:00:00 2001 +From 2ff7d50d0f701915d810569d19e1413674aec79d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/4] cmake: Rearrange STATIC vs INTERFACE targets @@ -12,10 +12,10 @@ 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 705e0a3c93..1adac54d3b 100644 +index d4fd057682..600c8273f1 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -291,6 +291,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -323,6 +323,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,7 +25,7 @@ index 705e0a3c93..1adac54d3b 100644 !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -328,9 +331,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -360,9 +363,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -39,7 +39,7 @@ index 705e0a3c93..1adac54d3b 100644 2.20.1 -From 2bdf75033a353d809d6faf2af33cf0af1d1282ff Mon Sep 17 00:00:00 2001 +From 7c3a397e8cc07ac4dad174dc6a0f4e02834b1f72 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 Subject: [PATCH 2/4] Fix pkgconfig file and library naming @@ -67,10 +67,10 @@ Task-number: 30898 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 51b5bde67a..faba17aedd 100644 +index 46687f262e..4b2980a1a8 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -263,6 +263,10 @@ load(qt_installs) +@@ -268,6 +268,10 @@ load(qt_installs) load(qt_targets) @@ -81,7 +81,7 @@ index 51b5bde67a..faba17aedd 100644 # this builds on top of qt_common !internal_module:if(unix|mingw) { CONFIG += create_pc -@@ -278,12 +282,12 @@ load(qt_targets) +@@ -283,12 +287,12 @@ load(qt_targets) QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME } @@ -95,10 +95,10 @@ index 51b5bde67a..faba17aedd 100644 isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module + QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module - pclib_replace.match = $$lib_replace.match - !isEmpty(lib_replace.replace): \ - pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -317,5 +321,3 @@ win32 { + !isEmpty(lib_replace0.match) { + pclib_replace0.match = $$lib_replace0.match + pclib_replace0.replace = $$QMAKE_PKGCONFIG_LIBDIR/ +@@ -334,5 +338,3 @@ win32 { # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 } @@ -108,7 +108,7 @@ index 51b5bde67a..faba17aedd 100644 2.20.1 -From 04a80b8d9d5ec64efb61f440238113a82015e7df Mon Sep 17 00:00:00 2001 +From a4fe5af173b82d95c741df30d151576b2bc4e0b7 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 3/4] use pkg-config for harfbuzz @@ -133,7 +133,7 @@ index 6280b4dfa2..e094ee12e6 100644 2.20.1 -From ba796f23ed3145a856c6a05abee5d526c3b10d58 Mon Sep 17 00:00:00 2001 +From 033d4a71054d41f48d38027f091edc76526b8911 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 Subject: [PATCH 4/4] disable qt_random_cpu for i686-w64-mingw32 @@ -154,7 +154,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 90df8653a7..0d7002f2e8 100644 +index bf01b7ae2a..26bcaf0326 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 diff --git a/src/qtbase.mk b/src/qtbase.mk index ff4500f4..003313ea 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.13.0 -$(PKG)_CHECKSUM := ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe +$(PKG)_VERSION := 5.13.1 +$(PKG)_CHECKSUM := 110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab $(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.13/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtcharts.mk b/src/qtcharts.mk index bc514d5c..0d1e295b 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 := 04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27 +$(PKG)_CHECKSUM := 95fb573137bfd9e3655d4fb0e9fc80894e58d4f5fc02c48e46068cee27ff7aad $(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 03eac624..f3bec090 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 := 64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053 +$(PKG)_CHECKSUM := a1c4120ca00a8b6f275d6ad3f94565fd154b5ec2c7ca167f99cdccf6b0d5ee6f $(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 fe3867d0..15859eff 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 := 6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821 +$(PKG)_CHECKSUM := b153f05028eabf9485c6b5c321fb3e093402be9d8717518dd9eaaad8fafaa256 $(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 a36b897d..cbc44294 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 := b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9 +$(PKG)_CHECKSUM := ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2 $(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 ed1d292d..46c48818 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 := 6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63 +$(PKG)_CHECKSUM := 660e2bea430be5dc75557d038f162b77454c945ab6df1a1f4a7d69011e02c199 $(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 e78a61f1..1ed9e686 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 := 33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff +$(PKG)_CHECKSUM := f6611773c1104c26fed412dc559ae34563dbd7aea9582722fdde098cc3cbc8a7 $(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-1.patch b/src/qtimageformats-1.patch index dfc8ad19..b09629f9 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -1,63 +1,13 @@ This file is part of MXE. See LICENSE.md for licensing information. -From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann -Date: Tue, 7 May 2019 11:30:05 +0200 -Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng -This amends commit a33e3aea. - -Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 -Reviewed-by: Liang Qi -(cherry picked from commit 626c3053efd7905080ac4a65fca55551391a36e3) - -diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro -index 4641110..f509fa8 100644 ---- a/src/plugins/imageformats/mng/mng.pro -+++ b/src/plugins/imageformats/mng/mng.pro -@@ -5,8 +5,10 @@ SOURCES += main.cpp \ - qmnghandler.cpp - OTHER_FILES += mng.json - --msvc: LIBS += libmng.lib --else: LIBS += -lmng -+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -+QT_FOR_CONFIG += imageformats-private -+ -+QMAKE_USE_PRIVATE += mng - - PLUGIN_TYPE = imageformats - PLUGIN_CLASS_NAME = QMngPlugin -diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 04cfbdb..0c42749 100644 ---- a/src/plugins/imageformats/tiff/tiff.pro -+++ b/src/plugins/imageformats/tiff/tiff.pro -@@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h - SOURCES += main.cpp qtiffhandler.cpp - OTHER_FILES += tiff.json - --config_libtiff { -- unix|mingw: LIBS += -ltiff -- else:win32: LIBS += libtiff.lib -+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -+QT_FOR_CONFIG += imageformats-private -+ -+qtConfig(system-tiff) { -+ QMAKE_USE_PRIVATE += tiff - } else { - include($$PWD/../../../3rdparty/libtiff.pri) - } --- -2.20.1 - - -From 9daaac5a219fb55628f0542e905d7157c2c68296 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 17 Jun 2019 13:54:23 +0200 -Subject: [PATCH 2/2] use pkgconfig +Subject: [PATCH 1/1] use pkgconfig diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json -index 03d59d3..0cd3715 100644 +index 1111111..2222222 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -51,9 +51,6 @@ @@ -115,6 +65,3 @@ index 03d59d3..0cd3715 100644 "-lwebp -lwebpdemux" ] } --- -2.20.1 - diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index b61e5c1f..368a1694 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 := 91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499 +$(PKG)_CHECKSUM := f6aa1e3fe6c3d786e211e4bd46a1349192efd82364739c0d708b7f2003a93ddf $(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-1.patch b/src/qtlocation-1.patch index 75140f39..23cc2fc1 100644 --- a/src/qtlocation-1.patch +++ b/src/qtlocation-1.patch @@ -1,15 +1,17 @@ -From 59c9b6ace8c06c3aa8a74abf9e3e3b02b5687cd2 Mon Sep 17 00:00:00 2001 +This file is part of MXE. See LICENSE.md for licensing information. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 2 Jun 2017 18:23:20 +0200 -Subject: [PATCH] disable mapboxgl for MXE +Subject: [PATCH 1/1] disable mapboxgl for MXE diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 0810d392..de781ed1 100644 +index 1111111..2222222 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro -@@ -10,7 +10,8 @@ qtConfig(c++14):!win32|mingw:!qnx { - !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { +@@ -12,7 +12,8 @@ qtConfig(geoservices_mapboxgl) { + !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { - SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native @@ -19,6 +21,3 @@ index 0810d392..de781ed1 100644 + message(MXE: mapboxgl disabled) } } --- -2.11.0 - diff --git a/src/qtlocation.mk b/src/qtlocation.mk index 9630898b..23aad8ef 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 := 205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414 +$(PKG)_CHECKSUM := 16bd4d64b12fc3f8276fe37985f2b0f5443317c882937ab5e0b583a3a9eed298 $(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 f2018990..1751b90d 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 := 5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72 +$(PKG)_CHECKSUM := 5efdb5876596c3472d24acf1ed753574dfa87b500458ea675c3112e8c2acec65 $(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 dfd39f16..37564a7d 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 := 91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d +$(PKG)_CHECKSUM := d5306dd7d6aa128382505046b06ad7f9c17c56a9c4277dc862c13add06b89e4a $(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 1dd66b11..bdf8976f 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 := 8aba72cf543f3ef26d128824f844487beea319fbd155931a8771afcf48cdeb7e +$(PKG)_CHECKSUM := 7e5ef82f758cb73285920c9f6918454504450f03e0323e357cfe2f3f2552f559 $(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 f7d82646..e3b9d5cc 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 := a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167 +$(PKG)_CHECKSUM := 5f3dd9a7c25aabe7a21ed7d137c23e2bfff948fefe94b183b5dee1a13667eb9b $(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 bc2c462c..f5d53ba7 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 := a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d +$(PKG)_CHECKSUM := 47df5a0d9b65bd6d06fc7edc2a93fba679249d4942163230a72ff6f3cc9f7ab8 $(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 e84e23d3..1f317a8e 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 := 24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc +$(PKG)_CHECKSUM := 892a10502b2659e6a0f20167a5b6d71338fd01082e33e4b07eba43b0bbfcce69 $(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 51587bc5..61387bb0 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 := 2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80 +$(PKG)_CHECKSUM := 870c65c5dff20eb797a629bd4544aa60874f44eecc0743300e83cce5708648c8 $(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 7642ff4b..256a657d 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 := fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766 +$(PKG)_CHECKSUM := 0669ede4e1373199893308362b9a0ba828f570a578dca52e1f17d1d622612511 $(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 4fc449a2..c3ac6a77 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 := 1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48 +$(PKG)_CHECKSUM := fa55e96bebb946326c46b720059536bce1e939a63b60f3c990a24ac8fec759d3 $(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 e4aa04f1..a3089fb3 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 := 5ef8ce8d7dbdd4065e1a1e842d7effb7134ce262790fcd59076937f3b40b78f3 +$(PKG)_CHECKSUM := 643bf5512212a1dc89047d25ed3f766bf08362c143f1da485f5235d3023ca565 $(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 74915237..1bf2cdb2 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 := 2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985 +$(PKG)_CHECKSUM := d96706f406d89b459ed0ecd129b68309a91cea0f132b839958b5311ea0d118d2 $(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 c1ea18b9..332fc3a1 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 := 1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644 +$(PKG)_CHECKSUM := 347343a96710b389e8e05506df3c971b9437f101d09677e44f4bf2a87bf25556 $(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 92ea8e36..771e20e7 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 := 0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf +$(PKG)_CHECKSUM := 409e8845c28412041c36f559a7a6e2414f3d9a8dd45c5a85065e279b788e07ab $(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 880b57ed..4b4f0f7f 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 := a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819 +$(PKG)_CHECKSUM := 7947bdd758514a0c2d44b0a2110adb6056b18bce75c716711e48bcc8de5c7e82 $(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 1d30c2b7..fb9b78f5 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 := 2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28 +$(PKG)_CHECKSUM := 01320c62ce28c5d7bc6d3c078e11d4d80415ab007ad94ffe1a635a2ce0ddccfd $(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 560d458a..2687f694 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 := 91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9 +$(PKG)_CHECKSUM := b44b2f788250a85d86f682bea4c0cdc8a70dd630d44682a545790b2618b28195 $(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 e0f45be3..75017578 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 := 7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a +$(PKG)_CHECKSUM := f72f875a0cafe7931341ef31084acfb489ede79c36dbce74820c2a5b5d6afb2c $(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 7fcadf21..3c9d1b67 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 := f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34 +$(PKG)_CHECKSUM := f6b0583cfc5bbdccb89f68297a53cfe6c858c7a7de8e64548066cafd981c0799 $(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 cc823d06..26a38700 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 := 090da2f41b3ea40e73d3a7d7d873492bb911a3492376bb44daee917b459535a9 +$(PKG)_CHECKSUM := bb369f8addf573d2f984a5afef26219c97dd895764eb0bbcc7296e358530de6f $(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 0c39979c..e923007c 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 := 096387a674f7fa1faeda856b87e965bd2937e3dcce334f10df694468003887d4 +$(PKG)_CHECKSUM := fdcbb45f7255d771fb0e61e1e5f3dc1c29a1967a6ba80da5171fc7c2c0faf7a6 $(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 3954387d..814dbf2f 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 := 75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319 +$(PKG)_CHECKSUM := 2867cc8c92164909d6117b392d1cd9102dd38d815dbdf108f3f10e630c5a748b $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))