From 0567f17d34463abda1790957812c54e8c0cf59fe Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 17 Jun 2019 11:39:55 +0200 Subject: [PATCH 1/6] qt5: update to 5.12.4 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 61 +++----------- src/qtbase.mk | 4 +- src/qtcanvas3d.mk | 2 +- src/qtcharts.mk | 2 +- src/qtconnectivity.mk | 2 +- src/qtdatavis3d.mk | 2 +- src/qtdeclarative.mk | 4 +- src/qtgamepad.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats-1.patch | 164 ++++++++++++++----------------------- 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/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 36 files changed, 106 insertions(+), 191 deletions(-) diff --git a/src/qt3d.mk b/src/qt3d.mk index bcaa8306..6c8ae8ee 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 := 8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d +$(PKG)_CHECKSUM := cfad2e16f40fa07f8be59fa29c0c246743ee67db417ca29772a92f36fa322af3 $(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 52f48537..780a6668 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 := 15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f +$(PKG)_CHECKSUM := d3c78e6c2a75b9d4f9685d4eea6e84f44f97034a54aed7a159c53cfd4ec4eac7 $(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 7e381e9d..6f4bf160 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 c0c8cf4d8e554ac6f1a17dc8d2dce16897ae5cf3 Mon Sep 17 00:00:00 2001 +From 15145baa429524cf5d14f36c2b96f9e10b52838f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/4] 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 3ed6dd5889..cc5bc9dc16 100644 +index c729892889..8961199089 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -35,10 +35,10 @@ index 3ed6dd5889..cc5bc9dc16 100644 2.20.1 -From b57baee4eee0a33338776498da7f216fb2a7fdc0 Mon Sep 17 00:00:00 2001 +From 26458bce67f672e8c2f6eef3cd7adf3a9b88ee86 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/5] Fix pkgconfig file and library naming +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 @@ -104,56 +104,15 @@ index 51b5bde67a..faba17aedd 100644 2.20.1 -From 691b8c15f19116a881a6830cfbb344bf49c385e7 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) - -Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f - -diff --git a/src/gui/configure.json b/src/gui/configure.json -index 6fdcd562a7..69f00bc71d 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -1213,7 +1213,7 @@ - "fontconfig": { - "label": "Fontconfig", - "autoDetect": "!config.darwin", -- "condition": "!config.win32 && features.system-freetype && libs.fontconfig", -+ "condition": "features.system-freetype && libs.fontconfig", - "output": [ "privateFeature", "feature" ] - }, - "gbm": { -diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp -index f457f69f11..2b2aec0868 100644 ---- a/src/plugins/platforms/minimal/qminimalintegration.cpp -+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp -@@ -162,7 +162,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const - - if (!m_fontDatabase) { - #if QT_CONFIG(fontconfig) -- m_fontDatabase = new QGenericUnixFontDatabase; -+#ifdef Q_OS_WIN -+ m_fontDatabase = new QFreeTypeFontDatabase; -+#else -+ m_fontDatabase = new QGenericUnixFontDatabase; -+#endif - #else - m_fontDatabase = QPlatformIntegration::fontDatabase(); - #endif --- -2.20.1 - - -From a2eab53930f2891a15cd1aa1721a5e247851035c Mon Sep 17 00:00:00 2001 +From 02bb523901a33b66cc0e625cef56ef573b2a01d8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 4/5] use pkg-config for harfbuzz +Subject: [PATCH 3/4] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index 69f00bc71d..7d15695499 100644 +index c51e3ceee3..966b0170ba 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -303,7 +303,8 @@ @@ -170,10 +129,10 @@ index 69f00bc71d..7d15695499 100644 2.20.1 -From 25e2683c3f2ecc5143211a9c80a0f0f8b72b6bd5 Mon Sep 17 00:00:00 2001 +From 71c816bca64e9169ce6860df3bd8216faf1d0355 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 4/4] 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)': diff --git a/src/qtbase.mk b/src/qtbase.mk index 6a48be34..78b52795 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.12.3 -$(PKG)_CHECKSUM := fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701 +$(PKG)_VERSION := 5.12.4 +$(PKG)_CHECKSUM := 20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195 $(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.12/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 67fde758..2cba4974 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 := c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea +$(PKG)_CHECKSUM := d7e0e8aa542d077a929fb7700411ca9de1f65ae4748d64168d2e7533facd7869 $(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 e63ff480..075a0de6 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 := 820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9 +$(PKG)_CHECKSUM := 06ff68a80dc377847429cdd87d4e46465e1d6fbc417d52700a0a59d197669c9e $(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 2608cf63..9863d96d 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 := 01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661 +$(PKG)_CHECKSUM := 749d05242b9fae12e80f569fb6b918dc011cb191eeb05147cbde474ca6b173ef $(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 a7823ce2..5bc71804 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 := f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313 +$(PKG)_CHECKSUM := 1c160eeb430c8602aaee8ae4faa55bc62f880dae642be5fd1ac019f7886eb15a $(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 8b2bd650..5576af8b 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -5,11 +5,11 @@ $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7 +$(PKG)_CHECKSUM := 614105ed73079d67d81b34fef31c9934c5e751342e4b2e0297128c8c301acda7 $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) -$(PKG)_DEPS := cc qtbase qtsvg qtxmlpatterns +$(PKG)_DEPS := cc qtbase qtimageformats qtsvg qtxmlpatterns $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_UPDATE diff --git a/src/qtgamepad.mk b/src/qtgamepad.mk index c4afae2c..77f60fc3 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 := 5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642 +$(PKG)_CHECKSUM := 25de6f10fb18f2484d1e569688bf33deb90ecbfb97ce41c2b5fb3521146e4c45 $(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 f1b12e30..215e1e52 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 := 772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73 +$(PKG)_CHECKSUM := 0bc38b168fa724411984525173d667aa47076c8cbd4eeb791d0da7fe4b9bdf73 $(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 cb265a4e..b09629f9 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -2,110 +2,66 @@ This file is part of MXE. See LICENSE.md for licensing information. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4 +Date: Mon, 17 Jun 2019 13:54:23 +0200 +Subject: [PATCH 1/1] use pkgconfig -diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro +diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 1111111..2222222 100644 ---- a/config.tests/libtiff/libtiff.pro -+++ b/config.tests/libtiff/libtiff.pro -@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -ltiff -+CONFIG += link_pkgconfig -+packagesExist(libtiff-4):PKGCONFIG += libtiff-4 -+else:if(unix|win32-g++*): LIBS += -ltiff - else:win32: LIBS += libtiff.lib -diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 1111111..2222222 100644 ---- a/src/plugins/imageformats/tiff/tiff.pro -+++ b/src/plugins/imageformats/tiff/tiff.pro -@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp - OTHER_FILES += tiff.json - - config_libtiff { -- unix|mingw: LIBS += -ltiff -+ CONFIG += link_pkgconfig -+ packagesExist(libtiff-4):PKGCONFIG += libtiff-4 -+ else:if(unix|win32-g++*): LIBS += -ltiff - else:win32: LIBS += libtiff.lib - } else { - include($$PWD/../../../3rdparty/libtiff.pri) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 19 Dec 2012 23:29:52 +0100 -Subject: [PATCH 2/3] [MXE] pkg-config support for libmng - - -diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro -index 1111111..2222222 100644 ---- a/config.tests/libmng/libmng.pro -+++ b/config.tests/libmng/libmng.pro -@@ -2,5 +2,7 @@ SOURCES = libmng.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -lmng -+CONFIG += link_pkgconfig -+packagesExist(libmng):PKGCONFIG += libmng -+else:if(unix|win32-g++*): LIBS += -lmng - else:win32: LIBS += libmng.lib -diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro -index 1111111..2222222 100644 ---- a/src/plugins/imageformats/mng/mng.pro -+++ b/src/plugins/imageformats/mng/mng.pro -@@ -5,7 +5,10 @@ SOURCES += main.cpp \ - qmnghandler.cpp - OTHER_FILES += mng.json - --msvc: LIBS += libmng.lib -+CONFIG += link_pkgconfig -+packagesExist(libmng):PKGCONFIG += libmng -+else:if(unix|mingw): LIBS += -lmng -+else:msvc: LIBS += libmng.lib - else: LIBS += -lmng - - PLUGIN_TYPE = imageformats - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Fri, 16 Nov 2018 10:13:11 +0100 -Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp - - -diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro -index 1111111..2222222 100644 ---- a/config.tests/libwebp/libwebp.pro -+++ b/config.tests/libwebp/libwebp.pro -@@ -2,5 +2,9 @@ SOURCES = libwebp.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -lwebp -lwebpdemux -+unix|mingw { -+ CONFIG += link_pkgconfig -+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux -+ else: LIBS += -lwebp -lwebpdemux -+} - else:win32: LIBS += libwebp.lib libwebpdemux.lib -diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro -index 1111111..2222222 100644 ---- a/src/plugins/imageformats/webp/webp.pro -+++ b/src/plugins/imageformats/webp/webp.pro -@@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp - OTHER_FILES += webp.json - - config_libwebp { -- unix|win32-g++*: LIBS += -lwebp -lwebpdemux -+ unix|mingw { -+ CONFIG += link_pkgconfig -+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux -+ else: LIBS += -lwebp -lwebpdemux -+ } - else:win32: LIBS += libwebp.lib libwebpdemux.lib - } else { - include($$PWD/../../../3rdparty/libwebp.pri) +--- 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 @@ + } + }, + "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 @@ + } + }, + "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 @@ + } + }, + "sources": [ ++ { "type": "pkgConfig", "args": "libwebp libwebpdemux" }, + "-lwebp -lwebpdemux" + ] + } diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 16571475..fd4f8334 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 := db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2 +$(PKG)_CHECKSUM := 2dee25c3eea90d172cbd40f41450153322b902da1daa7d2370a55124b2307bb3 $(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 7fda3e41..3877ca7c 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 := 52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6 +$(PKG)_CHECKSUM := 127b40bd7679fead3fb98f4c9c1d71dde9d6d416e90a6000129b61a5f128b3a0 $(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 84c5248f..abcc7a29 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 := a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301 +$(PKG)_CHECKSUM := 7c0759ab6fca2480b10b71a35beeffe0b847adeff5af94eacd1a4531d033423d $(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 ed9581dc..ba257c5f 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 := dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332 +$(PKG)_CHECKSUM := e501eb46b8405a2b7db9fe90a1c224cf6676a07dc22c0662317ffe3dee1dbf55 $(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 32e889ef..d610043a 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 := a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e +$(PKG)_CHECKSUM := 7804a111043d0e8d6d81a0d0ae465ce2c36eca73f2774ccb5fa7be8670211672 $(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 bcc192b6..38fa74d1 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 := 68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46 +$(PKG)_CHECKSUM := 32d4c2505337c67b0bac26d7f565ec8fabdc616e61247e98674820769dda9858 $(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 7d8a54fe..b81fb37b 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 := e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a +$(PKG)_CHECKSUM := 9a447eed38bc8c7d7be7bc407317f58940377c077ddca74c9a641b1ee6200331 $(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 07e44d5d..00d0e08b 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 := 3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42 +$(PKG)_CHECKSUM := 54dd0c782abff90bf0608771c2e90b36073d9bd8d6c61706a2873bb7c317f413 $(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 290055b8..769db4d8 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 := 0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e +$(PKG)_CHECKSUM := 7adb3fe77638c7a6f2a26bca850b0ff54f5fb7e5561d2e4141d14a84305c2b6a $(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 403e7eb2..dea40394 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 := 70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19 +$(PKG)_CHECKSUM := 696fb72a62018151275fe589fc80cb160d2becab9a3254321d40e2e11a0ad4f8 $(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 71e81bcc..30672c83 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 := 7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc +$(PKG)_CHECKSUM := 95873c7ea5960008d6eb41368ca64d68fbd05594ca8c2cd848b1612fc4aec0a9 $(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 0decd5b6..436003c9 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 := 792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d +$(PKG)_CHECKSUM := 69d56905f43ee13e670750e8f46d373835fae81d6343baa7c4004d2a2c6311fc $(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 82896f2f..7f251a94 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 := 1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51 +$(PKG)_CHECKSUM := bf487df8a9fb2eddf103842b57a75b17ef4c498ee40306ae9997017c82b0ad39 $(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 f51d3b93..2f7333b1 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 := ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5 +$(PKG)_CHECKSUM := 2ff9660fb3f5663c9161f491d1a304db62691720136ae22c145ef6a1c94b90ec $(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 14402fa3..d98e45a4 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 := f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2 +$(PKG)_CHECKSUM := 110812515a73c650e5ebc41305d9a243dadeb21f485aaed773e394dd84ce0d04 $(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 6e622bb2..cbea9d7a 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 := c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8 +$(PKG)_CHECKSUM := 3b0e353860a9c0cd4db9eeae5f94fef8811ed7d107e3e5e97e4a557f61bd6eb6 $(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 4d35c339..cba62c58 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 := eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca +$(PKG)_CHECKSUM := ab8dd55f5ca869cab51c3a6ce0888f854b96dc03c7f25d2bd3d2c50314ab60fb $(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 dc220147..4f7ae6a9 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 := 7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22 +$(PKG)_CHECKSUM := 33ac0356f916995fe5a91582e12b4c4f730c705808ea3c14e75c6e350e8131e6 $(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 495c4ed5..74b5ba92 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 := 72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a +$(PKG)_CHECKSUM := ab571a1b699e61a86be1a6b8d6ffd998d431c4850cc27e9a21f81fa5923bfdb7 $(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 a074c996..3f214fde 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://github.com/annulen/webkit $(PKG)_DESCR := QtWebKit $(PKG)_IGNORE := $(PKG)_VERSION := 5.212 -$(PKG)_CHECKSUM := 283b907ea324a2c734e3983c73fc27dbd8b33e2383c583de41842ee84d648a3e +$(PKG)_CHECKSUM := fada6fa2f2bae27a16b666e0360680de6ab21aac044670b434a729334e57b154 $(PKG)_SUBDIR := qtwebkit-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := qtwebkit-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://download.qt.io/snapshots/ci/qtwebkit/$($(PKG)_VERSION)/latest/src/submodules/$($(PKG)_FILE) diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index d9f3070d..fc95c438 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 := 258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577 +$(PKG)_CHECKSUM := b471eda2f486d21c51fc3bc53bb8844022117e746d5f15c5eabb82cd37eb2abe $(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 9b4db369..d1965eb3 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 := f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5 +$(PKG)_CHECKSUM := 1f244c6b774dd9d03d3c5cafe877381900b50a2775cef6487c8bb66e32ab5a5d $(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 23789d22..381068fa 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 := 2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b +$(PKG)_CHECKSUM := f6e0172582a499d5e50c51877552d1a3bff66546d9a02e5754100a51b192973f $(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 b292d5e7..a5b30719 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 := e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61 +$(PKG)_CHECKSUM := 0bea1719bb948f65cbed4375cc3e997a6464f35d25b631bafbd7a3161f8f5666 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) From af2744a8bc86df0d7d4fc223227e2035d46a3d93 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 17 Jun 2019 13:43:20 +0000 Subject: [PATCH 2/6] Update packages.json & build-matrix.html --- docs/build-matrix.html | 68 +++++++++++++++++++++--------------------- docs/packages.json | 68 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index c8c3a6cc..9c7e431b 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -3559,7 +3559,7 @@ feel free to submit a pull request. qt3d - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3569,7 +3569,7 @@ feel free to submit a pull request. qt5 [meta-pkg] - 5.12.3 + 5.12.4 • • • @@ -3579,7 +3579,7 @@ feel free to submit a pull request. qtactiveqt - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3589,7 +3589,7 @@ feel free to submit a pull request. qtbase - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3599,7 +3599,7 @@ feel free to submit a pull request. qtcanvas3d - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3609,7 +3609,7 @@ feel free to submit a pull request. qtcharts - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3619,7 +3619,7 @@ feel free to submit a pull request. qtconnectivity - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3629,7 +3629,7 @@ feel free to submit a pull request. qtdatavis3d - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3639,7 +3639,7 @@ feel free to submit a pull request. qtdeclarative - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3649,7 +3649,7 @@ feel free to submit a pull request. qtgamepad - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3659,7 +3659,7 @@ feel free to submit a pull request. qtgraphicaleffects - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3679,7 +3679,7 @@ feel free to submit a pull request. qtimageformats - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3699,7 +3699,7 @@ feel free to submit a pull request. qtlocation - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3709,7 +3709,7 @@ feel free to submit a pull request. qtmultimedia - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3719,7 +3719,7 @@ feel free to submit a pull request. qtnetworkauth - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3739,7 +3739,7 @@ feel free to submit a pull request. qtpurchasing - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3749,7 +3749,7 @@ feel free to submit a pull request. qtquickcontrols - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3759,7 +3759,7 @@ feel free to submit a pull request. qtquickcontrols2 - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3769,7 +3769,7 @@ feel free to submit a pull request. qtremoteobjects - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3779,7 +3779,7 @@ feel free to submit a pull request. qtscript - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3789,7 +3789,7 @@ feel free to submit a pull request. qtscxml - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3799,7 +3799,7 @@ feel free to submit a pull request. qtsensors - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3809,7 +3809,7 @@ feel free to submit a pull request. qtserialbus - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3819,7 +3819,7 @@ feel free to submit a pull request. qtserialport - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3869,7 +3869,7 @@ feel free to submit a pull request. qtspeech - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3879,7 +3879,7 @@ feel free to submit a pull request. qtsvg - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3899,7 +3899,7 @@ feel free to submit a pull request. qttools - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3909,7 +3909,7 @@ feel free to submit a pull request. qttranslations - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3919,7 +3919,7 @@ feel free to submit a pull request. qtvirtualkeyboard - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3929,7 +3929,7 @@ feel free to submit a pull request. qtwebchannel - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3949,7 +3949,7 @@ feel free to submit a pull request. qtwebsockets - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3959,7 +3959,7 @@ feel free to submit a pull request. qtwebview - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3969,7 +3969,7 @@ feel free to submit a pull request. qtwinextras - 5.12.3 + 5.12.4 ✓ ✓ ✓ @@ -3989,7 +3989,7 @@ feel free to submit a pull request. qtxmlpatterns - 5.12.3 + 5.12.4 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index d9385555..18b907a6 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -351,50 +351,50 @@ "qjson": {"version": "0.9.0", "website": "https://qjson.sourceforge.io/", "description": "QJson"}, "qscintilla2": {"version": "2.11.1", "website": "https://www.riverbankcomputing.com/software/qscintilla/intro", "description": "QScintilla2"}, "qt": {"version": "4.8.7", "website": "https://www.qt.io/", "description": "Qt"}, - "qt3d": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qt5": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtactiveqt": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtbase": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtcanvas3d": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtcharts": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtconnectivity": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtdatavis3d": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtdeclarative": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtgamepad": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtgraphicaleffects": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qt3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qt5": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtactiveqt": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtbase": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtcanvas3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtcharts": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtconnectivity": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtdatavis3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtdeclarative": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtgamepad": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtgraphicaleffects": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtifw": {"version": "3.0.4", "website": "https://doc.qt.io/qtinstallerframework/index.html", "description": "Qt Installer Framework"}, - "qtimageformats": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtimageformats": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtkeychain": {"version": "0.9.1", "website": "https://github.com/frankosterfeld/qtkeychain", "description": "QtKeychain"}, - "qtlocation": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtmultimedia": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtnetworkauth": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtlocation": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtmultimedia": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtnetworkauth": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtofficeopenxml": {"version": "02dda4a", "website": "https://github.com/dbzhang800/QtOfficeOpenXml/", "description": "QtOfficeOpenXml"}, - "qtpurchasing": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtquickcontrols": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtquickcontrols2": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtremoteobjects": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtscript": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtscxml": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtsensors": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtserialbus": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtserialport": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtpurchasing": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtquickcontrols": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtquickcontrols2": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtremoteobjects": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtscript": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtscxml": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtsensors": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtserialbus": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtserialport": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtserialport_qt4": {"version": "5c3b6cc", "website": "https://www.qt.io/", "description": "Qt"}, "qtservice": {"version": "ee17851", "website": "https://qt.gitorious.org/qt-solutions/", "description": "Qt Solutions"}, "qtsparkle": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"}, "qtsparkle_qt4": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"}, - "qtspeech": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtsvg": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtspeech": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtsvg": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtsystems": {"version": "e3332ee", "website": "https://www.qt.io/", "description": "Qt"}, - "qttools": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qttranslations": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtvirtualkeyboard": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwebchannel": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qttools": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qttranslations": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtvirtualkeyboard": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebchannel": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtwebkit": {"version": "5.212", "website": "https://github.com/annulen/webkit", "description": "QtWebKit"}, - "qtwebsockets": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwebview": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwinextras": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebsockets": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebview": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwinextras": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "qtxlsxwriter": {"version": "ed26e5d", "website": "https://github.com/VSRonin/QtXlsxWriter/", "description": "QtXlsxWriter"}, - "qtxmlpatterns": {"version": "5.12.3", "website": "https://www.qt.io/", "description": "Qt"}, + "qtxmlpatterns": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, "quazip": {"version": "0.7.6", "website": "https://github.com/stachenov/quazip", "description": ""}, "qwt": {"version": "6.1.4", "website": "https://qwt.sourceforge.io/", "description": "Qwt"}, "qwtplot3d": {"version": "d80c908", "website": "https://github.com/sintegrial/qwtplot3d", "description": "QwtPlot3D"}, From 884669f1faa0bda893c22356229ba98beace0f97 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 18 Jun 2019 18:34:18 +0200 Subject: [PATCH 3/6] qt5: update to 5.13.0 --- src/qt3d.mk | 2 +- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 18 +++++++----- src/qtbase.mk | 6 ++-- src/qtcanvas3d.mk | 22 -------------- 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-1.patch | 59 ++++++++++++++++++++++++++++++++++++-- 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, 101 insertions(+), 66 deletions(-) delete mode 100644 src/qtcanvas3d.mk diff --git a/src/qt3d.mk b/src/qt3d.mk index 6c8ae8ee..a51bcd7f 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 := cfad2e16f40fa07f8be59fa29c0c246743ee67db417ca29772a92f36fa322af3 +$(PKG)_CHECKSUM := 9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f $(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 780a6668..027f0de3 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 := d3c78e6c2a75b9d4f9685d4eea6e84f44f97034a54aed7a159c53cfd4ec4eac7 +$(PKG)_CHECKSUM := 7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323 $(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 6f4bf160..a43e70f4 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 15145baa429524cf5d14f36c2b96f9e10b52838f Mon Sep 17 00:00:00 2001 +From 86164c585b85559746c0eb80a7354a01d311bf64 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 @@ -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 c729892889..8961199089 100644 +index 705e0a3c93..1adac54d3b 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -291,6 +291,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -23,6 +23,10 @@ index c729892889..8961199089 100644 + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +!!ELSE !!IF !isEmpty(CMAKE_STATIC_TYPE) + if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +@@ -328,9 +331,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") -!!ELSE @@ -35,7 +39,7 @@ index c729892889..8961199089 100644 2.20.1 -From 26458bce67f672e8c2f6eef3cd7adf3a9b88ee86 Mon Sep 17 00:00:00 2001 +From 2bdf75033a353d809d6faf2af33cf0af1d1282ff 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 @@ -104,7 +108,7 @@ index 51b5bde67a..faba17aedd 100644 2.20.1 -From 02bb523901a33b66cc0e625cef56ef573b2a01d8 Mon Sep 17 00:00:00 2001 +From 04a80b8d9d5ec64efb61f440238113a82015e7df 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 @@ -112,7 +116,7 @@ Subject: [PATCH 3/4] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index c51e3ceee3..966b0170ba 100644 +index 6280b4dfa2..e094ee12e6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -303,7 +303,8 @@ @@ -129,7 +133,7 @@ index c51e3ceee3..966b0170ba 100644 2.20.1 -From 71c816bca64e9169ce6860df3bd8216faf1d0355 Mon Sep 17 00:00:00 2001 +From ba796f23ed3145a856c6a05abee5d526c3b10d58 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 Subject: [PATCH 4/4] disable qt_random_cpu for i686-w64-mingw32 diff --git a/src/qtbase.mk b/src/qtbase.mk index 78b52795..a9b43867 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.12.4 -$(PKG)_CHECKSUM := 20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195 +$(PKG)_VERSION := 5.13.0 +$(PKG)_CHECKSUM := ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe $(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.12/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := https://download.qt.io/official_releases/qt/5.13/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib $(PKG)_DEPS_$(BUILD) := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk deleted file mode 100644 index 2cba4974..00000000 --- a/src/qtcanvas3d.mk +++ /dev/null @@ -1,22 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - -PKG := qtcanvas3d -$(PKG)_WEBSITE := https://www.qt.io/ -$(PKG)_DESCR := Qt -$(PKG)_IGNORE := -$(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d7e0e8aa542d077a929fb7700411ca9de1f65ae4748d64168d2e7533facd7869 -$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) -$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) -$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) -$(PKG)_DEPS := cc qtbase qtdeclarative - -define $(PKG)_UPDATE - echo $(qtbase_VERSION) -endef - -define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install -endef diff --git a/src/qtcharts.mk b/src/qtcharts.mk index 075a0de6..bc514d5c 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 := 06ff68a80dc377847429cdd87d4e46465e1d6fbc417d52700a0a59d197669c9e +$(PKG)_CHECKSUM := 04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27 $(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 9863d96d..03eac624 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 := 749d05242b9fae12e80f569fb6b918dc011cb191eeb05147cbde474ca6b173ef +$(PKG)_CHECKSUM := 64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053 $(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 5bc71804..fe3867d0 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 := 1c160eeb430c8602aaee8ae4faa55bc62f880dae642be5fd1ac019f7886eb15a +$(PKG)_CHECKSUM := 6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821 $(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 5576af8b..af1b0b0e 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 := 614105ed73079d67d81b34fef31c9934c5e751342e4b2e0297128c8c301acda7 +$(PKG)_CHECKSUM := b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9 $(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 77f60fc3..ed1d292d 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 := 25de6f10fb18f2484d1e569688bf33deb90ecbfb97ce41c2b5fb3521146e4c45 +$(PKG)_CHECKSUM := 6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63 $(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 215e1e52..e78a61f1 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 := 0bc38b168fa724411984525173d667aa47076c8cbd4eeb791d0da7fe4b9bdf73 +$(PKG)_CHECKSUM := 33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff $(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 b09629f9..dfc8ad19 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -1,13 +1,63 @@ This file is part of MXE. See LICENSE.md for licensing information. +From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001 +From: Joerg Bornemann +Date: Tue, 7 May 2019 11:30:05 +0200 +Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +This amends commit a33e3aea. + +Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 +Reviewed-by: Liang Qi +(cherry picked from commit 626c3053efd7905080ac4a65fca55551391a36e3) + +diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro +index 4641110..f509fa8 100644 +--- a/src/plugins/imageformats/mng/mng.pro ++++ b/src/plugins/imageformats/mng/mng.pro +@@ -5,8 +5,10 @@ SOURCES += main.cpp \ + qmnghandler.cpp + OTHER_FILES += mng.json + +-msvc: LIBS += libmng.lib +-else: LIBS += -lmng ++include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) ++QT_FOR_CONFIG += imageformats-private ++ ++QMAKE_USE_PRIVATE += mng + + PLUGIN_TYPE = imageformats + PLUGIN_CLASS_NAME = QMngPlugin +diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro +index 04cfbdb..0c42749 100644 +--- a/src/plugins/imageformats/tiff/tiff.pro ++++ b/src/plugins/imageformats/tiff/tiff.pro +@@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h + SOURCES += main.cpp qtiffhandler.cpp + OTHER_FILES += tiff.json + +-config_libtiff { +- unix|mingw: LIBS += -ltiff +- else:win32: LIBS += libtiff.lib ++include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) ++QT_FOR_CONFIG += imageformats-private ++ ++qtConfig(system-tiff) { ++ QMAKE_USE_PRIVATE += tiff + } else { + include($$PWD/../../../3rdparty/libtiff.pri) + } +-- +2.20.1 + + +From 9daaac5a219fb55628f0542e905d7157c2c68296 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 17 Jun 2019 13:54:23 +0200 -Subject: [PATCH 1/1] use pkgconfig +Subject: [PATCH 2/2] use pkgconfig diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json -index 1111111..2222222 100644 +index 03d59d3..0cd3715 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -51,9 +51,6 @@ @@ -65,3 +115,6 @@ index 1111111..2222222 100644 "-lwebp -lwebpdemux" ] } +-- +2.20.1 + diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index fd4f8334..b61e5c1f 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 := 2dee25c3eea90d172cbd40f41450153322b902da1daa7d2370a55124b2307bb3 +$(PKG)_CHECKSUM := 91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499 $(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 3877ca7c..9630898b 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 := 127b40bd7679fead3fb98f4c9c1d71dde9d6d416e90a6000129b61a5f128b3a0 +$(PKG)_CHECKSUM := 205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414 $(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 abcc7a29..f2018990 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 := 7c0759ab6fca2480b10b71a35beeffe0b847adeff5af94eacd1a4531d033423d +$(PKG)_CHECKSUM := 5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72 $(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 ba257c5f..dfd39f16 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 := e501eb46b8405a2b7db9fe90a1c224cf6676a07dc22c0662317ffe3dee1dbf55 +$(PKG)_CHECKSUM := 91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d $(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 d610043a..1dd66b11 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 := 7804a111043d0e8d6d81a0d0ae465ce2c36eca73f2774ccb5fa7be8670211672 +$(PKG)_CHECKSUM := 8aba72cf543f3ef26d128824f844487beea319fbd155931a8771afcf48cdeb7e $(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 38fa74d1..f7d82646 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 := 32d4c2505337c67b0bac26d7f565ec8fabdc616e61247e98674820769dda9858 +$(PKG)_CHECKSUM := a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167 $(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 b81fb37b..bc2c462c 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 := 9a447eed38bc8c7d7be7bc407317f58940377c077ddca74c9a641b1ee6200331 +$(PKG)_CHECKSUM := a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d $(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 00d0e08b..e84e23d3 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 := 54dd0c782abff90bf0608771c2e90b36073d9bd8d6c61706a2873bb7c317f413 +$(PKG)_CHECKSUM := 24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc $(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 769db4d8..51587bc5 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 := 7adb3fe77638c7a6f2a26bca850b0ff54f5fb7e5561d2e4141d14a84305c2b6a +$(PKG)_CHECKSUM := 2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80 $(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 dea40394..7642ff4b 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 := 696fb72a62018151275fe589fc80cb160d2becab9a3254321d40e2e11a0ad4f8 +$(PKG)_CHECKSUM := fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766 $(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 30672c83..4fc449a2 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 := 95873c7ea5960008d6eb41368ca64d68fbd05594ca8c2cd848b1612fc4aec0a9 +$(PKG)_CHECKSUM := 1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48 $(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 436003c9..e4aa04f1 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 := 69d56905f43ee13e670750e8f46d373835fae81d6343baa7c4004d2a2c6311fc +$(PKG)_CHECKSUM := 5ef8ce8d7dbdd4065e1a1e842d7effb7134ce262790fcd59076937f3b40b78f3 $(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 7f251a94..74915237 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 := bf487df8a9fb2eddf103842b57a75b17ef4c498ee40306ae9997017c82b0ad39 +$(PKG)_CHECKSUM := 2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985 $(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 2f7333b1..c1ea18b9 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 := 2ff9660fb3f5663c9161f491d1a304db62691720136ae22c145ef6a1c94b90ec +$(PKG)_CHECKSUM := 1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644 $(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 d98e45a4..92ea8e36 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 := 110812515a73c650e5ebc41305d9a243dadeb21f485aaed773e394dd84ce0d04 +$(PKG)_CHECKSUM := 0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf $(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 cbea9d7a..880b57ed 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 := 3b0e353860a9c0cd4db9eeae5f94fef8811ed7d107e3e5e97e4a557f61bd6eb6 +$(PKG)_CHECKSUM := a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819 $(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 cba62c58..1d30c2b7 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 := ab8dd55f5ca869cab51c3a6ce0888f854b96dc03c7f25d2bd3d2c50314ab60fb +$(PKG)_CHECKSUM := 2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28 $(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 4f7ae6a9..560d458a 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 := 33ac0356f916995fe5a91582e12b4c4f730c705808ea3c14e75c6e350e8131e6 +$(PKG)_CHECKSUM := 91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9 $(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 74b5ba92..e0f45be3 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 := ab571a1b699e61a86be1a6b8d6ffd998d431c4850cc27e9a21f81fa5923bfdb7 +$(PKG)_CHECKSUM := 7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a $(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 fc95c438..7fcadf21 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 := b471eda2f486d21c51fc3bc53bb8844022117e746d5f15c5eabb82cd37eb2abe +$(PKG)_CHECKSUM := f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34 $(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 d1965eb3..cc823d06 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 := 1f244c6b774dd9d03d3c5cafe877381900b50a2775cef6487c8bb66e32ab5a5d +$(PKG)_CHECKSUM := 090da2f41b3ea40e73d3a7d7d873492bb911a3492376bb44daee917b459535a9 $(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 381068fa..0c39979c 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 := f6e0172582a499d5e50c51877552d1a3bff66546d9a02e5754100a51b192973f +$(PKG)_CHECKSUM := 096387a674f7fa1faeda856b87e965bd2937e3dcce334f10df694468003887d4 $(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 a5b30719..3954387d 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 := 0bea1719bb948f65cbed4375cc3e997a6464f35d25b631bafbd7a3161f8f5666 +$(PKG)_CHECKSUM := 75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) From a7204c94acd4171b76d0c461cfbcaf960cce1c55 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 19 Jun 2019 09:03:20 +0000 Subject: [PATCH 4/6] Update packages.json & build-matrix.html --- docs/build-matrix.html | 84 +++++++++++++++++++----------------------- docs/packages.json | 67 +++++++++++++++++---------------- 2 files changed, 70 insertions(+), 81 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 9c7e431b..c73619e9 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -3559,7 +3559,7 @@ feel free to submit a pull request. qt3d - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3569,7 +3569,7 @@ feel free to submit a pull request. qt5 [meta-pkg] - 5.12.4 + 5.13.0 • • • @@ -3579,7 +3579,7 @@ feel free to submit a pull request. qtactiveqt - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3589,7 +3589,7 @@ feel free to submit a pull request. qtbase - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3597,19 +3597,9 @@ feel free to submit a pull request. ✓ - - qtcanvas3d - 5.12.4 - ✓ - ✓ - ✓ - ✓ - - - qtcharts - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3619,7 +3609,7 @@ feel free to submit a pull request. qtconnectivity - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3629,7 +3619,7 @@ feel free to submit a pull request. qtdatavis3d - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3639,7 +3629,7 @@ feel free to submit a pull request. qtdeclarative - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3649,7 +3639,7 @@ feel free to submit a pull request. qtgamepad - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3659,7 +3649,7 @@ feel free to submit a pull request. qtgraphicaleffects - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3679,7 +3669,7 @@ feel free to submit a pull request. qtimageformats - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3699,7 +3689,7 @@ feel free to submit a pull request. qtlocation - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3709,7 +3699,7 @@ feel free to submit a pull request. qtmultimedia - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3719,7 +3709,7 @@ feel free to submit a pull request. qtnetworkauth - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3739,7 +3729,7 @@ feel free to submit a pull request. qtpurchasing - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3749,7 +3739,7 @@ feel free to submit a pull request. qtquickcontrols - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3759,7 +3749,7 @@ feel free to submit a pull request. qtquickcontrols2 - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3769,7 +3759,7 @@ feel free to submit a pull request. qtremoteobjects - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3779,7 +3769,7 @@ feel free to submit a pull request. qtscript - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3789,7 +3779,7 @@ feel free to submit a pull request. qtscxml - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3799,7 +3789,7 @@ feel free to submit a pull request. qtsensors - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3809,7 +3799,7 @@ feel free to submit a pull request. qtserialbus - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3819,7 +3809,7 @@ feel free to submit a pull request. qtserialport - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3869,7 +3859,7 @@ feel free to submit a pull request. qtspeech - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3879,7 +3869,7 @@ feel free to submit a pull request. qtsvg - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3899,7 +3889,7 @@ feel free to submit a pull request. qttools - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3909,7 +3899,7 @@ feel free to submit a pull request. qttranslations - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3919,7 +3909,7 @@ feel free to submit a pull request. qtvirtualkeyboard - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3929,7 +3919,7 @@ feel free to submit a pull request. qtwebchannel - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3949,7 +3939,7 @@ feel free to submit a pull request. qtwebsockets - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3959,7 +3949,7 @@ feel free to submit a pull request. qtwebview - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3969,7 +3959,7 @@ feel free to submit a pull request. qtwinextras - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -3989,7 +3979,7 @@ feel free to submit a pull request. qtxmlpatterns - 5.12.4 + 5.13.0 ✓ ✓ ✓ @@ -4869,14 +4859,14 @@ feel free to submit a pull request. -Total: 468 +Total: 467
(+7 virtual +8 native-only) -463 -397 -449 +462 396 +448 +395 42 diff --git a/docs/packages.json b/docs/packages.json index 18b907a6..91fc0259 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -351,50 +351,49 @@ "qjson": {"version": "0.9.0", "website": "https://qjson.sourceforge.io/", "description": "QJson"}, "qscintilla2": {"version": "2.11.1", "website": "https://www.riverbankcomputing.com/software/qscintilla/intro", "description": "QScintilla2"}, "qt": {"version": "4.8.7", "website": "https://www.qt.io/", "description": "Qt"}, - "qt3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qt5": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtactiveqt": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtbase": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtcanvas3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtcharts": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtconnectivity": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtdatavis3d": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtdeclarative": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtgamepad": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtgraphicaleffects": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qt3d": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qt5": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtactiveqt": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtbase": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtcharts": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtconnectivity": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtdatavis3d": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtdeclarative": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtgamepad": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtgraphicaleffects": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtifw": {"version": "3.0.4", "website": "https://doc.qt.io/qtinstallerframework/index.html", "description": "Qt Installer Framework"}, - "qtimageformats": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtimageformats": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtkeychain": {"version": "0.9.1", "website": "https://github.com/frankosterfeld/qtkeychain", "description": "QtKeychain"}, - "qtlocation": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtmultimedia": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtnetworkauth": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtlocation": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtmultimedia": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtnetworkauth": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtofficeopenxml": {"version": "02dda4a", "website": "https://github.com/dbzhang800/QtOfficeOpenXml/", "description": "QtOfficeOpenXml"}, - "qtpurchasing": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtquickcontrols": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtquickcontrols2": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtremoteobjects": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtscript": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtscxml": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtsensors": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtserialbus": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtserialport": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtpurchasing": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtquickcontrols": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtquickcontrols2": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtremoteobjects": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtscript": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtscxml": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtsensors": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtserialbus": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtserialport": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtserialport_qt4": {"version": "5c3b6cc", "website": "https://www.qt.io/", "description": "Qt"}, "qtservice": {"version": "ee17851", "website": "https://qt.gitorious.org/qt-solutions/", "description": "Qt Solutions"}, "qtsparkle": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"}, "qtsparkle_qt4": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"}, - "qtspeech": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtsvg": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtspeech": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtsvg": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtsystems": {"version": "e3332ee", "website": "https://www.qt.io/", "description": "Qt"}, - "qttools": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qttranslations": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtvirtualkeyboard": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwebchannel": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qttools": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qttranslations": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtvirtualkeyboard": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebchannel": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtwebkit": {"version": "5.212", "website": "https://github.com/annulen/webkit", "description": "QtWebKit"}, - "qtwebsockets": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwebview": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, - "qtwinextras": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebsockets": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwebview": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, + "qtwinextras": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "qtxlsxwriter": {"version": "ed26e5d", "website": "https://github.com/VSRonin/QtXlsxWriter/", "description": "QtXlsxWriter"}, - "qtxmlpatterns": {"version": "5.12.4", "website": "https://www.qt.io/", "description": "Qt"}, + "qtxmlpatterns": {"version": "5.13.0", "website": "https://www.qt.io/", "description": "Qt"}, "quazip": {"version": "0.7.6", "website": "https://github.com/stachenov/quazip", "description": ""}, "qwt": {"version": "6.1.4", "website": "https://qwt.sourceforge.io/", "description": "Qwt"}, "qwtplot3d": {"version": "d80c908", "website": "https://github.com/sintegrial/qwtplot3d", "description": "QwtPlot3D"}, From d5d3207a72554c49c9e1b0b474b75ef27637b671 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 21 Jun 2019 23:29:43 +0200 Subject: [PATCH 5/6] update: expat, libssh2 --- src/expat.mk | 4 +-- src/libssh2-1-fixes.patch | 59 --------------------------------------- src/libssh2.mk | 4 +-- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 src/libssh2-1-fixes.patch diff --git a/src/expat.mk b/src/expat.mk index 7ba6ffee..aba76706 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -4,8 +4,8 @@ PKG := expat $(PKG)_WEBSITE := https://github.com/libexpat/libexpat $(PKG)_DESCR := Expat XML Parser $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.6 -$(PKG)_CHECKSUM := 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 +$(PKG)_VERSION := 2.2.7 +$(PKG)_CHECKSUM := cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18 $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) $(PKG)_FILE := expat-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch deleted file mode 100644 index e798778f..00000000 --- a/src/libssh2-1-fixes.patch +++ /dev/null @@ -1,59 +0,0 @@ -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: Sun, 2 Sep 2012 00:55:28 +0200 -Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking - (mxe-specific) - -Git rid of the extra -lgcrypt here since we have to pass the -whole list via LIBS. Otherwise, LIBS gets simplified with --lgcrypt appearing only after its static dependencies. - -diff --git a/acinclude.m4 b/acinclude.m4 -index 1111111..2222222 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - if test "$ac_cv_libgcrypt" = "yes"; then - AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt]) - LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face. -- LIBS="$LIBS -lgcrypt" - found_crypto=libgcrypt - else - # restore - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Mon, 7 Nov 2016 10:47:13 +0100 -Subject: [PATCH 2/2] fix yes/no in lib path - - -diff --git a/acinclude.m4 b/acinclude.m4 -index 1111111..2222222 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_mbedtls/lib" -- CFLAGS="$CFLAGS -I$use_mbedtls/include" -- fi - - AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [ - #include -@@ -412,10 +408,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -- fi - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ - #include - ]) diff --git a/src/libssh2.mk b/src/libssh2.mk index 79d4f518..8e19cf62 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -3,8 +3,8 @@ PKG := libssh2 $(PKG)_WEBSITE := https://libssh2.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.2 -$(PKG)_CHECKSUM := 088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67 +$(PKG)_VERSION := 1.9.0 +$(PKG)_CHECKSUM := d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://libssh2.org/download/$($(PKG)_FILE) From 883e06b387cde2d4d83a7ee134690233b0331aad Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 21 Jun 2019 21:31:56 +0000 Subject: [PATCH 6/6] Update packages.json & build-matrix.html --- docs/build-matrix.html | 4 ++-- docs/packages.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index c73619e9..ff9d38cf 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -579,7 +579,7 @@ feel free to submit a pull request. expat - 2.2.6 + 2.2.7 ✓ ✓ ✓ @@ -2439,7 +2439,7 @@ feel free to submit a pull request. libssh2 - 1.8.2 + 1.9.0 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index 91fc0259..74865e55 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -53,7 +53,7 @@ "dlfcn-win32": {"version": "11ff86b", "website": "https://github.com/dlfcn-win32/dlfcn-win32", "description": "POSIX dlfcn wrapper for Windows"}, "eigen": {"version": "3.3.7", "website": "https://eigen.tuxfamily.org/", "description": ""}, "exiv2": {"version": "0.25", "website": "https://www.exiv2.org/", "description": "Exiv2"}, - "expat": {"version": "2.2.6", "website": "https://github.com/libexpat/libexpat", "description": "Expat XML Parser"}, + "expat": {"version": "2.2.7", "website": "https://github.com/libexpat/libexpat", "description": "Expat XML Parser"}, "faad2": {"version": "2.8.8", "website": "https://www.audiocoding.com/", "description": ""}, "fdk-aac": {"version": "2.0.0", "website": "https://github.com/mstorsjo/fdk-aac", "description": "FDK-AAC"}, "ffmpeg": {"version": "4.1.3", "website": "https://ffmpeg.org/", "description": ""}, @@ -239,7 +239,7 @@ "libspatialindex": {"version": "1.8.5", "website": "https://libspatialindex.github.io/", "description": "libspatialindex"}, "libspectre": {"version": "0.2.8", "website": "https://libspectre.freedesktop.org/", "description": ""}, "libssh": {"version": "0.7.5", "website": "https://www.libssh.org", "description": "SSHv2 and SSHv1 protocol on client and server side"}, - "libssh2": {"version": "1.8.2", "website": "https://libssh2.org/", "description": ""}, + "libssh2": {"version": "1.9.0", "website": "https://libssh2.org/", "description": ""}, "libsvm": {"version": "3.22", "website": "https://www.csie.ntu.edu.tw/~cjlin/libsvm", "description": ""}, "libtool": {"version": "2.4.4", "website": "https://www.gnu.org/software/libtool/", "description": "GNU Libtool"}, "libtorrent-rasterbar": {"version": "1.1.6", "website": "https://www.libtorrent.org/", "description": ""},