diff options
34 files changed, 76 insertions, 108 deletions
diff --git a/src/qt3d.mk b/src/qt3d.mk index a278226..bee6cd4 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 := 515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515 +$(PKG)_CHECKSUM := 86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774 $(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 de00cd5..350bc5b 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 := 0bfb32189a79af97c86e4591c8b11fa47cec53b1b2a81c7cf20b2e0a70a051b0 +$(PKG)_CHECKSUM := 457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0 $(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 c1abc61..6105b67 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 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 +From ab2ae2ab4828740cbad27a5782b705eda5a3e394 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/2] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/3] 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,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 364c23e750..c90dd302cf 100644 +index 50364765fb..7bfc7430fe 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -371,6 +371,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,7 +25,7 @@ index 364c23e750..c90dd302cf 100644 !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -408,9 +411,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") @@ -39,15 +39,15 @@ index 364c23e750..c90dd302cf 100644 2.20.1 -From 798ab219ef98856dc4281559192e631f65bbb657 Mon Sep 17 00:00:00 2001 +From bb53c3e1135a63cbf645c28e4b3cd17251e260f7 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 2/2] use pkg-config for harfbuzz +Subject: [PATCH 2/3] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index 19312d245d..0164f9b49b 100644 +index 0202f17b21..1418a3bbee 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -304,7 +304,8 @@ @@ -64,10 +64,11 @@ index 19312d245d..0164f9b49b 100644 2.20.1 -From b8fd37d8cd7642599b3b022e4d8fa1aff8f68a1e Mon Sep 17 00:00:00 2001 +From 531b48dbc01fafba2f4b4c750bd40f7010055237 Mon Sep 17 00:00:00 2001 From: Artem Pisarenko <artem.k.pisarenko@gmail.com> Date: Thu, 16 Jan 2020 14:47:00 +0600 -Subject: [PATCH] Fix win32 support for linking against static builds in CMake +Subject: [PATCH 3/3] Fix win32 support for linking against static builds in + CMake CMake mkspec feature sets CMAKE_PRL_FILE_LOCATION_* values inconsistent with actual .prl file names being generated/installed, causing @@ -79,86 +80,89 @@ to find file at given location and skips filling libs deps). Fixes: QTBUG-81401 Change-Id: I5861cc0c42163d898ba55ad83cbad1994dcb1db2 ---- - mkspecs/features/create_cmake.prf | 41 +++++++++++++-------------------------- - 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 346fbf2..0d93597 100644 +index 4aa5dad467..fc60ed4e4c 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -212,21 +212,17 @@ contains(CONFIG, plugin) { - CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _) - +@@ -214,21 +214,17 @@ contains(CONFIG, plugin) { win32 { + !mingw|qtConfig(debug_and_release): debug_suffix="d" + + CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl -+ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl isEmpty(CMAKE_STATIC_TYPE) { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.dll + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } else:mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.a + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl } else { # MSVC static CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.lib + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } } else { mac { -@@ -316,36 +312,25 @@ mac { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -317,6 +313,13 @@ mac { + + !mingw|qtConfig(debug_and_release): debug_suffix="d" + !isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_STATIC_WINDOWS_BUILD = "true" + -+ CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl + } + mingw { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -324,17 +327,8 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a - } -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a } else { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -342,17 +336,8 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib - -- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib - } -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib } } else { !isEmpty(CMAKE_STATIC_TYPE) { -- -2.7.4 +2.20.1 diff --git a/src/qtbase.mk b/src/qtbase.mk index dd83023..779d377 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.14.0 -$(PKG)_CHECKSUM := 4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463 +$(PKG)_VERSION := 5.14.1 +$(PKG)_CHECKSUM := d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 $(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) diff --git a/src/qtcharts.mk b/src/qtcharts.mk index 9014b68..3677596 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 := ce7e22ca84e6a5fb85d6eb9e196407e0fa02848187548a2c388668e71f41a346 +$(PKG)_CHECKSUM := 3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b $(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 ab43819..b1c9eb8 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 := 2843b3b479d0feba0624eb4ae41382b99db77b87a6b7dea5aacdf3b33644f0bd +$(PKG)_CHECKSUM := ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72 $(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 93a334f..ff4c761 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 := ba7269413b04de74086e2b876f3e4d39e90f14f363011ff36d082485dc683eb1 +$(PKG)_CHECKSUM := cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96 $(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 b686891..f386dca 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 := bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e +$(PKG)_CHECKSUM := 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a $(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 48a1575..e7e084d 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 := 3d9835538afe7299e42d53a7bb85fb90aecdc714846671582139ff80d752a657 +$(PKG)_CHECKSUM := 13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499 $(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 c63d9c0..8687f42 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 := d931637d97cbb0e57bf2d78bf0eb06494f21a05d2e6a17e7c4f4f2a2fabc23cd +$(PKG)_CHECKSUM := aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138 $(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) diff --git a/src/qtimageformats-1.patch b/src/qtimageformats-1.patch deleted file mode 100644 index 03d9d4e..0000000 --- a/src/qtimageformats-1.patch +++ /dev/null @@ -1,36 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 17 Jun 2019 13:54:23 +0200 -Subject: [PATCH 1/1] use pkgconfig - - -diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json -index 1111111..2222222 100644 ---- a/src/imageformats/configure.json -+++ b/src/imageformats/configure.json -@@ -55,6 +55,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libmng" }, - "-lmng" - ] - }, -@@ -82,6 +83,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libtiff-4" }, - "-ltiff" - ] - }, -@@ -112,6 +114,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" }, - "-lwebp -lwebpdemux -lwebpmux" - ] - } diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 9536c64..4f2dda4 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 := 959f169af5fc09ef248062a457b78a667acafee71e57ea14fb14ff6f5dd898d5 +$(PKG)_CHECKSUM := b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e $(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 0a2de26..7840ee7 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 := 87906fd100dd93ed495a4db2c435dcfab073d399ea11d5e18727cc782fac4cd1 +$(PKG)_CHECKSUM := a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f $(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 72afa8b..af2aa86 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 := e7901aa32fe71f1409cf73a0c62f27b98f434688e7b16ea8591b29cd8f90ad5e +$(PKG)_CHECKSUM := c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7 $(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 6eb829b..a5b4321 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 := 16e8e9ed817a9cf1373f8ec57e4a6da9983fc8c5c80d0c61e092414d25472d11 +$(PKG)_CHECKSUM := e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0 $(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 f1fba17..5ba0932 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 := c7754bde43762c3037e14f684885d58a699b2ec18a016dd3f0c4c96178790624 +$(PKG)_CHECKSUM := bcb0a7f62be4a116feee4af759b89a55084c0364327a83ab0b73acdc60eab8a9 $(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 9eaf771..e544aae 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 := 6dd477bcb36a94ab417faab5e607f7a07c217c4ca3f751d8d76d475ab0f3558e +$(PKG)_CHECKSUM := 54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a $(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 79dbc68..d02a704 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 := 827bf86db44ce4f698f172378313db04e1cb81c593e9342bdd95bb1708f27911 +$(PKG)_CHECKSUM := 52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae $(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 18fe2dc..1591eb0 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 := 306765539d97c9c5b9e262393b1950d14f487260f2e333019010689de04bd235 +$(PKG)_CHECKSUM := 189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75 $(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 f27a524..2ab0381 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 := 6715ed5294013edfc338367b63ee6df2438965e4626435f30837e26a2151d3b9 +$(PKG)_CHECKSUM := d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd $(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 68361ee..7128c8a 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 := 7ed1497dc35f9b5d16a1ad529c3c181973ecae71b31db04aaeb5743f15b4feab +$(PKG)_CHECKSUM := 6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa $(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 f73f907..14f90d6 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 := 306fc19309b218b062eb6415e2a8364c5c3b53c2942e200012d45f0c33717926 +$(PKG)_CHECKSUM := eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c $(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 33d2830..84bc509 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 := 4c6a79a7c993200cd5043a321b9b0597a4e678f58e6b5b32931cce59bcab7694 +$(PKG)_CHECKSUM := a49f72ef59e2ad82155269bd54322bf2638d2793b5adc0cd44ae99bab88f1045 $(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 acbfb71..7f72792 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 := 4b647a66ae4da6b05b41b49ed296012002c1951f8a3ee24e0f2aa493f48e1ed3 +$(PKG)_CHECKSUM := ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f $(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 56b3740..16cdbee 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 := c62ba6080a779f8a62e727a33c277cf0744426804f6774e1000bdee0799e7725 +$(PKG)_CHECKSUM := abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425 $(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 5d2c933..e8100f9 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 := 1ee51a66e1996f96bf7fd4c696079c4cb22ea2bc710d47535c1daf3638d8f393 +$(PKG)_CHECKSUM := 8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359 $(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 2a46ee6..61b531e 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 := 8d7f8612ab6078fe7289d8a8dd8112b550fd0f51b5455df2dcfba651c30c3adf +$(PKG)_CHECKSUM := 7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c $(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 cf52050..ad96ac9 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 := 8b7529e102233153bfecc608d3944e11e086421c72e2d4eaf7e95ebbef301609 +$(PKG)_CHECKSUM := a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46 $(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 c861591..eeb2036 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 := 2f3362bf7999b912a4e92d0e9b5378089bc8dfcf270fe226bc68f2050de31410 +$(PKG)_CHECKSUM := 277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295 $(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 ecd6663..73ef367 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 := 0cb8dd07b34da8d44f8a14701409ce87fce5010f9b57273b357717c2dfd35383 +$(PKG)_CHECKSUM := 3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a $(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 3fcf054..938c662 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 := 50b881e83225b21e6657361e1af9b0154117d5efc03ba8c87aecacee3e42b0ad +$(PKG)_CHECKSUM := 742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef $(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 aba4dab..37d2e1d 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 := a1ded2eae5d66d8ddde3e56077c0e895aff74ae029cebaf901f91f87c5a89dc3 +$(PKG)_CHECKSUM := 8c18e7686d1480eb255b68e57a196f3ebc37cc4e2fbcd698ec3bed903517adff $(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 3df3fd3..da98a83 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 := cbe7d73f1972e99ea27c0e5f4fed2b713109167388814dcfe2932c19ae218a18 +$(PKG)_CHECKSUM := 222b888b89a8fb02948faf985e8614ac543603a000c1cf2e7489f8bf15ccc3cc $(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 3793945..6bf54c9 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 := 935209e91942e89d569f977153f0ca209125c205065960e55d4f4065a96d90d9 +$(PKG)_CHECKSUM := fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) |