Mercurial > mxe-octave
changeset 4900:22937c7fe60d
Update QT5 5.12.0
* src/qtbase-1-fixes.patch: update patch
* src/qtbase.mk: update version, checksum
* src/qtimageformats-1.patch: update patch
* src/qtimageformats.mk: update checksum
* src/qtsvg.mk: update checksum
* src/qttools.mk: update checksum
| author | John Donoghue |
|---|---|
| date | Fri, 14 Dec 2018 08:25:27 -0500 |
| parents | 3a4b30ff1446 |
| children | a49c45403df7 |
| files | src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats-1.patch src/qtimageformats.mk src/qtsvg.mk src/qttools.mk |
| diffstat | 6 files changed, 95 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qtbase-1-fixes.patch Fri Dec 14 08:25:27 2018 -0500 @@ -2,10 +2,10 @@ Contains ad hoc patches for cross building. -From 68d6fb331d75a6fc23be38861866da8c3fc6fd6d Mon Sep 17 00:00:00 2001 +From f1dbf592c625533c9f8a704e4d5f12f3111a1fb3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 1/6] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -14,7 +14,7 @@ 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 27f4c277d6..84ff9ae0ef 100644 +index 3ed6dd5889..cc5bc9dc16 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}) @@ -34,13 +34,13 @@ add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.17.1 +2.19.1 -From 1d10513c2b03761addf96010ce9da8dd93d714fb Mon Sep 17 00:00:00 2001 +From b822f7ff799d10297b0b36408e7cfa44fd416118 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/6] Fix pkgconfig file and library naming +Subject: [PATCH 2/5] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 @@ -65,10 +65,10 @@ Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index f8729de947..e7f6e3651d 100644 +index 51b5bde67a..faba17aedd 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -264,6 +264,10 @@ load(qt_installs) +@@ -263,6 +263,10 @@ load(qt_installs) load(qt_targets) @@ -77,12 +77,12 @@ +TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) + # this builds on top of qt_common - !internal_module:!lib_bundle:if(unix|mingw) { + !internal_module:if(unix|mingw) { CONFIG += create_pc -@@ -274,12 +278,12 @@ load(qt_targets) - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME +@@ -278,12 +282,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 ") @@ -96,28 +96,28 @@ pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -313,5 +317,3 @@ win32 { +@@ -317,5 +321,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.17.1 +2.19.1 -From 31c615cd57701f2e4b99bb7fcdd023565a081257 Mon Sep 17 00:00:00 2001 +From 7773e45dfdd82ede2415a6818332de3e36e7c824 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific) +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 219385a108..eee90b5b20 100644 +index 0332631ec8..e2d87e77b3 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -973,7 +973,7 @@ +@@ -1003,7 +1003,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", @@ -144,45 +144,21 @@ m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif -- -2.17.1 +2.19.1 -From f881ea1a1010939a4fe7c2c74f01d3e54d2c7c96 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 29 Jan 2017 16:22:03 +0100 -Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS - -Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0 - -diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri -index b69b51b679..d37423adbd 100644 ---- a/src/plugins/sqldrivers/configure.pri -+++ b/src/plugins/sqldrivers/configure.pri -@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) { - libs += "-L$${sybase}/lib" - libs += $$getenv(SYBASE_LIBS) - !isEmpty(libs) { -- $${1}.libs = "$$val_escape(libs)" -+ $${1}.libs = $$libs - export($${1}.libs) - } - return(true) --- -2.17.1 - - -From 9e31811ee08a69d21f19dc7a0a86581c2d71a8c1 Mon Sep 17 00:00:00 2001 +From 82d08b0378db0a30007ca5ee965ffa034859af5c Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 5/6] use pkg-config for harfbuzz +Subject: [PATCH 4/5] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index eee90b5b20..6c6745b1dd 100644 +index e2d87e77b3..4eb37aea17 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -215,7 +215,8 @@ +@@ -224,7 +224,8 @@ ] }, "sources": [ @@ -193,13 +169,13 @@ }, "imf": { -- -2.17.1 +2.19.1 -From c3de4dbd709d1f8c33d46ed12506444685e3db0e Mon Sep 17 00:00:00 2001 +From 8ea9633854e8c2ad94df00866a9b9e3a4394d161 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 6/6] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 5/5] 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)': @@ -217,7 +193,7 @@ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index ebf9864b15..9a31933975 100644 +index 23e5e499b2..d0b3159c0d 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -230,7 +206,7 @@ # ifdef Q_PROCESSOR_X86_64 -- -2.17.1 +2.19.1 diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400
--- a/src/qtbase.mk Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qtbase.mk Fri Dec 14 08:25:27 2018 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.11.2 -$(PKG)_CHECKSUM := 6f337bdf04fd988f2da4d0fbce431a82224b1c4e +$(PKG)_VERSION := 5.12.0 +$(PKG)_CHECKSUM := 67ea0cdbe65d9406dcef36b3a6899cb17c812678 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats-1.patch Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qtimageformats-1.patch Fri Dec 14 08:25:27 2018 -0500 @@ -1,14 +1,13 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 1/2] add pkg-config support for libtiff-4 +Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4 -Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro -index f7ac4c1..bd2c6b0 100644 +index 1111111..2222222 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp @@ -21,10 +20,10 @@ +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 0f841ab..fa22141 100644 +index 1111111..2222222 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro -@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp +@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp OTHER_FILES += tiff.json config_libtiff { @@ -35,19 +34,15 @@ else:win32: LIBS += libtiff.lib } else { include($$PWD/../../../3rdparty/libtiff.pri) --- -1.8.4.5 - -From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 19 Dec 2012 23:29:52 +0100 -Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) +Subject: [PATCH 2/3] [MXE] pkg-config support for libmng -Change-Id: I1216f35a01a974321efa2463b687c121baa22667 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro -index adc096e..a20a0a0 100644 +index 1111111..2222222 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -2,5 +2,7 @@ SOURCES = libmng.cpp @@ -59,21 +54,58 @@ +packagesExist(libmng):PKGCONFIG += libmng +else:if(unix|win32-g++*): LIBS += -lmng else:win32: LIBS += libmng.lib -diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri -index 5c0fff1..00cd0b3 100644 ---- a/src/plugins/imageformats/mng/qmnghandler.pri -+++ b/src/plugins/imageformats/mng/qmnghandler.pri -@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD - HEADERS += $$PWD/qmnghandler_p.h - SOURCES += $$PWD/qmnghandler.cpp - config_libmng { -- unix|mingw: LIBS += -lmng +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 <mabrand@mabrand.nl> +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(libmng):PKGCONFIG += libmng -+ else:if(unix|win32-g++*): LIBS += -lmng - else:win32: LIBS += libmng.lib ++ 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/libmng.pri) --- -1.8.4.5 - + include($$PWD/../../../3rdparty/libwebp.pri)
--- a/src/qtimageformats.mk Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qtimageformats.mk Fri Dec 14 08:25:27 2018 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 68102f714565056bb5b19918d13789386764b38a +$(PKG)_CHECKSUM := 078f96837498528ba2a70c946e608786e902461c $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qtsvg.mk Fri Dec 14 08:25:27 2018 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 43462aeecef7f354211938262b2089aa0079a543 +$(PKG)_CHECKSUM := 74e571329b92e0371df9cfa349c3b91d7f65011b $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Wed Dec 12 08:22:38 2018 -0500 +++ b/src/qttools.mk Fri Dec 14 08:25:27 2018 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 33f2253d373a731dbe1e4403abefc960bbb875b2 +$(PKG)_CHECKSUM := 25b37861ebbf3102baaed3c341aefb01056aa123 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))