From d8c7bcd14878b2eafaa3a5c234642638dbf5c869 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Dec 2018 09:52:07 +0100 Subject: [PATCH] qt5: update to 5.12.0 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 82 ++++++++++++++------------------------ src/qtbase.mk | 6 +-- src/qtcanvas3d.mk | 2 +- 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 | 29 +++++++------- src/qtimageformats.mk | 2 +- 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, 79 insertions(+), 102 deletions(-) diff --git a/src/qt3d.mk b/src/qt3d.mk index 0e63314f..24698bc5 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 := 04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab +$(PKG)_CHECKSUM := a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da $(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 7070d142..e6bfbf75 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 := 8d40cd9c6d0d48331e2b53cacbb507ff4fd100fe7f97eb42aa64b0002ef4653c +$(PKG)_CHECKSUM := a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e $(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 ce61d008..d484606c 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -2,10 +2,10 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 4fbf912931617fed598564878e862cad47cb0903 Mon Sep 17 00:00:00 2001 +From f1dbf592c625533c9f8a704e4d5f12f3111a1fb3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly 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. @@ -14,7 +14,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 27f4c277d6..84ff9ae0ef 100644 +index 3ed6dd5889..cc5bc9dc16 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -34,13 +34,13 @@ index 27f4c277d6..84ff9ae0ef 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.17.1 +2.19.1 -From 0aca562282cc8e8e22f69f297db1f4e09409daec Mon Sep 17 00:00:00 2001 +From b822f7ff799d10297b0b36408e7cfa44fd416118 Mon Sep 17 00:00:00 2001 From: Tony Theodore 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 @@ -65,10 +65,10 @@ Task-number: 30898 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 8c7adc45eb..b00034d3ca 100644 +index 51b5bde67a..faba17aedd 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -265,6 +265,10 @@ load(qt_installs) +@@ -263,6 +263,10 @@ load(qt_installs) load(qt_targets) @@ -77,12 +77,12 @@ index 8c7adc45eb..b00034d3ca 100644 +TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) + # this builds on top of qt_common - !internal_module:!lib_bundle:if(unix|mingw) { + !internal_module:if(unix|mingw) { CONFIG += create_pc -@@ -275,12 +279,12 @@ load(qt_targets) - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME +@@ -278,12 +282,12 @@ load(qt_targets) + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME + } - QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") - QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") @@ -96,28 +96,28 @@ index 8c7adc45eb..b00034d3ca 100644 pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -314,5 +318,3 @@ win32 { +@@ -317,5 +321,3 @@ win32 { # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 } - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end -- -2.17.1 +2.19.1 -From f042032627bec6dd4829184ab6e93a55c44dbe32 Mon Sep 17 00:00:00 2001 +From 7773e45dfdd82ede2415a6818332de3e36e7c824 Mon Sep 17 00:00:00 2001 From: Mark Brand 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 219385a108..eee90b5b20 100644 +index 0332631ec8..e2d87e77b3 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -973,7 +973,7 @@ +@@ -1003,7 +1003,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", @@ -144,45 +144,21 @@ index 0c04608fca..a26e02fbf3 100644 m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif -- -2.17.1 - - -From 8f650f4125b8631542d9a083fc5a6cce1340eea0 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Sun, 29 Jan 2017 16:22:03 +0100 -Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS - -Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0 - -diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri -index b69b51b679..d37423adbd 100644 ---- a/src/plugins/sqldrivers/configure.pri -+++ b/src/plugins/sqldrivers/configure.pri -@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) { - libs += "-L$${sybase}/lib" - libs += $$getenv(SYBASE_LIBS) - !isEmpty(libs) { -- $${1}.libs = "$$val_escape(libs)" -+ $${1}.libs = $$libs - export($${1}.libs) - } - return(true) --- -2.17.1 +2.19.1 -From 09e34945ca9ea37202405af63a8bb29704e9a9f4 Mon Sep 17 00:00:00 2001 +From 82d08b0378db0a30007ca5ee965ffa034859af5c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 5/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 eee90b5b20..6c6745b1dd 100644 +index e2d87e77b3..4eb37aea17 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -215,7 +215,8 @@ +@@ -224,7 +224,8 @@ ] }, "sources": [ @@ -193,13 +169,13 @@ index eee90b5b20..6c6745b1dd 100644 }, "imf": { -- -2.17.1 +2.19.1 -From 120fc0ccb7290be0726487502710a26fd33f3166 Mon Sep 17 00:00:00 2001 +From 8ea9633854e8c2ad94df00866a9b9e3a4394d161 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 6/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)': @@ -217,7 +193,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 ebf9864b15..9a31933975 100644 +index 23e5e499b2..d0b3159c0d 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 @@ -230,5 +206,5 @@ index ebf9864b15..9a31933975 100644 # ifdef Q_PROCESSOR_X86_64 -- -2.17.1 +2.19.1 diff --git a/src/qtbase.mk b/src/qtbase.mk index 3d356d29..675e506d 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.11.3 -$(PKG)_CHECKSUM := c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c +$(PKG)_VERSION := 5.12.0 +$(PKG)_CHECKSUM := 5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb $(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.11/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := https://download.qt.io/official_releases/qt/5.12/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib $(PKG)_DEPS_$(BUILD) := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 32e48ece..f2d1f686 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 := d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138 +$(PKG)_CHECKSUM := b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128 $(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 db290940..365cdf5e 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 := 4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc +$(PKG)_CHECKSUM := 9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450 $(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 6d01b412..61509ba9 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 := 148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a +$(PKG)_CHECKSUM := 8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4 $(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 23850890..5f9af682 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 := 83362eb9b55de61fa686c898fc4300494abdc2ec4f6e2422f19e6db6d5c81ccf +$(PKG)_CHECKSUM := 4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433 $(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 3d1386f9..cbfd2390 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 := 8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6 +$(PKG)_CHECKSUM := 4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b $(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 d5972cca..9b07abc3 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 := e99590cc14e7fb98caf7b48ddf8515f3e32388af3024659d46047f143a1342cc +$(PKG)_CHECKSUM := 4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091 $(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 c9084668..030b848d 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 := 14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2 +$(PKG)_CHECKSUM := 81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455 $(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 9fc66fa4..cb265a4e 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -54,21 +54,22 @@ index 1111111..2222222 100644 +packagesExist(libmng):PKGCONFIG += libmng +else:if(unix|win32-g++*): LIBS += -lmng else:win32: LIBS += libmng.lib -diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri +diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 1111111..2222222 100644 ---- a/src/plugins/imageformats/mng/qmnghandler.pri -+++ b/src/plugins/imageformats/mng/qmnghandler.pri -@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD - HEADERS += $$PWD/qmnghandler_p.h - SOURCES += $$PWD/qmnghandler.cpp - config_libmng { -- unix|mingw: LIBS += -lmng -+ CONFIG += link_pkgconfig -+ packagesExist(libmng):PKGCONFIG += libmng -+ else:if(unix|win32-g++*): LIBS += -lmng - else:win32: LIBS += libmng.lib - } else { - include($$PWD/../../../3rdparty/libmng.pri) +--- a/src/plugins/imageformats/mng/mng.pro ++++ b/src/plugins/imageformats/mng/mng.pro +@@ -5,7 +5,10 @@ SOURCES += main.cpp \ + qmnghandler.cpp + OTHER_FILES += mng.json + +-msvc: LIBS += libmng.lib ++CONFIG += link_pkgconfig ++packagesExist(libmng):PKGCONFIG += libmng ++else:if(unix|mingw): LIBS += -lmng ++else:msvc: LIBS += libmng.lib + else: LIBS += -lmng + + PLUGIN_TYPE = imageformats From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 066d02e8..803a9435 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 := 04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f +$(PKG)_CHECKSUM := 5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e $(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 fe20766b..13e17df6 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 := 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb +$(PKG)_CHECKSUM := b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449 $(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 3535feb0..b13cc088 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 := 728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41 +$(PKG)_CHECKSUM := 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9 $(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 0ee01475..59ab7afd 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 := a060d0c3da56ea1e651d80ea1fa52b89544f059551c45d4e4ae87d8e9229a335 +$(PKG)_CHECKSUM := 41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775 $(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 a6c1552d..f3f42a63 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 := 16cdd3751b18400715d516cd9836d687d811071101d7c8634030d7225b7fa0b9 +$(PKG)_CHECKSUM := d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da $(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 f15c605e..6802975a 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 := 4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537 +$(PKG)_CHECKSUM := 2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73 $(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 60f13d8e..4f39472a 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 := f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086 +$(PKG)_CHECKSUM := 89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6 $(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 8fe6d66f..45926a2c 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 := f70306a78f440516eaacd6908140bc469ebd101a61c724b9590f4aefbafe72b4 +$(PKG)_CHECKSUM := 0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f $(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 acfc17a6..73aa7730 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 := bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08 +$(PKG)_CHECKSUM := 97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8 $(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 e526eeec..3875c933 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 := 13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7 +$(PKG)_CHECKSUM := dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b $(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 df511eda..da14265a 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 := a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859 +$(PKG)_CHECKSUM := c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6 $(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 5741a441..5b1acf82 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 := 5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d +$(PKG)_CHECKSUM := 6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a $(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 fc3dede1..5a25612b 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 := 96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda +$(PKG)_CHECKSUM := 59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb $(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 42aa15eb..9338b8f4 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 := b92fd9ae33d78b6a080e154c80208c8998e3481bec4b84dc2be56dd0f03f1795 +$(PKG)_CHECKSUM := 1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb $(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 30df5bde..2b654e43 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 := 21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491 +$(PKG)_CHECKSUM := ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce $(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 cad967b1..0a042250 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 := c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e +$(PKG)_CHECKSUM := 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3 $(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 e8fc4e62..f0896e19 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 := fa84b284d8aa34d6076b5e87a33ba6eb2382b69c371089c1c25b88bfd4141149 +$(PKG)_CHECKSUM := 5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508 $(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 2925f50e..4d3b47ba 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 := 8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e +$(PKG)_CHECKSUM := db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da $(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 28acaa0b..8bc266c7 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 := 3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3 +$(PKG)_CHECKSUM := 851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0 $(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 e97fb0a1..6c40adf6 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 := 021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9 +$(PKG)_CHECKSUM := 444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f $(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 1e39d429..94eeb021 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 := 7026f6e5e8f7c0adea4743004eb945adeb65bec00c95cf50abe4b6016cb055da +$(PKG)_CHECKSUM := b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185 $(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 786ba2c6..31f4ac96 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 := e270e87910465bcaeedb4edc8e094c5d9c5a37e83b89ee95f8324dcc017bc9f5 +$(PKG)_CHECKSUM := c64f5acde4d73d4bf45fab377cf3db7f4cf7044fb8854bb24aabbbbc0109dad0 $(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 67c996bf..99dbaaa6 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 := 8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee +$(PKG)_CHECKSUM := f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))