From 04f34424121e890c492a75af53744193038136e0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 12 Dec 2019 16:15:12 +0100 Subject: qt5: update to 5.14.0 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 118 +++------------------------------------ src/qtbase.mk | 10 ++-- src/qtcharts.mk | 2 +- src/qtconnectivity-1-fixes.patch | 23 ++++++++ src/qtconnectivity.mk | 2 +- src/qtdatavis3d.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtgamepad.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats-1.patch | 47 +++------------- 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/qtremoteobjects.mk | 2 +- src/qtscript.mk | 2 +- src/qtscxml.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialbus.mk | 2 +- src/qtserialport.mk | 2 +- src/qtspeech.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtvirtualkeyboard.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 35 files changed, 76 insertions(+), 184 deletions(-) create mode 100644 src/qtconnectivity-1-fixes.patch diff --git a/src/qt3d.mk b/src/qt3d.mk index 1271d7d..a278226 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 := d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9 +$(PKG)_CHECKSUM := 515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515 $(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 a6c44cf..de00cd5 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 := 0f34a2f59a4438b4d060066eaed35e0f738d620b42782d598bad2f1a56cc094a +$(PKG)_CHECKSUM := 0bfb32189a79af97c86e4591c8b11fa47cec53b1b2a81c7cf20b2e0a70a051b0 $(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 6c93d8b..5afc3d9 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 bb59f5ad55cf935a20cb5406c020293a3ae91281 Mon Sep 17 00:00:00 2001 +From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 1/4] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/2] 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 f4a34d6e48..f9e2987564 100644 +index 364c23e750..c90dd302cf 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -327,6 +327,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -343,6 +343,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 f4a34d6e48..f9e2987564 100644 !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -364,9 +367,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -380,9 +383,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,87 +39,18 @@ index f4a34d6e48..f9e2987564 100644 2.20.1 -From b3d2613f24be55ee494646a0b84074a3308de264 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/4] Fix pkgconfig file and library naming - -See: https://codereview.qt-project.org/#/c/165394/ - https://bugreports.qt.io/browse/QTBUG-30898 - -Currently, *.pc files are generated with debug suffix `d` in `-release` -mode and without the suffix in `-debug` or `-debug-and-release`. This -can be worked around by `CONIFG-=debug_and_release`, however, a more -predictable and consistent naming approach would be preferable. - -This change mimics the *.prl file and lib conventions: - - -release: creates normal *.pc files and lib names - -release -force-debug-info: normal as above - -debug: creates *d.pc and *d lib names - -debug-and-release: creates both - -default: creates both (default link: debug) - -and should be unsurprising to users of `pkg-config`. At very least, -it's deterministic and easily incorporated into build systems. - -Task-number: 30898 -Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 46687f262e..4b2980a1a8 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -268,6 +268,10 @@ load(qt_installs) - - load(qt_targets) - -+# Set TARGET towards the end but before pkgconfig setup to keep naming -+# conventions consistent with *prl files -+TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) -+ - # this builds on top of qt_common - !internal_module:if(unix|mingw) { - CONFIG += create_pc -@@ -283,12 +287,12 @@ load(qt_targets) - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME - } -- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") -- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) -+ QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") -+ QMAKE_PKGCONFIG_FILE = $$TARGET - for(i, MODULE_DEPENDS): \ -- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0)) -+ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix() - isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ -- QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module -+ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module - !isEmpty(lib_replace0.match) { - pclib_replace0.match = $$lib_replace0.match - pclib_replace0.replace = $$QMAKE_PKGCONFIG_LIBDIR/ -@@ -334,5 +338,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.20.1 - - -From 109719a9699166747203bef1d2516c9ace183125 Mon Sep 17 00:00:00 2001 +From 798ab219ef98856dc4281559192e631f65bbb657 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 3/4] use pkg-config for harfbuzz +Subject: [PATCH 2/2] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index 6280b4dfa2..e094ee12e6 100644 +index 19312d245d..0164f9b49b 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -303,7 +303,8 @@ +@@ -304,7 +304,8 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -132,34 +63,3 @@ index 6280b4dfa2..e094ee12e6 100644 -- 2.20.1 - -From 3e4cc37443c0269e0b0be655c670926e7198c135 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Thu, 31 Oct 2019 22:35:28 +0100 -Subject: [PATCH 4/4] Revert "configure: Do use pkg-config --libs for static - libs" - -This change broke dbus detection in MXE. Smells fishy too. - -This reverts commit a1ea49878927dfe267416c795b50f3d5bdfa0b84. - -Change-Id: I66e4fe1e7a4d53c19f0d5dadf1e041565467f270 - -diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 81110e9f6d..9be4fb6f1f 100644 ---- a/mkspecs/features/qt_configure.prf -+++ b/mkspecs/features/qt_configure.prf -@@ -825,7 +825,9 @@ defineTest(qtConfLibrary_pkgConfig) { - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") { -- qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false) -+ qtRunLoggedCommand("$$pkg_config --static --libs-only-L $$args", libpaths)|return(false) -+ qtRunLoggedCommand("$$pkg_config --static --libs-only-l $$args", libs)|return(false) -+ eval(libs = $$libpaths $$libs) - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - } --- -2.20.1 - diff --git a/src/qtbase.mk b/src/qtbase.mk index 19cc0af..77c41b6 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -4,11 +4,11 @@ PKG := qtbase $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := -$(PKG)_VERSION := 5.13.2 -$(PKG)_CHECKSUM := 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121 +$(PKG)_VERSION := 5.14.0 +$(PKG)_CHECKSUM := 4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463 $(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.13/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := https://download.qt.io/official_releases/qt/5.14/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib zstd $(PKG)_DEPS_$(BUILD) := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) @@ -76,8 +76,8 @@ define $(PKG)_BUILD mkdir '$(1)/test-qt' cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' - $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE) - $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/test-qt/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' # build test the manual way mkdir '$(1)/test-$(PKG)-pkgconfig' diff --git a/src/qtcharts.mk b/src/qtcharts.mk index 979e482..9014b68 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 := 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87 +$(PKG)_CHECKSUM := ce7e22ca84e6a5fb85d6eb9e196407e0fa02848187548a2c388668e71f41a346 $(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-1-fixes.patch b/src/qtconnectivity-1-fixes.patch new file mode 100644 index 0000000..feb68fd --- /dev/null +++ b/src/qtconnectivity-1-fixes.patch @@ -0,0 +1,23 @@ +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: Mark Brand +Date: Thu, 12 Dec 2019 17:45:38 +0100 +Subject: [PATCH 1/1] fix filename case for case sensitive build + + +diff --git a/src/bluetooth/qlowenergycontroller_win.cpp b/src/bluetooth/qlowenergycontroller_win.cpp +index 1111111..2222222 100644 +--- a/src/bluetooth/qlowenergycontroller_win.cpp ++++ b/src/bluetooth/qlowenergycontroller_win.cpp +@@ -51,7 +51,7 @@ + + #include // for std::max + +-#include ++#include + + QT_BEGIN_NAMESPACE + diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 2bcdc75..ab43819 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 := 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17 +$(PKG)_CHECKSUM := 2843b3b479d0feba0624eb4ae41382b99db77b87a6b7dea5aacdf3b33644f0bd $(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 0eabcfb..93a334f 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 := ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28 +$(PKG)_CHECKSUM := ba7269413b04de74086e2b876f3e4d39e90f14f363011ff36d082485dc683eb1 $(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 b763846..b686891 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 := d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd +$(PKG)_CHECKSUM := bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e $(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 6b6376f..48a1575 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 := 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e +$(PKG)_CHECKSUM := 3d9835538afe7299e42d53a7bb85fb90aecdc714846671582139ff80d752a657 $(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 e60be91..c63d9c0 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 := 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66 +$(PKG)_CHECKSUM := d931637d97cbb0e57bf2d78bf0eb06494f21a05d2e6a17e7c4f4f2a2fabc23cd $(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 index b09629f..03d9d4e 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -10,58 +10,27 @@ 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 -@@ -51,9 +51,6 @@ - "stdio.h", - "libmng.h" - ], -- "qmake": [ -- "LIBS += -lmng" -- ], - "main": [ - "mng_handle hMNG;", - "mng_cleanup(&hMNG);", -@@ -67,6 +64,7 @@ - } +@@ -55,6 +55,7 @@ + ] }, "sources": [ + { "type": "pkgConfig", "args": "libmng" }, "-lmng" ] }, -@@ -77,10 +75,6 @@ - "type": "compile", - "test": { - "include": "tiffio.h", -- "qmake": [ -- "unix|mingw: LIBS += -ltiff", -- "else:win32: LIBS += libtiff.lib" -- ], - "main": [ - "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)", - "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG", -@@ -105,6 +99,7 @@ - } +@@ -82,6 +83,7 @@ + ] }, "sources": [ + { "type": "pkgConfig", "args": "libtiff-4" }, "-ltiff" ] }, -@@ -119,9 +114,6 @@ - "webp/encode.h", - "webp/demux.h" - ], -- "qmake": [ -- "LIBS += -lwebp -lwebpdemux" -- ], - "main": [ - "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)", - "#error \"Incompatible libwebp version\"", -@@ -144,6 +136,7 @@ - } +@@ -112,6 +114,7 @@ + ] }, "sources": [ -+ { "type": "pkgConfig", "args": "libwebp libwebpdemux" }, - "-lwebp -lwebpdemux" ++ { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" }, + "-lwebp -lwebpdemux -lwebpmux" ] } diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 7bed594..9536c64 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 := 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0 +$(PKG)_CHECKSUM := 959f169af5fc09ef248062a457b78a667acafee71e57ea14fb14ff6f5dd898d5 $(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 1881e29..0a2de26 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 := 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3 +$(PKG)_CHECKSUM := 87906fd100dd93ed495a4db2c435dcfab073d399ea11d5e18727cc782fac4cd1 $(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 ce50177..72afa8b 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 := 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4 +$(PKG)_CHECKSUM := e7901aa32fe71f1409cf73a0c62f27b98f434688e7b16ea8591b29cd8f90ad5e $(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 0dfa5b9..6eb829b 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 := 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3 +$(PKG)_CHECKSUM := 16e8e9ed817a9cf1373f8ec57e4a6da9983fc8c5c80d0c61e092414d25472d11 $(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 8c55f02..f1fba17 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 := e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4 +$(PKG)_CHECKSUM := c7754bde43762c3037e14f684885d58a699b2ec18a016dd3f0c4c96178790624 $(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 6449a06..9eaf771 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 := d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea +$(PKG)_CHECKSUM := 6dd477bcb36a94ab417faab5e607f7a07c217c4ca3f751d8d76d475ab0f3558e $(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 26dcbe1..79dbc68 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 := 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70 +$(PKG)_CHECKSUM := 827bf86db44ce4f698f172378313db04e1cb81c593e9342bdd95bb1708f27911 $(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 4693dbf..18fe2dc 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 := bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65 +$(PKG)_CHECKSUM := 306765539d97c9c5b9e262393b1950d14f487260f2e333019010689de04bd235 $(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 6dd27b4..f27a524 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 := 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70 +$(PKG)_CHECKSUM := 6715ed5294013edfc338367b63ee6df2438965e4626435f30837e26a2151d3b9 $(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 9011c7c..68361ee 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 := e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9 +$(PKG)_CHECKSUM := 7ed1497dc35f9b5d16a1ad529c3c181973ecae71b31db04aaeb5743f15b4feab $(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 75d34ae..f73f907 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 := 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177 +$(PKG)_CHECKSUM := 306fc19309b218b062eb6415e2a8364c5c3b53c2942e200012d45f0c33717926 $(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 e556fa8..33d2830 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 := 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3 +$(PKG)_CHECKSUM := 4c6a79a7c993200cd5043a321b9b0597a4e678f58e6b5b32931cce59bcab7694 $(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 38e5169..acbfb71 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 := 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34 +$(PKG)_CHECKSUM := 4b647a66ae4da6b05b41b49ed296012002c1951f8a3ee24e0f2aa493f48e1ed3 $(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 6eb158b..56b3740 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 := a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5 +$(PKG)_CHECKSUM := c62ba6080a779f8a62e727a33c277cf0744426804f6774e1000bdee0799e7725 $(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 1a04947..5d2c933 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 := 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7 +$(PKG)_CHECKSUM := 1ee51a66e1996f96bf7fd4c696079c4cb22ea2bc710d47535c1daf3638d8f393 $(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 5fdc258..2a46ee6 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 := 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e +$(PKG)_CHECKSUM := 8d7f8612ab6078fe7289d8a8dd8112b550fd0f51b5455df2dcfba651c30c3adf $(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 3453b7d..cf52050 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 := 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9 +$(PKG)_CHECKSUM := 8b7529e102233153bfecc608d3944e11e086421c72e2d4eaf7e95ebbef301609 $(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 186314e..c861591 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 := 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b +$(PKG)_CHECKSUM := 2f3362bf7999b912a4e92d0e9b5378089bc8dfcf270fe226bc68f2050de31410 $(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 56ec07f..ecd6663 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 := f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13 +$(PKG)_CHECKSUM := 0cb8dd07b34da8d44f8a14701409ce87fce5010f9b57273b357717c2dfd35383 $(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 b840438..3fcf054 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 := fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3 +$(PKG)_CHECKSUM := 50b881e83225b21e6657361e1af9b0154117d5efc03ba8c87aecacee3e42b0ad $(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 ee3a113..aba4dab 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 := 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015 +$(PKG)_CHECKSUM := a1ded2eae5d66d8ddde3e56077c0e895aff74ae029cebaf901f91f87c5a89dc3 $(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 a0f70dc..3df3fd3 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 := e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779 +$(PKG)_CHECKSUM := cbe7d73f1972e99ea27c0e5f4fed2b713109167388814dcfe2932c19ae218a18 $(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 5ec612d..3793945 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 := 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2 +$(PKG)_CHECKSUM := 935209e91942e89d569f977153f0ca209125c205065960e55d4f4065a96d90d9 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12