diff options
-rw-r--r-- | src/qtbase-1-fixes.patch | 112 |
1 files changed, 61 insertions, 51 deletions
diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index 5a4d750..7c4d99a 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -2,16 +2,16 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri -index 39280de..e152b0d 100644 +index 1111111..2222222 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { @@ -20,19 +20,16 @@ index 39280de..e152b0d 100644 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + win32:shared:LIBS_PRIVATE += -lfreetype } --- -2.7.4 - -From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 32edd6e..a7f2c28 100644 +index 1111111..2222222 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -42,7 +39,7 @@ index 32edd6e..a7f2c28 100644 +CONFIG += link_pkgconfig +PKGCONFIG += harfbuzz diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 7443368..c24e684 100644 +index 1111111..2222222 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { @@ -53,19 +50,16 @@ index 7443368..c24e684 100644 + CONFIG += link_pkgconfig + PKGCONFIG += harfbuzz } --- -2.7.4 - -From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/8] fix oci config test on windows +Subject: [PATCH] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro -index 3ffda1d..39b6f3759 100644 +index 1111111..2222222 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ @@ -73,19 +67,16 @@ index 3ffda1d..39b6f3759 100644 CONFIG -= qt dylib -LIBS += -lclntsh +!win32:LIBS += -lclntsh --- -2.7.4 - -From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index 43b55f0..de2c3ec 100755 +index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -4656,7 +4656,7 @@ fi @@ -97,19 +88,16 @@ index 43b55f0..de2c3ec 100755 # SYSV IPC is not supported - check POSIX IPC if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" --- -2.7.4 - -From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/8] fix building mysql driver under mingw +Subject: [PATCH] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri -index 3cfb614..8b7063f 100644 +index 1111111..2222222 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp @@ -121,14 +109,11 @@ index 3cfb614..8b7063f 100644 isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r --- -2.7.4 - -From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 6/8] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -137,7 +122,7 @@ Source: https://git.io/vzWJz 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 d2358ca..6b1dc95 100644 +index 1111111..2222222 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -157,14 +142,11 @@ index d2358ca..6b1dc95 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF --- -2.7.4 - -From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Thiago Macieira <thiago.macieira@intel.com> Date: Wed, 18 May 2016 14:40:20 -0700 -Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X +Subject: [PATCH] Fix linking of the minimal platform plugin on OS X platformsupport/fontdatabases/fontdatabases.pri disables all font databases except CoreText on OS X, so this is required for @@ -180,7 +162,7 @@ Reviewed-by: Jake Petroules <jake.petroules@qt.io> (cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea) diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro -index 0d31d66..bd6f2d8 100644 +index 1111111..2222222 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -11,6 +11,7 @@ HEADERS = qminimalintegration.h \ @@ -191,14 +173,11 @@ index 0d31d66..bd6f2d8 100644 PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin --- -2.7.4 - -From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek <tehnick-8@yandex.ru> Date: Sun, 19 Jun 2016 03:15:43 +0300 -Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows +Subject: [PATCH] Fix build of the minimal platform plugin for MS Windows when qtbase is configured with -fontconfig and -system-freetype. @@ -209,7 +188,7 @@ Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef (cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd) diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro -index bd6f2d8..4b63461 100644 +index 1111111..2222222 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -12,6 +12,7 @@ OTHER_FILES += minimal.json @@ -220,8 +199,6 @@ index bd6f2d8..4b63461 100644 PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin --- -2.7.4 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> @@ -254,7 +231,7 @@ diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 1111111..2222222 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -244,6 +244,10 @@ load(qt_installs) +@@ -242,6 +242,10 @@ load(qt_installs) load(qt_targets) @@ -265,7 +242,7 @@ index 1111111..2222222 100644 # this builds on top of qt_common !internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc -@@ -254,12 +258,12 @@ load(qt_targets) +@@ -252,12 +256,12 @@ load(qt_targets) QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME @@ -282,9 +259,42 @@ index 1111111..2222222 100644 pclib_replace.match = $$lib_replace.match !isEmpty(lib_replace.replace): \ pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -@@ -293,5 +297,3 @@ win32 { +@@ -291,5 +295,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 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ulf Hermann <ulf.hermann@qt.io> +Date: Wed, 24 Aug 2016 11:55:35 +0200 +Subject: [PATCH] QLocale: Fix wrong assert + +The endptr from reading the exponent of a 'g' form snprintf result +should not be past the end of the string we're reading from. It has +nothing to do with the 'e' sign. + +Task-number: QTBUG-54482 +Change-Id: I8bdee917b8d21fdc94c255548ad7e008431a07fa +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> + +See https://github.com/mxe/mxe/issues/1572 +Source: https://codereview.qt-project.org/#/c/168995 +Source: https://github.com/qt/qtbase/commit/de7f281d7ad1bc8e3dc5a54943 + +Remove this patch when updating to Qt 5.7.1. + +diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp +index 1111111..2222222 100644 +--- a/src/corelib/tools/qlocale_tools.cpp ++++ b/src/corelib/tools/qlocale_tools.cpp +@@ -224,7 +224,7 @@ void doubleToAscii(double d, QLocaleData::DoubleForm form, int precision, char * + const char *endptr; + decpt = qstrtoll(target.data() + eSign + 1, &endptr, 10, &ok) + 1; + Q_ASSERT(ok); +- Q_ASSERT(endptr - target.data() <= length - eSign -1); ++ Q_ASSERT(endptr - target.data() <= length); + } else { + // No 'e' found, so it's the 'f' form. Variants of snprintf generate numbers with + // potentially multiple digits before the '.', but without decimal exponent then. So we |