Mercurial > mxe-octave
changeset 5250:db6f82a0f476
Qt5: Update to 5.14.0
* src/qtbase-1-fixes.patch, src/qtimageformats-1.patch: update patch
* src/qtbase.mk: update version/checksum
* src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk,
src/qttranslations.mk: update checksum
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Wed, 01 Jan 2020 09:06:13 -0500 |
| parents | 62145fea69cc |
| children | c9157c501ddd |
| 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, 19 insertions(+), 175 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Wed Jan 01 08:07:07 2020 -0500 +++ b/src/qtbase-1-fixes.patch Wed Jan 01 09:06:13 2020 -0500 @@ -1,9 +1,9 @@ This file is part of MXE. See LICENSE.md for licensing information. -From bb59f5ad55cf935a20cb5406c020293a3ae91281 Mon Sep 17 00:00:00 2001 +From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 1/4] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -12,10 +12,10 @@ See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index f4a34d6e48..f9e2987564 100644 +index 364c23e750..c90dd302cf 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -327,6 +327,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,7 +25,7 @@ !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -364,9 +367,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -38,131 +38,6 @@ -- 2.20.1 - -From b3d2613f24be55ee494646a0b84074a3308de264 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 - -See: https://codereview.qt-project.org/#/c/165394/ - https://bugreports.qt.io/browse/QTBUG-30898 - -Currently, *.pc files are generated with debug suffix `d` in `-release` -mode and without the suffix in `-debug` or `-debug-and-release`. This -can be worked around by `CONIFG-=debug_and_release`, however, a more -predictable and consistent naming approach would be preferable. - -This change mimics the *.prl file and lib conventions: - - -release: creates normal *.pc files and lib names - -release -force-debug-info: normal as above - -debug: creates *d.pc and *d lib names - -debug-and-release: creates both - -default: creates both (default link: debug) - -and should be unsurprising to users of `pkg-config`. At very least, -it's deterministic and easily incorporated into build systems. - -Task-number: 30898 -Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 46687f262e..4b2980a1a8 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -268,6 +268,10 @@ load(qt_installs) - - load(qt_targets) - -+# Set TARGET towards the end but before pkgconfig setup to keep naming -+# conventions consistent with *prl files -+TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) -+ - # this builds on top of qt_common - !internal_module:if(unix|mingw) { - CONFIG += create_pc -@@ -283,12 +287,12 @@ load(qt_targets) - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME - } -- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") -- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) -+ QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") -+ QMAKE_PKGCONFIG_FILE = $$TARGET - for(i, MODULE_DEPENDS): \ -- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0)) -+ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix() - isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ -- QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module -+ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module - !isEmpty(lib_replace0.match) { - pclib_replace0.match = $$lib_replace0.match - pclib_replace0.replace = $$QMAKE_PKGCONFIG_LIBDIR/ -@@ -334,5 +338,3 @@ win32 { - # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API - DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 - } -- --TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end --- -2.20.1 - - -From 109719a9699166747203bef1d2516c9ace183125 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 11 Jun 2017 00:27:41 +0200 -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 6280b4dfa2..e094ee12e6 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -303,7 +303,8 @@ - }, - "headers": "harfbuzz/hb.h", - "sources": [ -- "-lharfbuzz" -+ { "type": "pkgConfig", "args": "harfbuzz" }, -+ "-lharfbuzz" - ] - }, - "imf": { --- -2.20.1 - - -From 3e4cc37443c0269e0b0be655c670926e7198c135 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 31 Oct 2019 22:35:28 +0100 -Subject: [PATCH 4/4] Revert "configure: Do use pkg-config --libs for static - libs" - -This change broke dbus detection in MXE. Smells fishy too. - -This reverts commit a1ea49878927dfe267416c795b50f3d5bdfa0b84. - -Change-Id: I66e4fe1e7a4d53c19f0d5dadf1e041565467f270 - -diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 81110e9f6d..9be4fb6f1f 100644 ---- a/mkspecs/features/qt_configure.prf -+++ b/mkspecs/features/qt_configure.prf -@@ -825,7 +825,9 @@ defineTest(qtConfLibrary_pkgConfig) { - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") { -- qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false) -+ qtRunLoggedCommand("$$pkg_config --static --libs-only-L $$args", libpaths)|return(false) -+ qtRunLoggedCommand("$$pkg_config --static --libs-only-l $$args", libs)|return(false) -+ eval(libs = $$libpaths $$libs) - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - } --- -2.20.1 - diff -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 +++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400
--- a/src/qtbase.mk Wed Jan 01 08:07:07 2020 -0500 +++ b/src/qtbase.mk Wed Jan 01 09:06:13 2020 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.13.2 -$(PKG)_CHECKSUM := 3e073387a08599641a154de758f729d47db8986f +$(PKG)_VERSION := 5.14.0 +$(PKG)_CHECKSUM := bd1b54cb5cc38bea4a84e18ac1e304b2a8f7fd55 $(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 Jan 01 08:07:07 2020 -0500 +++ b/src/qtimageformats-1.patch Wed Jan 01 09:06:13 2020 -0500 @@ -10,58 +10,27 @@ index 1111111..2222222 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json -@@ -51,9 +51,6 @@ - "stdio.h", - "libmng.h" - ], -- "qmake": [ -- "LIBS += -lmng" -- ], - "main": [ - "mng_handle hMNG;", - "mng_cleanup(&hMNG);", -@@ -67,6 +64,7 @@ - } +@@ -55,6 +55,7 @@ + ] }, "sources": [ + { "type": "pkgConfig", "args": "libmng" }, "-lmng" ] }, -@@ -77,10 +75,6 @@ - "type": "compile", - "test": { - "include": "tiffio.h", -- "qmake": [ -- "unix|mingw: LIBS += -ltiff", -- "else:win32: LIBS += libtiff.lib" -- ], - "main": [ - "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)", - "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG", -@@ -105,6 +99,7 @@ - } +@@ -82,6 +83,7 @@ + ] }, "sources": [ + { "type": "pkgConfig", "args": "libtiff-4" }, "-ltiff" ] }, -@@ -119,9 +114,6 @@ - "webp/encode.h", - "webp/demux.h" - ], -- "qmake": [ -- "LIBS += -lwebp -lwebpdemux" -- ], - "main": [ - "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)", - "#error \"Incompatible libwebp version\"", -@@ -144,6 +136,7 @@ - } +@@ -112,6 +114,7 @@ + ] }, "sources": [ -+ { "type": "pkgConfig", "args": "libwebp libwebpdemux" }, - "-lwebp -lwebpdemux" ++ { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" }, + "-lwebp -lwebpdemux -lwebpmux" ] }
--- a/src/qtimageformats.mk Wed Jan 01 08:07:07 2020 -0500 +++ b/src/qtimageformats.mk Wed Jan 01 09:06:13 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b287e23ee6fa83fcb06c2934f3bf365fb1132ffd +$(PKG)_CHECKSUM := bfcc484e606a5a520c9f0d4f65e6e29925a303e2 $(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 Jan 01 08:07:07 2020 -0500 +++ b/src/qtsvg.mk Wed Jan 01 09:06:13 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ddb5b96b720fdab3597bd1dcd8f3f4d14f974c8e +$(PKG)_CHECKSUM := 8f8acf97605c66935aa3cf26cea008ed565badc4 $(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 Jan 01 08:07:07 2020 -0500 +++ b/src/qttools.mk Wed Jan 01 09:06:13 2020 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6c777d3d9ef1623d45659c8b3fc2d3d5f6f4df48 +$(PKG)_CHECKSUM := 99a5352fd3b6eb7ad68742010aef96f99721238b $(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 Wed Jan 01 08:07:07 2020 -0500 +++ b/src/qttranslations.mk Wed Jan 01 09:06:13 2020 -0500 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ae41bbfbb3c684480cc288bb25d9e55a30ccfa28 +$(PKG)_CHECKSUM := 8df8add411294140eab6056c41be14c258bca98d $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))