Mercurial > mxe-octave

diff src/qtbase-1-fixes.patch @ 5099:9d35f8eb1e76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to 5.13.0 * src/qttools.mk, src/qtbase.mk, src/qtsvg.mk src/qtimageformats.mk: update checksum, version * src/qtbase-1-fixes.patch, src/qtimageformats-1.patch, src/qttools-1.patch: update patch
author John Donoghue
date Fri, 21 Jun 2019 14:28:30 -0400
parents ddd66d48a646
children f0fb4aebfcd0
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch	Thu Jun 20 11:32:41 2019 -0400
+++ b/src/qtbase-1-fixes.patch	Fri Jun 21 14:28:30 2019 -0400
@@ -1,9 +1,9 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-From 01ee0b5260f1b83a81769132c0705aab05481641 Mon Sep 17 00:00:00 2001
+From 86164c585b85559746c0eb80a7354a01d311bf64 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/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,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 3ed6dd5889..cc5bc9dc16 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 @@
 +    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
@@ -32,13 +36,13 @@
      add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
  !!ENDIF
 -- 
-2.19.1
+2.20.1
 
 
-From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001
+From 2bdf75033a353d809d6faf2af33cf0af1d1282ff 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/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
@@ -101,62 +105,21 @@
 -
 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX)  # Do this towards the end
 -- 
-2.19.1
+2.20.1
 
 
-From 6a7989a069a7aa88e898c4f68bd753b480af0cdf 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/5] reenable fontconfig for win32 (MXE-specific)
-
-Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 89934c8f1d..456643a22c 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -1209,7 +1209,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 0c04608fca..a26e02fbf3 100644
---- a/src/plugins/platforms/minimal/qminimalintegration.cpp
-+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
-@@ -161,7 +161,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.19.1
-
-
-From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001
+From 04a80b8d9d5ec64efb61f440238113a82015e7df Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 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 456643a22c..f36e15603b 100644
+index 6280b4dfa2..e094ee12e6 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -301,7 +301,8 @@
+@@ -303,7 +303,8 @@
              },
              "headers": "harfbuzz/hb.h",
              "sources": [
@@ -167,13 +130,13 @@
          },
          "imf": {
 -- 
-2.19.1
+2.20.1
 
 
-From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001
+From ba796f23ed3145a856c6a05abee5d526c3b10d58 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 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)':
@@ -191,7 +154,7 @@
 Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 6195c324e7..94902bcfc2 100644
+index 90df8653a7..0d7002f2e8 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
@@ -204,7 +167,7 @@
  
  #  ifdef Q_PROCESSOR_X86_64
 -- 
-2.19.1
+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
@@ -218,3 +181,18 @@
  QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
  QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
  QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
+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
+--- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp	2019-06-21 13:24:11.167038403 -0400
++++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp	2019-06-21 13:31:33.734199370 -0400
+@@ -162,7 +162,11 @@
+ 
+         if (!m_fontDatabase) {
+ #if QT_CONFIG(fontconfig)
++#  ifdef Q_OS_WIN
++            m_fontDatabase = new QFreeTypeFontDatabase;
++#  else
+             m_fontDatabase = new QGenericUnixFontDatabase;
++#  endif
+ #else
+             m_fontDatabase = QPlatformIntegration::fontDatabase();
+ #endif