From a935ec65c636e0a331783ae549694f8a8591bff8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 15 Dec 2016 14:48:16 +0100 Subject: [PATCH] update qt5 modules to 5.7.1 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 177 +++++++++++++--------------------- src/qtbase.mk | 4 +- src/qtcanvas3d.mk | 2 +- src/qtcharts.mk | 2 +- src/qtconnectivity.mk | 2 +- src/qtdatavis3d.mk | 2 +- src/qtdeclarative-render2d.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtgamepad.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia.mk | 2 +- src/qtpurchasing.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtquickcontrols2.mk | 2 +- src/qtscript.mk | 2 +- src/qtscxml.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialbus.mk | 2 +- src/qtserialport.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtvirtualkeyboard.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 33 files changed, 98 insertions(+), 145 deletions(-) diff --git a/src/qt3d.mk b/src/qt3d.mk index 98992149..8d69cc8d 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -3,7 +3,7 @@ PKG := qt3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a8248a1779b561ea450e92345e8187bacac359df0e92ad61a1ad7652bb233e29 +$(PKG)_CHECKSUM := 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea $(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 b45ff1db..09f76f02 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -3,7 +3,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9b78055dbd3c59e6cc312cd88ffb8503a34cfc397f26114039b38c5894913c91 +$(PKG)_CHECKSUM := 0c09920de273fa12e40f6486a4715267e2fe54991303b6ddfdac69fe9a24a1d5 $(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 7c4d99a9..31ff2abb 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -1,17 +1,15 @@ This file is part of MXE. See LICENSE.md for licensing information. -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 62efa18a61560a7757acffbd4ac6ca7b153155cc Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri -index 1111111..2222222 100644 +index 39280de..e152b0d 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { @@ -20,16 +18,19 @@ index 1111111..2222222 100644 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + win32:shared:LIBS_PRIVATE += -lfreetype } +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 5a15e0374758b7786204d98b66f49b4fd3daea79 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 1111111..2222222 100644 +index 32edd6e..a7f2c28 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -39,7 +40,7 @@ index 1111111..2222222 100644 +CONFIG += link_pkgconfig +PKGCONFIG += harfbuzz diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 1111111..2222222 100644 +index 7443368..c24e684 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { @@ -50,16 +51,19 @@ index 1111111..2222222 100644 + CONFIG += link_pkgconfig + PKGCONFIG += harfbuzz } +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From bc002ee2a8418c7afcba362d155ba1a591bc3d1a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH] fix oci config test on windows +Subject: [PATCH 3/8] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro -index 1111111..2222222 100644 +index 3ffda1d..39b6f3759 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ @@ -67,20 +71,23 @@ index 1111111..2222222 100644 CONFIG -= qt dylib -LIBS += -lclntsh +!win32:LIBS += -lclntsh +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 92d2ae7b6eb175b4f15e5f0f231a9c29824d6f57 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index 1111111..2222222 100755 +index ba94d08..50e6dfb 100755 --- a/configure +++ b/configure -@@ -4656,7 +4656,7 @@ fi - [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" +@@ -4677,7 +4677,7 @@ fi + [ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android" # check IPC support -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then @@ -88,16 +95,19 @@ index 1111111..2222222 100755 # SYSV IPC is not supported - check POSIX IPC if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From f0054e940467a64dffc0c3cc070233fdf2848d43 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH] fix building mysql driver under mingw +Subject: [PATCH 5/8] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri -index 1111111..2222222 100644 +index 3cfb614..8b7063f 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp @@ -109,11 +119,14 @@ index 1111111..2222222 100644 isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 26229596fbb711bc222c831eca3a9e5b62c7acc6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -122,7 +135,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 1111111..2222222 100644 +index d2358ca..6b1dc95 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -142,68 +155,14 @@ index 1111111..2222222 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF +-- +2.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Wed, 18 May 2016 14:40:20 -0700 -Subject: [PATCH] Fix linking of the minimal platform plugin on OS X -platformsupport/fontdatabases/fontdatabases.pri disables all font -databases except CoreText on OS X, so this is required for -linking. Otherwise, we get undefined reference linker errors: - -Undefined symbols for architecture x86_64: - "vtable for QBasicFontDatabase", referenced from: - QMinimalIntegration::fontDatabase() const in - qminimalintegration.o - -Change-Id: I31298e973803b4d6eedbf61607056114d1556584 -Reviewed-by: Jake Petroules -(cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea) - -diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro -index 1111111..2222222 100644 ---- a/src/plugins/platforms/minimal/minimal.pro -+++ b/src/plugins/platforms/minimal/minimal.pro -@@ -11,6 +11,7 @@ HEADERS = qminimalintegration.h \ - OTHER_FILES += minimal.json - - CONFIG += qpa/genericunixfontdatabase -+darwin: DEFINES += QT_NO_FONTCONFIG - - PLUGIN_TYPE = platforms - PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Pek -Date: Sun, 19 Jun 2016 03:15:43 +0300 -Subject: [PATCH] Fix build of the minimal platform plugin for MS Windows - -when qtbase is configured with -fontconfig and -system-freetype. - -This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f. -Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea. - -Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef -(cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd) - -diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro -index 1111111..2222222 100644 ---- a/src/plugins/platforms/minimal/minimal.pro -+++ b/src/plugins/platforms/minimal/minimal.pro -@@ -12,6 +12,7 @@ OTHER_FILES += minimal.json - - CONFIG += qpa/genericunixfontdatabase - darwin: DEFINES += QT_NO_FONTCONFIG -+win32: DEFINES += QT_NO_FONTCONFIG - - PLUGIN_TYPE = platforms - PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 59fd7fdff5bf0cda3c7a11982ee96f50d8eddec1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH] Fix pkgconfig file and library naming +Subject: [PATCH 7/8] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 @@ -228,10 +187,10 @@ Task-number: 30898 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1111111..2222222 100644 +index d9011f5..1993a7f 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -242,6 +242,10 @@ load(qt_installs) +@@ -244,6 +244,10 @@ load(qt_installs) load(qt_targets) @@ -242,7 +201,7 @@ index 1111111..2222222 100644 # this builds on top of qt_common !internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc -@@ -252,12 +256,12 @@ load(qt_targets) +@@ -254,12 +258,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 @@ -259,42 +218,36 @@ index 1111111..2222222 100644 pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -291,5 +295,3 @@ win32 { +@@ -293,5 +297,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.9.3 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Wed, 24 Aug 2016 11:55:35 +0200 -Subject: [PATCH] QLocale: Fix wrong assert -The endptr from reading the exponent of a 'g' form snprintf result -should not be past the end of the string we're reading from. It has -nothing to do with the 'e' sign. +From a2ed2c9fe74b549cb163f89a56df6eec3af553fa Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 15 Dec 2016 17:20:56 +0100 +Subject: [PATCH 8/8] fix mysql config test -Task-number: QTBUG-54482 -Change-Id: I8bdee917b8d21fdc94c255548ad7e008431a07fa -Reviewed-by: Simon Hausmann +The config test already gets link flags which should include +the library. Blindly adding it to the end of the list can break +static linking. -See https://github.com/mxe/mxe/issues/1572 -Source: https://codereview.qt-project.org/#/c/168995 -Source: https://github.com/qt/qtbase/commit/de7f281d7ad1bc8e3dc5a54943 +Change-Id: Ief71c4ad64cbbb1b141b0ef5549f42a36bbd125b -Remove this patch when updating to Qt 5.7.1. +diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro +index 06d1880..ca6d6aa 100644 +--- a/config.tests/unix/mysql/mysql.pro ++++ b/config.tests/unix/mysql/mysql.pro +@@ -1,3 +1,3 @@ + SOURCES = mysql.cpp + CONFIG -= qt dylib +-LIBS += -lmysqlclient ++LIBS *= -lmysqlclient +-- +2.9.3 -diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp -index 1111111..2222222 100644 ---- a/src/corelib/tools/qlocale_tools.cpp -+++ b/src/corelib/tools/qlocale_tools.cpp -@@ -224,7 +224,7 @@ void doubleToAscii(double d, QLocaleData::DoubleForm form, int precision, char * - const char *endptr; - decpt = qstrtoll(target.data() + eSign + 1, &endptr, 10, &ok) + 1; - Q_ASSERT(ok); -- Q_ASSERT(endptr - target.data() <= length - eSign -1); -+ Q_ASSERT(endptr - target.data() <= length); - } else { - // No 'e' found, so it's the 'f' form. Variants of snprintf generate numbers with - // potentially multiple digits before the '.', but without decimal exponent then. So we diff --git a/src/qtbase.mk b/src/qtbase.mk index 98e80495..c3cceea0 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -2,8 +2,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.7.0 -$(PKG)_CHECKSUM := 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 +$(PKG)_VERSION := 5.7.1 +$(PKG)_CHECKSUM := edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 6e3ecc18..5efc8bcd 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -3,7 +3,7 @@ PKG := qtcanvas3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7871b3fd4c1a561c5b3eb57746e8504bc5d8fa626f9df578e619f9e823e3bd97 +$(PKG)_CHECKSUM := a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 $(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 6ad4d571..f726c08d 100644 --- a/src/qtcharts.mk +++ b/src/qtcharts.mk @@ -3,7 +3,7 @@ PKG := qtcharts $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2bc8a87375c7aeebde2e4cd2408c92c91ec3fed9e6e8b5fde789131b532d5243 +$(PKG)_CHECKSUM := 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 $(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 65a65734..2c12ad0b 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -3,7 +3,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9844ca7ec5be187a77dfd7e95051fb267006f6c77157ecb0b8ceeac103a32703 +$(PKG)_CHECKSUM := b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 $(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 c182502b..f1bbb776 100644 --- a/src/qtdatavis3d.mk +++ b/src/qtdatavis3d.mk @@ -3,7 +3,7 @@ PKG := qtdatavis3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9a5d7a383dce211a904bca3b8b6054bb448148ca07cede2bd46d255de016e8a2 +$(PKG)_CHECKSUM := 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 $(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-render2d.mk b/src/qtdeclarative-render2d.mk index d8b0955a..b80b65b2 100644 --- a/src/qtdeclarative-render2d.mk +++ b/src/qtdeclarative-render2d.mk @@ -3,7 +3,7 @@ PKG := qtdeclarative-render2d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0613298f653b147bb3c26d0f0ee0bb95fec74894d07575f1953e8a7fe248c8e1 +$(PKG)_CHECKSUM := 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative-render2d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative-render2d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative-render2d,$(qtbase_URL)) diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index ec482e70..cfb3c890 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -3,7 +3,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 86de6239f3aee2e5f561c16ad7b6e47d8f341c293d4ed11c85acbc21888cf9f4 +$(PKG)_CHECKSUM := fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 $(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 a711a2a2..13f2fa74 100644 --- a/src/qtgamepad.mk +++ b/src/qtgamepad.mk @@ -3,7 +3,7 @@ PKG := qtgamepad $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5898f7bc002d0ac65b698043f24f3e2ff2bb7ca7735f43b74e37056c2db5663c +$(PKG)_CHECKSUM := bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 $(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 759af71a..d55edc6a 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -3,7 +3,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c816539ce345e502425a94c624332df78f53aeebc460d76b53b79b59cb938de7 +$(PKG)_CHECKSUM := 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 $(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 6992d3b6..c48ed9b7 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -3,7 +3,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ef3344a44194d1414be585f8c8a652ffe217c663a22b6e26d3bb5e114f3f62e5 +$(PKG)_CHECKSUM := 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 $(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 d6bb17e2..75164b0f 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -3,7 +3,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 70273367342493a77c050f033a92d96e79925aa70308746e9681d8661f4aa865 +$(PKG)_CHECKSUM := f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f $(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 85e88e2d..216481d1 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -3,7 +3,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559 +$(PKG)_CHECKSUM := a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def $(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 5ff8cad8..9e26523b 100644 --- a/src/qtpurchasing.mk +++ b/src/qtpurchasing.mk @@ -3,7 +3,7 @@ PKG := qtpurchasing $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7e514a3cb98addd0b1344a69c494afe4546d854d43340760aed00ad0062664b5 +$(PKG)_CHECKSUM := f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42 $(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 4b8dda87..4b64432e 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -3,7 +3,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d8e19a77100fff109585ccc62116e63dd11ce9486056a8eb5b64159b7ecdec32 +$(PKG)_CHECKSUM := 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d $(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 cb49d2e5..588ae356 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -3,7 +3,7 @@ PKG := qtquickcontrols2 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045 +$(PKG)_CHECKSUM := f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec $(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 5e4512d1..1c314f8c 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -3,7 +3,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9c44e1fd294989ae62b1e452c25fd15574042e84e1377b59cd9ec67241428000 +$(PKG)_CHECKSUM := 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 $(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 9461d6a1..e89fb62f 100644 --- a/src/qtscxml.mk +++ b/src/qtscxml.mk @@ -3,7 +3,7 @@ PKG := qtscxml $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 370b13d76c9a2ddf05336e797edf7f54d41db6063e3b921e0825dd6dd26c51f1 +$(PKG)_CHECKSUM := 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c $(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 d4c1513d..f720f182 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -3,7 +3,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 283dcc66a24c4367e865fa8301b6ea04d0cb78bd0f166fd09a6bb42e1e3731be +$(PKG)_CHECKSUM := ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 $(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 f70ec60c..52d7a382 100644 --- a/src/qtserialbus.mk +++ b/src/qtserialbus.mk @@ -3,7 +3,7 @@ PKG := qtserialbus $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2c437ace393e9dcf170990b519cec59c5cbcfc3c830e46116abb52549dc15d38 +$(PKG)_CHECKSUM := 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 $(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 a1138bbb..2327fb29 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -3,7 +3,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5ce150d843a243854736489d4a71205a8ca8dc8f93626ec29d1aa7a249a08265 +$(PKG)_CHECKSUM := 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 $(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/qtsvg.mk b/src/qtsvg.mk index 533fc45e..94b10365 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -3,7 +3,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a1f89f035aed48bf8843ff1880c4b54dc2e3a5160dbd743aec03e13831cdd881 +$(PKG)_CHECKSUM := b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 $(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 89891a2d..b956a1e5 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -3,7 +3,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6f45ad73cf6a6fea20d93d881551e938b7f7a62b6d50bf98b5f8c0b70e4d9500 +$(PKG)_CHECKSUM := 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac $(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 a9144061..8b7d7f26 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0a0ed428f6a3a01b49c80e0d2b80199f66d77578588d2929923097c77c795a6d +$(PKG)_CHECKSUM := 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 $(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 e554349b..97e05e2c 100644 --- a/src/qtvirtualkeyboard.mk +++ b/src/qtvirtualkeyboard.mk @@ -3,7 +3,7 @@ PKG := qtvirtualkeyboard $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := df433de68e23b173b87b422038bc9f3e53349035c11a2b2e495122274664ff2f +$(PKG)_CHECKSUM := b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add $(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 9b1d7c48..e6620296 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -3,7 +3,7 @@ PKG := qtwebchannel $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816 +$(PKG)_CHECKSUM := 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b $(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/qtwebkit.mk b/src/qtwebkit.mk index 73ecb439..8256ba97 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -3,7 +3,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c7a3253cbf8e6035c54c3b08d8a9457bd82efbce71d4b363c8f753fd07bd34df +$(PKG)_CHECKSUM := a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 $(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL)))) diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index dc7d06a8..9ceef620 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -3,7 +3,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 741be11a907f82807a786e6a53ae7316c0b3864491b692e8719c381e0f158b43 +$(PKG)_CHECKSUM := 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 $(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 c85a691a..d2550bc8 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -3,7 +3,7 @@ PKG := qtwebview $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 801a3faf312fa0235d489c63aa224d477a70cfe1b1ef7803cbe311a8c29e51c4 +$(PKG)_CHECKSUM := b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f $(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 49066bb0..dd21a636 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -3,7 +3,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8dabe231a4fdaa74acc2f79a44391a49ef779db8d0acf41cbb29f2c71d9e07ba +$(PKG)_CHECKSUM := 241463a49fef3543b47a2874bd373ddf5a88321de169730db09ae333018ef3cc $(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 cf34a72f..a3f187dc 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -3,7 +3,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b +$(PKG)_CHECKSUM := a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))