From 4ab8b10693489afea51df1b5361b276228786171 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 26 May 2020 10:36:15 +0200 Subject: [PATCH] qt5: update to 5.15.0 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 20 ++++++++++---------- src/qtbase.mk | 6 +++--- 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.mk | 2 +- src/qtlocation.mk | 2 +- src/qtlottie.mk | 22 ++++++++++++++++++++++ src/qtmultimedia.mk | 2 +- src/qtnetworkauth.mk | 2 +- src/qtpurchasing.mk | 2 +- src/qtquick3d.mk | 22 ++++++++++++++++++++++ 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, 88 insertions(+), 44 deletions(-) create mode 100644 src/qtlottie.mk create mode 100644 src/qtquick3d.mk diff --git a/src/qt3d.mk b/src/qt3d.mk index b509bd46..0d2aef19 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 := 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674 +$(PKG)_CHECKSUM := 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd $(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 0fe8a8aa..37ce76c0 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 := b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9 +$(PKG)_CHECKSUM := 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51 $(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 1a66c528..eb85252d 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 103d3ed73e50968846786b78db241f9904b92538 Mon Sep 17 00:00:00 2001 +From 2c59523387b10937ff7d085bc34ec3df68805fea Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/2] 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 1099a761ce..d03ebff899 100644 +index 309798a767..18156cac9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -371,6 +371,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -370,6 +370,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,10 +25,10 @@ index 1099a761ce..d03ebff899 100644 !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -408,9 +411,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - +@@ -411,9 +414,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") + !!ENDIF -!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) @@ -36,10 +36,10 @@ index 1099a761ce..d03ebff899 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.20.1 +2.25.1 -From 56f0aad866df2439d8d3b2f1651ae2dd02f52354 Mon Sep 17 00:00:00 2001 +From c3fa97702a080eb1a931fd1f41f7a1dd5b775523 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 2/2] use pkg-config for harfbuzz @@ -47,10 +47,10 @@ Subject: [PATCH 2/2] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0202f17b21..1418a3bbee 100644 +index 5ebcdb99b5..2553cb5cf6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -304,7 +304,8 @@ +@@ -303,7 +303,8 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -61,5 +61,5 @@ index 0202f17b21..1418a3bbee 100644 }, "imf": { -- -2.20.1 +2.25.1 diff --git a/src/qtbase.mk b/src/qtbase.mk index 34962c6a..e767f6c3 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.14.2 -$(PKG)_CHECKSUM := 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a +$(PKG)_VERSION := 5.15.0 +$(PKG)_CHECKSUM := 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5 $(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.14/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := https://download.qt.io/official_releases/qt/5.15/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib zstd $(PKG)_DEPS_$(BUILD) := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/src/qtcharts.mk b/src/qtcharts.mk index e4daeae5..58f57972 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 := adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7 +$(PKG)_CHECKSUM := 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7 $(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 931b8d1c..dbfde4b5 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 := abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28 +$(PKG)_CHECKSUM := f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd $(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 d9cbfb66..5ecdd320 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 := 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20 +$(PKG)_CHECKSUM := 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3 $(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 93872944..30bf685a 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 := a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650 +$(PKG)_CHECKSUM := 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699 $(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 8cc0ebb6..99c4351a 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 := f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03 +$(PKG)_CHECKSUM := dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a $(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 ad4c7709..b84ec64e 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 := 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f +$(PKG)_CHECKSUM := 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda $(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 d502c9ba..961083f5 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 := 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c +$(PKG)_CHECKSUM := 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8 $(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 60b3f53a..b5a614f0 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 := c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc +$(PKG)_CHECKSUM := c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f $(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/qtlottie.mk b/src/qtlottie.mk new file mode 100644 index 00000000..9b98c0f9 --- /dev/null +++ b/src/qtlottie.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtlottie +$(PKG)_WEBSITE := https://www.qt.io/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833 +$(PKG)_SUBDIR = $(subst qtbase,qtlottie,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtlottie,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtlottie,$(qtbase_URL)) +$(PKG)_DEPS := cc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index 4a9fbd3f..00ac7497 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 := 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9 +$(PKG)_CHECKSUM := 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7 $(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 a6de807b..f93d4d58 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 := 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e +$(PKG)_CHECKSUM := 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85 $(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 9eb2e4e3..d0efba72 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 := 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851 +$(PKG)_CHECKSUM := 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16 $(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/qtquick3d.mk b/src/qtquick3d.mk new file mode 100644 index 00000000..77245846 --- /dev/null +++ b/src/qtquick3d.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtquick3d +$(PKG)_WEBSITE := https://www.qt.io/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb +$(PKG)_SUBDIR = $(subst qtbase,qtquick3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtquick3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtquick3d,$(qtbase_URL)) +$(PKG)_DEPS := cc assimp qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 2335f00c..3de494a4 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 := d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461 +$(PKG)_CHECKSUM := 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee $(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 d6f6610c..a4070889 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 := faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560 +$(PKG)_CHECKSUM := 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f $(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 04390f4c..db529e43 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 := a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6 +$(PKG)_CHECKSUM := 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf $(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 4ed6f962..f75e78a3 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 := e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe +$(PKG)_CHECKSUM := 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373 $(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 76bd58e9..c453ea35 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 := 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790 +$(PKG)_CHECKSUM := 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72 $(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 88c2bb52..3b8b64ee 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 := bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61 +$(PKG)_CHECKSUM := 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da $(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 64c78907..4a9ad4e5 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 := 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91 +$(PKG)_CHECKSUM := cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379 $(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 4d471434..57d948cb 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 := a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21 +$(PKG)_CHECKSUM := ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67 $(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 b490031e..30a0d587 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 := 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da +$(PKG)_CHECKSUM := 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61 $(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 d7e77791..29cba976 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 := c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1 +$(PKG)_CHECKSUM := ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d $(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 ff436a34..9dd7678d 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 := 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5 +$(PKG)_CHECKSUM := ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437 $(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 b7805efa..b23cdde7 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 := 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6 +$(PKG)_CHECKSUM := 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe $(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 d4aac5a3..4f5482b4 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 := 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7 +$(PKG)_CHECKSUM := f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be $(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 841efb71..d9b21b5c 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 := 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874 +$(PKG)_CHECKSUM := ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f $(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 f82d9279..beec76e5 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 := f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84 +$(PKG)_CHECKSUM := 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092 $(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 d2f185d7..ad1b3167 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 := c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b +$(PKG)_CHECKSUM := b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660 $(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 da563a76..a2d555d9 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 := 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2 +$(PKG)_CHECKSUM := d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0 $(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 b502f040..5c467d08 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 := 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7 +$(PKG)_CHECKSUM := 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))