mxe-octave: src/qtbase-1-fixes.patch annotate

annotate src/qtbase-1-fixes.patch @ 5893:53a6c7df43f8

Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Thu, 16 Sep 2021 22:37:45 +0200
parents	38be0ef93ce3
children

rev	line source
4310 2c34ec679fb3 qt5: update to 5.7.1 John D parents: 4222 diff changeset	1 This file is part of MXE. See LICENSE.md for licensing information.
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	2
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	3 From 2c59523387b10937ff7d085bc34ec3df68805fea Mon Sep 17 00:00:00 2001
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	4 From: Ray Donnelly <mingw.android@gmail.com>
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	5 Date: Wed, 26 Aug 2015 12:45:43 +0100
5250 db6f82a0f476 Qt5: Update to 5.14.0 John Donoghue <john.donoghue@ieee.org> parents: 5199 diff changeset	6 Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	7
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	8 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	9 for header-only modules when building Qt5 statically.
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	10
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	11 Source: https://git.io/vzWJz
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	12 See also: https://github.com/mxe/mxe/issues/1185
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	13
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	14 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	15 index 309798a767..18156cac9e 100644
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	16 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	17 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	18 @@ -370,6 +370,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
4735 4cea16af20b4 qt5: update to v5.11.0, add support pcre2 John Donoghue parents: 4310 diff changeset	19 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	20 !!ENDIF
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	21
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	22 +!!IF equals(TEMPLATE, aux)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	23 + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	24 +!!ELSE
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	25 !!IF !isEmpty(CMAKE_STATIC_TYPE)
5099 9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	26 if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	27 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	28 @@ -411,9 +414,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	29 add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	30 set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	31 !!ENDIF
4735 4cea16af20b4 qt5: update to v5.11.0, add support pcre2 John Donoghue parents: 4310 diff changeset	32 -!!ELSE
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	33 -!!IF equals(TEMPLATE, aux)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	34 - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
4735 4cea16af20b4 qt5: update to v5.11.0, add support pcre2 John Donoghue parents: 4310 diff changeset	35 !!ELSE
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	36 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	37 !!ENDIF
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	38 --
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	39 2.25.1
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	40
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	41
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	42 From c3fa97702a080eb1a931fd1f41f7a1dd5b775523 Mon Sep 17 00:00:00 2001
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	43 From: Mark Brand <mabrand@mabrand.nl>
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	44 Date: Sun, 11 Jun 2017 00:27:41 +0200
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	45 Subject: [PATCH 2/2] use pkg-config for harfbuzz
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	46
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	47 Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	48
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	49 diff --git a/src/gui/configure.json b/src/gui/configure.json
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	50 index 5ebcdb99b5..2553cb5cf6 100644
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	51 --- a/src/gui/configure.json
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	52 +++ b/src/gui/configure.json
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	53 @@ -303,7 +303,8 @@
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	54 },
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	55 "headers": "harfbuzz/hb.h",
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	56 "sources": [
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	57 - "-lharfbuzz"
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	58 + { "type": "pkgConfig", "args": "harfbuzz" },
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	59 + "-lharfbuzz"
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	60 ]
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	61 },
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	62 "imf": {
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	63 --
19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	64 2.25.1
4222 44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc John D parents: diff changeset	65
5099 9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	66 diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp
5199 8a2080f70075 Update qt5 to 5.13.2 John Donoghue parents: 5161 diff changeset	67 --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400
8a2080f70075 Update qt5 to 5.13.2 John Donoghue parents: 5161 diff changeset	68 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400
5099 9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	69 @@ -162,7 +162,11 @@
5199 8a2080f70075 Update qt5 to 5.13.2 John Donoghue parents: 5161 diff changeset	70
5099 9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	71 if (!m_fontDatabase) {
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	72 #if QT_CONFIG(fontconfig)
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	73 +# ifdef Q_OS_WIN
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	74 + m_fontDatabase = new QFreeTypeFontDatabase;
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	75 +# else
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	76 m_fontDatabase = new QGenericUnixFontDatabase;
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	77 +# endif
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	78 #else
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	79 m_fontDatabase = QPlatformIntegration::fontDatabase();
9d35f8eb1e76 qt5: update to 5.13.0 John Donoghue parents: 4956 diff changeset	80 #endif
5586 19a6cd0f2f60 Restore Qt 5.15 for development John W. Eaton <jwe@octave.org> parents: 5583 diff changeset	81

Mercurial > mxe-octave

annotate src/qtbase-1-fixes.patch @ 5893:53a6c7df43f8