Mercurial > mxe-octave

comparison src/qtbase-1-fixes.patch @ 4310:2c34ec679fb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to 5.7.1 * src/qtbase-1-fixes.patch: update patch from mxe.cc * src/qtbase.mk: update version, checksum, use -no-pch * src/qtimageformats-1.patch: update patch from mxe.cc * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools.mk: update checksum
author John D
date Sun, 01 Jan 2017 08:00:17 -0500
parents 44b1a9b2193e
children 4cea16af20b4
comparison
equal deleted inserted replaced
4309:7384a91ed38a 4310:2c34ec679fb3
1 This file is part of MXE. 1 This file is part of MXE. See LICENSE.md for licensing information.
2 See index.html for further information. 2
3 3 From 62efa18a61560a7757acffbd4ac6ca7b153155cc Mon Sep 17 00:00:00 2001
4 Contains ad hoc patches for cross building.
5
6 From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001
7 From: Mark Brand <mabrand@mabrand.nl> 4 From: Mark Brand <mabrand@mabrand.nl>
8 Date: Thu, 6 Aug 2015 23:35:08 +0200 5 Date: Thu, 6 Aug 2015 23:35:08 +0200
9 Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE 6 Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
10 specific) 7 specific)
11 8
20 # pull in the proper freetype2 include directory 17 # pull in the proper freetype2 include directory
21 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) 18 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
22 + win32:shared:LIBS_PRIVATE += -lfreetype 19 + win32:shared:LIBS_PRIVATE += -lfreetype
23 } 20 }
24 -- 21 --
25 2.7.4 22 2.9.3
26 23
27 24
28 From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 25 From 5a15e0374758b7786204d98b66f49b4fd3daea79 Mon Sep 17 00:00:00 2001
29 From: Mark Brand <mabrand@mabrand.nl> 26 From: Mark Brand <mabrand@mabrand.nl>
30 Date: Sat, 21 Jun 2014 13:12:49 +0200 27 Date: Sat, 21 Jun 2014 13:12:49 +0200
31 Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) 28 Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
32 29
33 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 30 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
53 - LIBS_PRIVATE += -lharfbuzz 50 - LIBS_PRIVATE += -lharfbuzz
54 + CONFIG += link_pkgconfig 51 + CONFIG += link_pkgconfig
55 + PKGCONFIG += harfbuzz 52 + PKGCONFIG += harfbuzz
56 } 53 }
57 -- 54 --
58 2.7.4 55 2.9.3
59 56
60 57
61 From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 58 From bc002ee2a8418c7afcba362d155ba1a591bc3d1a Mon Sep 17 00:00:00 2001
62 From: Mark Brand <mabrand@mabrand.nl> 59 From: Mark Brand <mabrand@mabrand.nl>
63 Date: Mon, 8 Dec 2014 14:15:12 +0100 60 Date: Mon, 8 Dec 2014 14:15:12 +0100
64 Subject: [PATCH 3/8] fix oci config test on windows 61 Subject: [PATCH 3/8] fix oci config test on windows
65 62
66 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 63 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
73 SOURCES = oci.cpp 70 SOURCES = oci.cpp
74 CONFIG -= qt dylib 71 CONFIG -= qt dylib
75 -LIBS += -lclntsh 72 -LIBS += -lclntsh
76 +!win32:LIBS += -lclntsh 73 +!win32:LIBS += -lclntsh
77 -- 74 --
78 2.7.4 75 2.9.3
79 76
80 77
81 From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 78 From 92d2ae7b6eb175b4f15e5f0f231a9c29824d6f57 Mon Sep 17 00:00:00 2001
82 From: Mark Brand <mabrand@mabrand.nl> 79 From: Mark Brand <mabrand@mabrand.nl>
83 Date: Thu, 6 Aug 2015 13:24:56 +0200 80 Date: Thu, 6 Aug 2015 13:24:56 +0200
84 Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows 81 Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
85 82
86 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa 83 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
87 84
88 diff --git a/configure b/configure 85 diff --git a/configure b/configure
89 index 43b55f0..de2c3ec 100755 86 index ba94d08..50e6dfb 100755
90 --- a/configure 87 --- a/configure
91 +++ b/configure 88 +++ b/configure
92 @@ -4656,7 +4656,7 @@ fi 89 @@ -4677,7 +4677,7 @@ fi
93 [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" 90 [ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android"
94 91
95 # check IPC support 92 # check IPC support
96 -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then 93 -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
97 +if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then 94 +if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then
98 # SYSV IPC is not supported - check POSIX IPC 95 # SYSV IPC is not supported - check POSIX IPC
99 if compileTest unix/ipc_posix "ipc_posix" ; then 96 if compileTest unix/ipc_posix "ipc_posix" ; then
100 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" 97 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
101 -- 98 --
102 2.7.4 99 2.9.3
103 100
104 101
105 From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 102 From f0054e940467a64dffc0c3cc070233fdf2848d43 Mon Sep 17 00:00:00 2001
103 From: Mark Brand <mabrand@mabrand.nl>
104 Date: Tue, 6 Oct 2015 09:53:20 +0200
105 Subject: [PATCH 5/8] fix building mysql driver under mingw
106
107 Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
108
109 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
110 index 3cfb614..8b7063f 100644
111 --- a/src/sql/drivers/mysql/qsql_mysql.pri
112 +++ b/src/sql/drivers/mysql/qsql_mysql.pri
113 @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
114 QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
115 LIBS += $$QT_LFLAGS_MYSQL
116
117 -unix {
118 +if (unix|mingw) {
119 isEmpty(QT_LFLAGS_MYSQL) {
120 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
121 use_libmysqlclient_r:LIBS += -lmysqlclient_r
122 --
123 2.9.3
124
125
126 From 26229596fbb711bc222c831eca3a9e5b62c7acc6 Mon Sep 17 00:00:00 2001
106 From: Ray Donnelly <mingw.android@gmail.com> 127 From: Ray Donnelly <mingw.android@gmail.com>
107 Date: Wed, 26 Aug 2015 12:45:43 +0100 128 Date: Wed, 26 Aug 2015 12:45:43 +0100
108 Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets 129 Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets
109 130
110 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) 131 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
133 -!!ELSE 154 -!!ELSE
134 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) 155 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
135 !!ENDIF 156 !!ENDIF
136 !!ENDIF 157 !!ENDIF
137 -- 158 --
138 2.7.4 159 2.9.3
139 160
140 161
141 From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001 162 From 59fd7fdff5bf0cda3c7a11982ee96f50d8eddec1 Mon Sep 17 00:00:00 2001
142 From: Thiago Macieira <thiago.macieira@intel.com>
143 Date: Wed, 18 May 2016 14:40:20 -0700
144 Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X
145
146 platformsupport/fontdatabases/fontdatabases.pri disables all font
147 databases except CoreText on OS X, so this is required for
148 linking. Otherwise, we get undefined reference linker errors:
149
150 Undefined symbols for architecture x86_64:
151 "vtable for QBasicFontDatabase", referenced from:
152 QMinimalIntegration::fontDatabase() const in
153 qminimalintegration.o
154
155 Change-Id: I31298e973803b4d6eedbf61607056114d1556584
156 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
157 (cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea)
158
159 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
160 index 0d31d66..bd6f2d8 100644
161 --- a/src/plugins/platforms/minimal/minimal.pro
162 +++ b/src/plugins/platforms/minimal/minimal.pro
163 @@ -11,6 +11,7 @@ HEADERS = qminimalintegration.h \
164 OTHER_FILES += minimal.json
165
166 CONFIG += qpa/genericunixfontdatabase
167 +darwin: DEFINES += QT_NO_FONTCONFIG
168
169 PLUGIN_TYPE = platforms
170 PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
171 --
172 2.7.4
173
174
175 From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001
176 From: Boris Pek <tehnick-8@yandex.ru>
177 Date: Sun, 19 Jun 2016 03:15:43 +0300
178 Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows
179
180 when qtbase is configured with -fontconfig and -system-freetype.
181
182 This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f.
183 Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea.
184
185 Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef
186 (cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd)
187
188 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
189 index bd6f2d8..4b63461 100644
190 --- a/src/plugins/platforms/minimal/minimal.pro
191 +++ b/src/plugins/platforms/minimal/minimal.pro
192 @@ -12,6 +12,7 @@ OTHER_FILES += minimal.json
193
194 CONFIG += qpa/genericunixfontdatabase
195 darwin: DEFINES += QT_NO_FONTCONFIG
196 +win32: DEFINES += QT_NO_FONTCONFIG
197
198 PLUGIN_TYPE = platforms
199 PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
200 --
201 2.7.4
202
203 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
204 From: Tony Theodore <tonyt@logyst.com> 163 From: Tony Theodore <tonyt@logyst.com>
205 Date: Sat, 16 Jul 2016 20:31:07 +1000 164 Date: Sat, 16 Jul 2016 20:31:07 +1000
206 Subject: [PATCH] Fix pkgconfig file and library naming 165 Subject: [PATCH 7/8] Fix pkgconfig file and library naming
207 166
208 See: https://codereview.qt-project.org/#/c/165394/ 167 See: https://codereview.qt-project.org/#/c/165394/
209 https://bugreports.qt.io/browse/QTBUG-30898 168 https://bugreports.qt.io/browse/QTBUG-30898
210 169
211 Currently, *.pc files are generated with debug suffix `d` in `-release` 170 Currently, *.pc files are generated with debug suffix `d` in `-release`
226 185
227 Task-number: 30898 186 Task-number: 30898
228 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 187 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
229 188
230 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 189 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
231 index 1111111..2222222 100644 190 index d9011f5..1993a7f 100644
232 --- a/mkspecs/features/qt_module.prf 191 --- a/mkspecs/features/qt_module.prf
233 +++ b/mkspecs/features/qt_module.prf 192 +++ b/mkspecs/features/qt_module.prf
234 @@ -244,6 +244,10 @@ load(qt_installs) 193 @@ -244,6 +244,10 @@ load(qt_installs)
235 194
236 load(qt_targets) 195 load(qt_targets)
263 # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API 222 # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API
264 DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 223 DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000
265 } 224 }
266 - 225 -
267 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end 226 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end
227 --
228 2.9.3
229
230
231 From a2ed2c9fe74b549cb163f89a56df6eec3af553fa Mon Sep 17 00:00:00 2001
232 From: Mark Brand <mabrand@mabrand.nl>
233 Date: Thu, 15 Dec 2016 17:20:56 +0100
234 Subject: [PATCH 8/8] fix mysql config test
235
236 The config test already gets link flags which should include
237 the library. Blindly adding it to the end of the list can break
238 static linking.
239
240 Change-Id: Ief71c4ad64cbbb1b141b0ef5549f42a36bbd125b
241
242 diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
243 index 06d1880..ca6d6aa 100644
244 --- a/config.tests/unix/mysql/mysql.pro
245 +++ b/config.tests/unix/mysql/mysql.pro
246 @@ -1,3 +1,3 @@
247 SOURCES = mysql.cpp
248 CONFIG -= qt dylib
249 -LIBS += -lmysqlclient
250 +LIBS *= -lmysqlclient
251 --
252 2.9.3
253