From 3d2369f71dfdab78a4ff36ef24b513fb81cc78d4 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 7 Oct 2017 11:53:04 +0200
Subject: qt5: update to 5.9.2
qtwebkit is still at version 5.9.1 since 5.9.2 is not published.
---
src/qt3d.mk | 2 +-
src/qtactiveqt.mk | 2 +-
src/qtbase-1-fixes.patch | 85 ++++++++++++++++++++++++++++++++++++-----------
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/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/qtwebkit.mk | 8 ++---
src/qtwebsockets.mk | 2 +-
src/qtwebview.mk | 2 +-
src/qtwinextras.mk | 2 +-
src/qtxmlpatterns.mk | 2 +-
33 files changed, 101 insertions(+), 56 deletions(-)
diff --git a/src/qt3d.mk b/src/qt3d.mk
index 9d7d1e6..de6a1a4 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 := 4f1fe5b812d78987341b854e7f2907f0375dc188cfa6cf9db101b26e9dfd4996
+$(PKG)_CHECKSUM := c955a92fe2f3f2f03493ae0e9d973ebe1c4b1e037b58f18092fa2040f5b50783
$(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 cbbf144..a21a2b6 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 := 8feae8a310c8866e3468f7a103db82df8db76298cdc8878fb7d4daf33a30f81f
+$(PKG)_CHECKSUM := 60458d1972075b7196122b01d0ef7929cef49cc3f0683f8e46cd3a65b44de5cf
$(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 01a2d76..b1f71a5 100644
--- a/src/qtbase-1-fixes.patch
+++ b/src/qtbase-1-fixes.patch
@@ -1,9 +1,9 @@
This file is part of MXE. See LICENSE.md for licensing information.
-From 0e4abbfb6a0ac7bcc31fa0db0e2ae2c6e0310b26 Mon Sep 17 00:00:00 2001
+From dc63e2c9b8d03b631d04faa0505ebee59a594d98 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 26 Aug 2015 12:45:43 +0100
-Subject: [PATCH 1/5] 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.
@@ -12,7 +12,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 17da8b979e0..bddd70960a8 100644
+index 55c74aad66..d7bcffeb9c 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -224,13 +224,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -36,10 +36,10 @@ index 17da8b979e0..bddd70960a8 100644
2.11.0
-From 421e7313cfa5421dd41adb136a7449ecafc86e4e Mon Sep 17 00:00:00 2001
+From 697c74a0dfc3ed83e002ddb28bbd3d654f9a4ebf Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 16 Jul 2016 20:31:07 +1000
-Subject: [PATCH 2/5] 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
@@ -64,7 +64,7 @@ Task-number: 30898
Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 36f632e8caa..b07085ac429 100644
+index 36f632e8ca..b07085ac42 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -263,6 +263,10 @@ load(qt_installs)
@@ -105,18 +105,18 @@ index 36f632e8caa..b07085ac429 100644
2.11.0
-From b84844de9f60380c328a481b58cd2a035851d5d3 Mon Sep 17 00:00:00 2001
+From 703f33010fce0ab7abe90e4a51c6685121649ad3 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 29 Jan 2017 13:02:16 +0100
-Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific)
+Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific)
Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 2fb03a452ab..91ae39177f2 100644
+index 28c8034c75..cf9753ba21 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
-@@ -498,7 +498,7 @@
+@@ -905,7 +905,7 @@
},
"fontconfig": {
"label": "Fontconfig",
@@ -126,7 +126,7 @@ index 2fb03a452ab..91ae39177f2 100644
},
"gbm": {
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
-index ca33689cd72..194523eee00 100644
+index ca33689cd7..194523eee0 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -130,7 +130,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
@@ -145,15 +145,15 @@ index ca33689cd72..194523eee00 100644
2.11.0
-From c35d305ba4e1bdb4a6bdc7ad85515e0358b8d3bc Mon Sep 17 00:00:00 2001
+From ac2d89921b37f58d304e82b64784446190f61f9b Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 29 Jan 2017 16:22:03 +0100
-Subject: [PATCH 4/5] fix treatment of SYBASE_LIBS
+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 9fb957291fd..d0640809022 100644
+index b69b51b679..d37423adbd 100644
--- a/src/plugins/sqldrivers/configure.pri
+++ b/src/plugins/sqldrivers/configure.pri
@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) {
@@ -169,20 +169,20 @@ index 9fb957291fd..d0640809022 100644
2.11.0
-From 4bf338634788b012bd73b7bb4aeea81e42e9bb82 Mon Sep 17 00:00:00 2001
+From b3f30dd89e8fe9bd2d26c60d11e03a5d68e2a479 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 11 Jun 2017 00:27:41 +0200
-Subject: [PATCH 5/5] use pkg-config for harfbuzz
+Subject: [PATCH 5/6] use pkg-config for harfbuzz
Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 91ae39177f2..398d07d0b13 100644
+index cf9753ba21..4061920b8d 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
-@@ -130,7 +130,8 @@
- "label": "HarfBuzz",
- "test": "unix/harfbuzz",
+@@ -218,7 +218,8 @@
+ ]
+ },
"sources": [
- "-lharfbuzz"
+ { "type": "pkgConfig", "args": "harfbuzz" },
@@ -193,3 +193,48 @@ index 91ae39177f2..398d07d0b13 100644
--
2.11.0
+
+From 3699942ab30b6b0da29ee6ddddfeda0432f48faa Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 7 Oct 2017 11:39:29 +0200
+Subject: [PATCH 6/6] Revert "qmake: don't limit command line length when not
+ actually on windows"
+
+This breaks cross compiling for mingw.
+
+This reverts commit 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c.
+
+diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
+index 185afaaa49..20a2a6fab0 100644
+--- a/mkspecs/win32-g++/qmake.conf
++++ b/mkspecs/win32-g++/qmake.conf
+@@ -50,10 +50,8 @@ QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
+ QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
+ QMAKE_LFLAGS_DLL = -shared
+ QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
+-equals(QMAKE_HOST.os, Windows) {
+- QMAKE_LINK_OBJECT_MAX = 10
+- QMAKE_LINK_OBJECT_SCRIPT = object_script
+-}
++QMAKE_LINK_OBJECT_MAX = 10
++QMAKE_LINK_OBJECT_SCRIPT = object_script
+ QMAKE_PREFIX_SHLIB =
+ QMAKE_EXTENSION_SHLIB = dll
+ QMAKE_PREFIX_STATICLIB = lib
+diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
+index bad53dc5b7..c3b876531c 100644
+--- a/qmake/generators/win32/mingw_make.cpp
++++ b/qmake/generators/win32/mingw_make.cpp
+@@ -285,8 +285,7 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
+
+ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)
+ {
+- const ProString &objmax = project->first("QMAKE_LINK_OBJECT_MAX");
+- if (objmax.isEmpty() || project->values("OBJECTS").count() < objmax.toInt()) {
++ if (project->values("OBJECTS").count() < var("QMAKE_LINK_OBJECT_MAX").toInt()) {
+ objectsLinkLine = "$(OBJECTS)";
+ } else if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
+ QString ar_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET");
+--
+2.11.0
+
diff --git a/src/qtbase.mk b/src/qtbase.mk
index c02650c..22bd013 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.9.1
-$(PKG)_CHECKSUM := bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6
+$(PKG)_VERSION := 5.9.2
+$(PKG)_CHECKSUM := 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://download.qt.io/official_releases/qt/5.9/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk
index fca7cdd..988bb2e 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 := 4b8bf09330f03d2b3998f5447991546704715478c54f4f8d82d00bee3047de81
+$(PKG)_CHECKSUM := 84a8d66c2c35b67af84376037cac71fe77a105df09ffef7906a9cb1aeafb3eea
$(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 8505426..212ec0e 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 := 7328cbdc138a0b40f874bb8db36e0aee7cdf1c93263e3a184471867876710da0
+$(PKG)_CHECKSUM := 4e7af70a73828ee1eb9606bd2c071cc7347c5f928aaf07b420dce7376b1c6aa4
$(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 267c8ad..c4006da 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 := 40638b715517bff8509fe9fe1e6a4e45e0f66e68920605048e080dd023ae7fd5
+$(PKG)_CHECKSUM := 2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc
$(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 b051f44..1c306c9 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 := 233cab90fa35c926717bf697e7259b4e5bc7af6a26183657b006dac80fc0a191
+$(PKG)_CHECKSUM := 06ae5699872d048e8bb99464c420db3749c8b7601e9f855ce8b1e156d792b2b2
$(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 c9c2dee..83c40df 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 := d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff
+$(PKG)_CHECKSUM := 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08
$(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 ad3f637..41907ce 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 := f10714df314b3ef992060454db62e07d0b6a1fc7cf8a4175c023c59f8821bc14
+$(PKG)_CHECKSUM := 76d1e90d9015a189b6d77b3eeac1a8927cdb6a6d92b574d847f9387d07d9a552
$(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 ac6c592..4fc1408 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 := 5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff
+$(PKG)_CHECKSUM := 14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76
$(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 ad1147f..51f1ed4 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 := 79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47
+$(PKG)_CHECKSUM := 3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3
$(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 a0e58b3..f424265 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 := 4bc43c1df69c5322f982588711d4a65f8408b71a36e43ba19b39d1aae87e1515
+$(PKG)_CHECKSUM := c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c
$(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 988cab0..7ca5781 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 := e48fbe71b4418eb7caba5ef5aa422483fb28d0e894cbc41f3d8b73b3d7fee6e4
+$(PKG)_CHECKSUM := c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520
$(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 b71a0bd..d9c0bdf 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 := 5a8f270158b901d926086667d9d84eee5f46a7110d4f04cd32edac6cb0a2302c
+$(PKG)_CHECKSUM := 8a71057d9f71f24370b032521441ee0a1e894b28b51ac12f689364868f47c211
$(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 b7d93b1..20b8d09 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 := 520ed0e110f9d0977eb873ea0e05a3d205c9c1b1ad2dd606875708848b21ec2e
+$(PKG)_CHECKSUM := 5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f
$(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 44debdd..2ae4595 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 := 203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff
+$(PKG)_CHECKSUM := 2b55dd3dd53b4a6abb0ceb74b7fb98a5e52e9056c71a6cdbaead5cdf9d1ac8d2
$(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 fdce987..c327d01 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 := 176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f
+$(PKG)_CHECKSUM := 47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1
$(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 598aca9..9fee500 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 := 409758206d1381f262e879d8bde72c147f36f04af2be58986b5a61581e376bd4
+$(PKG)_CHECKSUM := 9d2b1292bc632305aa1963bfbfc06e8b4489ca0f9ed380ea6410c9dc38aeb15d
$(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 69393ea..7ccae71 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 := 5af19397aa8ccd88c1fbb7cda4ee2a583f05bdf8ae090eb616bb276ff2e9e29c
+$(PKG)_CHECKSUM := 79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3
$(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 7f01e78..c2023f0 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 := caa9feefbf1d51b38d6bc923428009d524c0c5eb77f30e4b6d84fec1ce19f3c3
+$(PKG)_CHECKSUM := bbc24bdafd0191fc808e08b19f378e74bedbb79faf4e396b66ba7ca9fed9be08
$(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 18848ce..94da833 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 := e1fe85bf292929c3a62cb4d21efaaa4e89f70f48ea10914da07d0670ec617a69
+$(PKG)_CHECKSUM := 50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42
$(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 102fd72..6516089 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 := ac9cef10637b54fa8d0bfe83f5b98c1c295cb68e63cf0973b2c6f188dcecaa01
+$(PKG)_CHECKSUM := ef7a84ec5a30c7c79d390b5cc56d476baa7c8b9f3b36f8b76d079fe85c1b0333
$(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 dc4b335..87aab6d 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 := 99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5
+$(PKG)_CHECKSUM := ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108
$(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 e2e37d1..140ccec 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 := c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8
+$(PKG)_CHECKSUM := 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a
$(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 8e01480..6554fd4 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 := 4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269
+$(PKG)_CHECKSUM := 5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f
$(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 d636576..712d9b6 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 := 6b746a6dc3ab54edf3007d0f6a2f8f31281aed03629830f59acfbc8514d6e94c
+$(PKG)_CHECKSUM := e836ca0348b21df28635e541713726444abed7b53a0acf3358cc90532e64c6fc
$(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 bcc5f63..28e22a1 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 := 80425f5a6df8784f5221809ffd664486ed38427f514ab4ec174e20456b027000
+$(PKG)_CHECKSUM := 9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26
$(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 6ef3984..ed006a3 100644
--- a/src/qtwebkit.mk
+++ b/src/qtwebkit.mk
@@ -4,11 +4,11 @@ PKG := qtwebkit
$(PKG)_WEBSITE := https://www.qt.io/
$(PKG)_DESCR := Qt
$(PKG)_IGNORE :=
-$(PKG)_VERSION = $(qtbase_VERSION)
+$(PKG)_VERSION := 5.9.1
$(PKG)_CHECKSUM := 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf
-$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
-$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE))
-$(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL))
+$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL := https://download.qt.io/official_releases/qt/5.9/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qtmultimedia qtquickcontrols sqlite
define $(PKG)_UPDATE
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index edc970f..a9cc9bf 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 := 01277362430b5a75c19a16ded8cf4c53a3bccddcc0ba2f50648e0f2985f23464
+$(PKG)_CHECKSUM := afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674
$(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 75ac5a1..c8c5411 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 := d6f77bfa60033561d123b1224679178c956319549666e84d4736c5e109ccbd62
+$(PKG)_CHECKSUM := fccaec79c73c62010f90bdd1a85b31d5caa63e0a1a28983bb74f6127afe1b8b1
$(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 683aaad..104b106 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 := 1acc9ebd85146c75ae8dde20dcf5ffadd04da5d998a452eba055bce10849eef4
+$(PKG)_CHECKSUM := b4f6689871403c3abb8d2b8fe9bebedc95d69694bae3c301181442437b4e181f
$(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 61e11ec..6c70d28 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 := b584686496ad1b1b3426d642bd705cab3fc02313b067a33d1b826a27aee29c24
+$(PKG)_CHECKSUM := 0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
--
cgit v0.12