Mercurial > mxe-octave
changeset 5161:f0fb4aebfcd0
qt5: update to v5.13.1
* src/qtbase.mk: update version, checksum
* src/qtbase-1-fixes.patch: update patch
* src/qtimageformats.mk: update version, checksum
* src/qtimageformats-1.patch: update patch
* src/qtsvg.mk: update version, checksum
* src/qttools.mk: update version, checksum
* src/qttranslations.mk: update version, checksum
| author | John Donoghue |
|---|---|
| date | Fri, 06 Sep 2019 09:57:32 -0400 |
| parents | 70d28ef5d308 |
| children | d755e64f02f7 |
| files | src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats-1.patch src/qtimageformats.mk src/qtsvg.mk src/qttools.mk src/qttranslations.mk |
| diffstat | 7 files changed, 24 insertions(+), 77 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qtbase-1-fixes.patch Fri Sep 06 09:57:32 2019 -0400 @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 86164c585b85559746c0eb80a7354a01d311bf64 Mon Sep 17 00:00:00 2001 +From 2ff7d50d0f701915d810569d19e1413674aec79d 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/4] cmake: Rearrange STATIC vs INTERFACE targets @@ -12,10 +12,10 @@ 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 705e0a3c93..1adac54d3b 100644 +index d4fd057682..600c8273f1 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -291,6 +291,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -323,6 +323,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,7 +25,7 @@ !!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}) +@@ -360,9 +363,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -39,7 +39,7 @@ 2.20.1 -From 2bdf75033a353d809d6faf2af33cf0af1d1282ff Mon Sep 17 00:00:00 2001 +From 7c3a397e8cc07ac4dad174dc6a0f4e02834b1f72 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/4] Fix pkgconfig file and library naming @@ -67,10 +67,10 @@ Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 51b5bde67a..faba17aedd 100644 +index 46687f262e..4b2980a1a8 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -263,6 +263,10 @@ load(qt_installs) +@@ -268,6 +268,10 @@ load(qt_installs) load(qt_targets) @@ -81,7 +81,7 @@ # this builds on top of qt_common !internal_module:if(unix|mingw) { CONFIG += create_pc -@@ -278,12 +282,12 @@ load(qt_targets) +@@ -283,12 +287,12 @@ load(qt_targets) QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME } @@ -95,10 +95,10 @@ isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module + QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module - pclib_replace.match = $$lib_replace.match - !isEmpty(lib_replace.replace): \ - pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -317,5 +321,3 @@ win32 { + !isEmpty(lib_replace0.match) { + pclib_replace0.match = $$lib_replace0.match + pclib_replace0.replace = $$QMAKE_PKGCONFIG_LIBDIR/ +@@ -334,5 +338,3 @@ win32 { # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 } @@ -108,7 +108,7 @@ 2.20.1 -From 04a80b8d9d5ec64efb61f440238113a82015e7df Mon Sep 17 00:00:00 2001 +From a4fe5af173b82d95c741df30d151576b2bc4e0b7 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 3/4] use pkg-config for harfbuzz @@ -133,7 +133,7 @@ 2.20.1 -From ba796f23ed3145a856c6a05abee5d526c3b10d58 Mon Sep 17 00:00:00 2001 +From 033d4a71054d41f48d38027f091edc76526b8911 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Nov 2017 11:28:47 +0200 Subject: [PATCH 4/4] disable qt_random_cpu for i686-w64-mingw32 @@ -154,7 +154,7 @@ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 90df8653a7..0d7002f2e8 100644 +index bf01b7ae2a..26bcaf0326 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
--- a/src/qtbase.mk Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qtbase.mk Fri Sep 06 09:57:32 2019 -0400 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.13.0 -$(PKG)_CHECKSUM := 68506e1d6a710f657fe9ddf4e8fec55ad845e81b +$(PKG)_VERSION := 5.13.1 +$(PKG)_CHECKSUM := 238b552da6a7fcf40de3eb9b39609b33783bd582 $(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 Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qtimageformats-1.patch Fri Sep 06 09:57:32 2019 -0400 @@ -1,63 +1,13 @@ This file is part of MXE. See LICENSE.md for licensing information. -From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann <joerg.bornemann@qt.io> -Date: Tue, 7 May 2019 11:30:05 +0200 -Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng - -This amends commit a33e3aea. - -Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 -Reviewed-by: Liang Qi <liang.qi@qt.io> -(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 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 17 Jun 2019 13:54:23 +0200 -Subject: [PATCH 2/2] use pkgconfig +Subject: [PATCH 1/1] use pkgconfig diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json -index 03d59d3..0cd3715 100644 +index 1111111..2222222 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -51,9 +51,6 @@ @@ -115,6 +65,3 @@ "-lwebp -lwebpdemux" ] } --- -2.20.1 -
--- a/src/qtimageformats.mk Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qtimageformats.mk Fri Sep 06 09:57:32 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := eb8b95f6223c5d3e6f0bcdfc936c93abf9bdeb61 +$(PKG)_CHECKSUM := 23e77f6cd7ed9289c1fbf2fc0a736213d011ee85 $(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 Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qtsvg.mk Fri Sep 06 09:57:32 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 65bdcfa07141fb44a35d32f8887a783d91ca059b +$(PKG)_CHECKSUM := 00a30ea9025df7e6ec27cfc44315be6c4392ced1 $(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 Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qttools.mk Fri Sep 06 09:57:32 2019 -0400 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9d6828bd991507e2390c6e2f23d69eac715fcca0 +$(PKG)_CHECKSUM := 0cb4fe2600364368e0d186fd25e5ab0a79cb99b1 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Fri Sep 06 07:55:43 2019 -0400 +++ b/src/qttranslations.mk Fri Sep 06 09:57:32 2019 -0400 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ab726c8311749191a7fcdef5aa317ee72779e983 +$(PKG)_CHECKSUM := 5bb33365a1c747cb0e532ede2254218cbb5eaf43 $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))