From 2de6bde8c4949c67306882f5fe68f1c6db233609 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 19 Jun 2018 23:24:29 +0200 Subject: qt5: update to 5.11.1 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 163 +++++----------------------------------------- src/qtbase.mk | 4 +- 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.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/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 +- 33 files changed, 51 insertions(+), 178 deletions(-) diff --git a/src/qt3d.mk b/src/qt3d.mk index 067e119..e44d7b8 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 := 4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0 +$(PKG)_CHECKSUM := cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d $(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 93d9f0e..3945e4b 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 := 69aabe0dd5985bd5491b0ce165470b637087b14e2fd2d8a51eed4f14f1bc3705 +$(PKG)_CHECKSUM := c6ee6c4def84c6a990b7025d8d73374cb08940ba62e90cf13d1f6e2e581b3cb9 $(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 6dd31c6..4942af5 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 ec06a0993dd7ceae8002852646dc1826111a1882 Mon Sep 17 00:00:00 2001 +From 68d6fb331d75a6fc23be38861866da8c3fc6fd6d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 1/8] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/6] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -34,13 +34,13 @@ index 27f4c277d6..84ff9ae0ef 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.17.0 +2.17.1 -From dad81660aaf6e7bd011b3541e9ab9a0a27120973 Mon Sep 17 00:00:00 2001 +From 1d10513c2b03761addf96010ce9da8dd93d714fb Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/8] Fix pkgconfig file and library naming +Subject: [PATCH 2/6] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 @@ -103,13 +103,13 @@ index f8729de947..e7f6e3651d 100644 - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end -- -2.17.0 +2.17.1 -From 69740750f7905baa5c66e48bad22e39b5e07ca72 Mon Sep 17 00:00:00 2001 +From 31c615cd57701f2e4b99bb7fcdd023565a081257 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/8] reenable fontconfig for win32 (MXE-specific) +Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific) Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f @@ -144,13 +144,13 @@ index 0c04608fca..a26e02fbf3 100644 m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif -- -2.17.0 +2.17.1 -From e28fcb374385d6dfb29a6c99bea283a4fbc894a7 Mon Sep 17 00:00:00 2001 +From f881ea1a1010939a4fe7c2c74f01d3e54d2c7c96 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Jan 2017 16:22:03 +0100 -Subject: [PATCH 4/8] fix treatment of SYBASE_LIBS +Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0 @@ -168,13 +168,13 @@ index b69b51b679..d37423adbd 100644 } return(true) -- -2.17.0 +2.17.1 -From ef350f7199772d5846a1f6f9214e8d562183f393 Mon Sep 17 00:00:00 2001 +From 9e31811ee08a69d21f19dc7a0a86581c2d71a8c1 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 5/8] use pkg-config for harfbuzz +Subject: [PATCH 5/6] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 @@ -193,13 +193,13 @@ index eee90b5b20..6c6745b1dd 100644 }, "imf": { -- -2.17.0 +2.17.1 -From 65353949d9a7f6bbdcd5ddabf09ac3e5357eac1d Mon Sep 17 00:00:00 2001 +From c3de4dbd709d1f8c33d46ed12506444685e3db0e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 6/8] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 6/6] 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)': @@ -230,132 +230,5 @@ index ebf9864b15..9a31933975 100644 # ifdef Q_PROCESSOR_X86_64 -- -2.17.0 - - -From 84cf457b4bc814fb82b08e0917b09397bbf9ec1a Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Tue, 8 May 2018 21:57:07 -0700 -Subject: [PATCH 7/8] Fix build with GCC 8: memset/memcpy/memmove of - non-trivials -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -qarraydataops.h:73:17: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type -‘struct TCBPoint’; use assignment or value-initialization instead [-Werror=class-memaccess] - -Change-Id: I5d0ee9389a794d80983efffd152ce10eb557341f -Reviewed-by: Ville Voutilainen - -diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h -index d0f83d2b6a..7e1b43f9b1 100644 ---- a/src/corelib/tools/qarraydataops.h -+++ b/src/corelib/tools/qarraydataops.h -@@ -65,7 +65,7 @@ struct QPodArrayOps - Q_ASSERT(newSize > uint(this->size)); - Q_ASSERT(newSize <= this->alloc); - -- ::memset(this->end(), 0, (newSize - this->size) * sizeof(T)); -+ ::memset(static_cast(this->end()), 0, (newSize - this->size) * sizeof(T)); - this->size = int(newSize); - } - -@@ -121,8 +121,9 @@ struct QPodArrayOps - Q_ASSERT(e <= where || b > this->end()); // No overlap - Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size)); - -- ::memmove(where + (e - b), where, (static_cast(this->end()) - where) * sizeof(T)); -- ::memcpy(where, b, (e - b) * sizeof(T)); -+ ::memmove(static_cast(where + (e - b)), static_cast(where), -+ (static_cast(this->end()) - where) * sizeof(T)); -+ ::memcpy(static_cast(where), static_cast(b), (e - b) * sizeof(T)); - this->size += (e - b); - } - -@@ -133,7 +134,8 @@ struct QPodArrayOps - Q_ASSERT(b >= this->begin() && b < this->end()); - Q_ASSERT(e > this->begin() && e < this->end()); - -- ::memmove(b, e, (static_cast(this->end()) - e) * sizeof(T)); -+ ::memmove(static_cast(b), static_cast(e), -+ (static_cast(this->end()) - e) * sizeof(T)); - this->size -= (e - b); - } - }; --- -2.17.0 - - -From 77082d00f719fc72daa85ad2a59f3f395201ba6a Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen -Date: Mon, 9 Apr 2018 18:34:18 +0200 -Subject: [PATCH 8/8] qmake: fix look-up of relative files from .depend_command - in shadow builds - -the dependency paths are fixified against the output directory, so we -must resolve them accordingly. - -Change-Id: Id92750aad358153bd2db5daca3194c54eda58dbb -Reviewed-by: Joerg Bornemann -(cherry picked from commit 75587c8030ff8057b90200cb20cff1e4549c00b5) - -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 82573347b6..99aecdd8ce 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -1953,11 +1953,12 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) - } - QT_PCLOSE(proc); - if(!indeps.isEmpty()) { -+ QDir outDir(Option::output_dir); - // ### This is basically fubar. Add 'lines' flag to CONFIG? - QStringList dep_cmd_deps = indeps.replace('\n', ' ').simplified().split(' '); - for(int i = 0; i < dep_cmd_deps.count(); ++i) { - QString &file = dep_cmd_deps[i]; -- QString absFile = QDir(Option::output_dir).absoluteFilePath(file); -+ QString absFile = outDir.absoluteFilePath(file); - if (exists(absFile)) { - file = absFile; - } else { -@@ -1965,8 +1966,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) - QList depdirs = QMakeSourceFileInfo::dependencyPaths(); - for (QList::Iterator dit = depdirs.begin(); - dit != depdirs.end(); ++dit) { -- if (exists((*dit).local() + '/' + file)) { -- localFile = (*dit).local() + '/' + file; -+ QString lf = outDir.absoluteFilePath((*dit).local() + '/' + file); -+ if (exists(lf)) { -+ localFile = lf; - break; - } - } -@@ -2045,11 +2047,12 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) - } - QT_PCLOSE(proc); - if(!indeps.isEmpty()) { -+ QDir outDir(Option::output_dir); - // ### This is basically fubar. Add 'lines' flag to CONFIG? - QStringList dep_cmd_deps = indeps.replace('\n', ' ').simplified().split(' '); - for(int i = 0; i < dep_cmd_deps.count(); ++i) { - QString &file = dep_cmd_deps[i]; -- QString absFile = QDir(Option::output_dir).absoluteFilePath(file); -+ QString absFile = outDir.absoluteFilePath(file); - if (exists(absFile)) { - file = absFile; - } else { -@@ -2057,8 +2060,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) - QList depdirs = QMakeSourceFileInfo::dependencyPaths(); - for (QList::Iterator dit = depdirs.begin(); - dit != depdirs.end(); ++dit) { -- if (exists((*dit).local() + '/' + file)) { -- localFile = (*dit).local() + '/' + file; -+ QString lf = outDir.absoluteFilePath((*dit).local() + '/' + file); -+ if (exists(lf)) { -+ localFile = lf; - break; - } - } --- -2.17.0 +2.17.1 diff --git a/src/qtbase.mk b/src/qtbase.mk index 7084fe3..f7c7775 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.11.0 -$(PKG)_CHECKSUM := ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66 +$(PKG)_VERSION := 5.11.1 +$(PKG)_CHECKSUM := a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46 $(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) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 0ff2cfc..242dfb9 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 := 3fc60eafbe8737a8ff126eb9e2becc010d94f3db99dfa1d365e84f6af4540ccf +$(PKG)_CHECKSUM := 0fb51102bdd595673e2cc4f4878b8fb8b7da4c8b1f026885a75912e2421d2ede $(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 80fd6f4..109dfdf 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 := c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351 +$(PKG)_CHECKSUM := 62f65f08b08c1fdce4f358103be1f7d7aba54d21774e1a9bfff91314ad667a2b $(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 f5e36dc..ce11efd 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 := cd2e53b1a7bee098b651cbedcecf0717036ae4bec5de0daf3a0038a50b2e1873 +$(PKG)_CHECKSUM := 738ed4eb058334fe7cfd6d68f2e2e7c9b2a97f3477b36ae26ed82703dcaae657 $(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 910bada..8e190f2 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 := 64bc1b9b55348210491cefac1d12210e59c3b27350e1e8c951518d67e0abefe8 +$(PKG)_CHECKSUM := 1c9da0876e0058bff1c24e0088505aff469e2e2cc983143acdae17f075035e3d $(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 5f33c4e..8737f63 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 := eea9378b17b1c16d3b5235629b9128349bf98cba7d9c61122653d976b25f57c0 +$(PKG)_CHECKSUM := 9ecf5ef6bf618fcb6719a4b22e3d9f9ce7623c2344667038171d5662624c4f3a $(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 8ccff3b..55539bc 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 := 71a1445de3f0148639fcce27510f3eb410df6061bbb7af0f3ce5bff60660a23c +$(PKG)_CHECKSUM := aaf219667f87d07a216bd30374013f97deea964471d827f7fc15bdc572e227d9 $(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 ccd7ac4..975bacb 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 := 727846c9d8985be402f573ea28995f4a2bc13847a6d9deeca32d1e1e0421f977 +$(PKG)_CHECKSUM := d9d27236696221098e832d6fee8c0fbb2834b1670d9ca1e5bf3d0fbc8e5448f3 $(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 02fb262..a77721a 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 := 58406fef507a9f1e1cd97c0834b94d0a6484e19f5dea796a3b7b58fafff11e70 +$(PKG)_CHECKSUM := eb50deeccce12ede0a5faeb3e411f34920ba43092c65f063ab23d37970f65616 $(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 54149b7..9bdba7e 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 := 28f6911e3f00173005c0348c0b59f45e59ccda7feae724b1a6b8929021968c1c +$(PKG)_CHECKSUM := 172c9a39e8267739e20d60bda45de3db02b13163245776bdc696d8c5ab5f790f $(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 ab8a938..de2492d 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 := ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c +$(PKG)_CHECKSUM := f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c $(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 14ff190..b640c55 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 := d56b068f02272690a2814d80102dcba26e366dde8848bcaf6745a1a5258728cf +$(PKG)_CHECKSUM := 02b405e9b1af27e3dd986f9a2e4ed987bd9586bcdb2a529a08a6cc71ddbee416 $(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 8195688..04beacb 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 := da6166037ba0bc2a47234156ad6cd7c40f7cbfc9297b6b008b1a8de8c5f622b1 +$(PKG)_CHECKSUM := ac99abb83194b3b38f1bd7fd4458a4b32765e7dc7d515941d016abe45d1a3533 $(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 66806d3..1058298 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 := 26627d592193094c65f842d5dd20c771d77c554591b9375659b03945dc8af107 +$(PKG)_CHECKSUM := baea7f59513ffade3f8041c1756722334b7d04245667fa8faaeace07a430c656 $(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 be4b1b7..bfb2acf 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 := feac87e9a6ecff47bd8c18baffb93f4cea9ebb86014f817bfafe62da88454ac3 +$(PKG)_CHECKSUM := bdb066fa0d51ad36a2c756d4cba63892587638e5df9b9b6ee63b963ff39ec442 $(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 9744105..5480fff 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 := 25926ae733b31baac7af51f489ad26570d4f4f02ad4892a4a82babae5f5168c5 +$(PKG)_CHECKSUM := 1c430fd06e8eb25dbca43422453a16588d1aade936770df2e4b4e8961659da7c $(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 70b2633..fdb3fd1 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 := 531c204860e381808714486bd9703570de5fc5b1f8e2f4e18ede211d73428b03 +$(PKG)_CHECKSUM := f0463f02c0bb81d214b04ec82ff0d22744cdae1966cd8dfb53cd2b31ad233338 $(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 567e672..50842f7 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 := 0fc4e6d6b3281610551226cb6ffd9ef4e61b2f3bd0b7b1302135b03b5b16e2ab +$(PKG)_CHECKSUM := cbe90f58b73c344d67098eaa333f2d2562fa7a9f1794448e7543ff696831c0fa $(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 0642955..12ecdeb 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 := 05dde5528c5b710da50d5166eef4a86a279d329a82ef172637ba03fececc6c64 +$(PKG)_CHECKSUM := d3bbee3c579a6d7a06956d653bcdfc2e2cd054d639dcaff08f45efb94d6b554a $(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 2e9e063..d3ef65c 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 := 85eef7533a18fce59551fe26bb0055dd290d5d33cbb313fcb8e5daf8b40c6eb1 +$(PKG)_CHECKSUM := 56a7993821d556d84494c6dfc22759eb6f2a979e21685403a2b9da75f0ba64a3 $(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 14eb37b..671a14c 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 := a1c125f9dde6817ae41be668973b8f365c20e1860d5924ea7736383c1578eead +$(PKG)_CHECKSUM := dcc782c7d6693b0874881cf6ccc7269681bd8bf5f6e1a83c4ab18c27a35a9bdb $(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 8985fe2..16b2633 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 := 4b8efe60678a37c731356cc146886360e5852a1cd4a8ba6339fb950a2e7d1f54 +$(PKG)_CHECKSUM := 1d6aff3e3304ceec670c0f19029771ff21279553d561158063436b26c18b3037 $(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 3a86f72..14c184a 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 := 9d93ca84272cdf9031913cb3a6876716aa8a174e91693839f0de0ea3dd3a67d9 +$(PKG)_CHECKSUM := b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe $(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 858a940..2170ad2 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 := f13e92fce935ccc0e4bfd088645bf78ebadb42d4e944fc36c9dc08d537f2e81c +$(PKG)_CHECKSUM := 12d89b2afa64dce4d32c9e680135243c579d99aa9279d2aafc5602c15a697106 $(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 da9aff4..36165e8 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 := 914de601a81b32acdddc572d3ade41129b018f3693d9cecdc5dad32424913cbd +$(PKG)_CHECKSUM := 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b $(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 d797db6..d956cb5 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 := b0761a3b8260bae7f76bf26626ccd1d4ee92541d7c5d53d1958c88b9f92dca15 +$(PKG)_CHECKSUM := b9a476af15ae0c68a930f0b0aa8d988b8dc3e63c3d2134abebbf2148d6942e87 $(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 239f4f0..bf59003 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 := 7d5845805bec42de121ecc063ee40ac1438975adcec395c6af97cfd5bb3539b7 +$(PKG)_CHECKSUM := 7aaa12f719e853a195a670ff51697b73914e37c94ed2216d53a2d9e0861748ae $(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 9761c6b..2b6e507 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 := 842ea99770a660dbfd05178b5d1d7c6458a02b715a410ff95167dd222bda0929 +$(PKG)_CHECKSUM := 77c9bb78d3626789c31ef84056652daec1fbcad9e9ad6ad61e625d3e8232aaa1 $(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 250bdeb..31c5876 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 := 1c3344707a9288d9a2588bedb170897dd0158271a409f13c739b8598dc362e63 +$(PKG)_CHECKSUM := ff2f17275b6e9764ce3691822fc8da7b3b13613fdeacb4a8294409931e74bc63 $(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 cf491a3..c9a1450 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 := 19a378cba26e243ebb97c29a9ec02499c5eb49f2672fbcc8415e1b70d415d28e +$(PKG)_CHECKSUM := 6117e120c87b32dd07877dd0a6bf862b6285cb0d8b547190882980682f53af58 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12