Mercurial > mxe-octave

comparison src/qtbase-1-fixes.patch @ 4956:ddd66d48a646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qt5 to v5.12.1 * src/qtbase-1-fixes.patch: updated patch * src/qtbase.mk: update version, checksum * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools-1.patch: update patch * src/qttools.mk: update checksum
author John D
date Sun, 10 Feb 2019 07:58:15 -0500
parents 22937c7fe60d
children 9d35f8eb1e76
comparison
equal deleted inserted replaced
4955:82da3c312020 4956:ddd66d48a646
1 This file is part of MXE. See LICENSE.md for licensing information. 1 This file is part of MXE. See LICENSE.md for licensing information.
2 2
3 Contains ad hoc patches for cross building. 3 From 01ee0b5260f1b83a81769132c0705aab05481641 Mon Sep 17 00:00:00 2001
4
5 From f1dbf592c625533c9f8a704e4d5f12f3111a1fb3 Mon Sep 17 00:00:00 2001
6 From: Ray Donnelly <mingw.android@gmail.com> 4 From: Ray Donnelly <mingw.android@gmail.com>
7 Date: Wed, 26 Aug 2015 12:45:43 +0100 5 Date: Wed, 26 Aug 2015 12:45:43 +0100
8 Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets 6 Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets
9 7
10 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) 8 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
35 !!ENDIF 33 !!ENDIF
36 -- 34 --
37 2.19.1 35 2.19.1
38 36
39 37
40 From b822f7ff799d10297b0b36408e7cfa44fd416118 Mon Sep 17 00:00:00 2001 38 From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001
41 From: Tony Theodore <tonyt@logyst.com> 39 From: Tony Theodore <tonyt@logyst.com>
42 Date: Sat, 16 Jul 2016 20:31:07 +1000 40 Date: Sat, 16 Jul 2016 20:31:07 +1000
43 Subject: [PATCH 2/5] Fix pkgconfig file and library naming 41 Subject: [PATCH 2/5] Fix pkgconfig file and library naming
44 42
45 See: https://codereview.qt-project.org/#/c/165394/ 43 See: https://codereview.qt-project.org/#/c/165394/
104 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end 102 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end
105 -- 103 --
106 2.19.1 104 2.19.1
107 105
108 106
109 From 7773e45dfdd82ede2415a6818332de3e36e7c824 Mon Sep 17 00:00:00 2001 107 From 6a7989a069a7aa88e898c4f68bd753b480af0cdf Mon Sep 17 00:00:00 2001
110 From: Mark Brand <mabrand@mabrand.nl> 108 From: Mark Brand <mabrand@mabrand.nl>
111 Date: Sun, 29 Jan 2017 13:02:16 +0100 109 Date: Sun, 29 Jan 2017 13:02:16 +0100
112 Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) 110 Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific)
113 111
114 Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f 112 Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
115 113
116 diff --git a/src/gui/configure.json b/src/gui/configure.json 114 diff --git a/src/gui/configure.json b/src/gui/configure.json
117 index 0332631ec8..e2d87e77b3 100644 115 index 89934c8f1d..456643a22c 100644
118 --- a/src/gui/configure.json 116 --- a/src/gui/configure.json
119 +++ b/src/gui/configure.json 117 +++ b/src/gui/configure.json
120 @@ -1003,7 +1003,7 @@ 118 @@ -1209,7 +1209,7 @@
121 "fontconfig": { 119 "fontconfig": {
122 "label": "Fontconfig", 120 "label": "Fontconfig",
123 "autoDetect": "!config.darwin", 121 "autoDetect": "!config.darwin",
124 - "condition": "!config.win32 && features.system-freetype && libs.fontconfig", 122 - "condition": "!config.win32 && features.system-freetype && libs.fontconfig",
125 + "condition": "features.system-freetype && libs.fontconfig", 123 + "condition": "features.system-freetype && libs.fontconfig",
145 #endif 143 #endif
146 -- 144 --
147 2.19.1 145 2.19.1
148 146
149 147
150 From 82d08b0378db0a30007ca5ee965ffa034859af5c Mon Sep 17 00:00:00 2001 148 From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001
151 From: Mark Brand <mabrand@mabrand.nl> 149 From: Mark Brand <mabrand@mabrand.nl>
152 Date: Sun, 11 Jun 2017 00:27:41 +0200 150 Date: Sun, 11 Jun 2017 00:27:41 +0200
153 Subject: [PATCH 4/5] use pkg-config for harfbuzz 151 Subject: [PATCH 4/5] use pkg-config for harfbuzz
154 152
155 Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 153 Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421
156 154
157 diff --git a/src/gui/configure.json b/src/gui/configure.json 155 diff --git a/src/gui/configure.json b/src/gui/configure.json
158 index e2d87e77b3..4eb37aea17 100644 156 index 456643a22c..f36e15603b 100644
159 --- a/src/gui/configure.json 157 --- a/src/gui/configure.json
160 +++ b/src/gui/configure.json 158 +++ b/src/gui/configure.json
161 @@ -224,7 +224,8 @@ 159 @@ -301,7 +301,8 @@
162 ]
163 }, 160 },
161 "headers": "harfbuzz/hb.h",
164 "sources": [ 162 "sources": [
165 - "-lharfbuzz" 163 - "-lharfbuzz"
166 + { "type": "pkgConfig", "args": "harfbuzz" }, 164 + { "type": "pkgConfig", "args": "harfbuzz" },
167 + "-lharfbuzz" 165 + "-lharfbuzz"
168 ] 166 ]
170 "imf": { 168 "imf": {
171 -- 169 --
172 2.19.1 170 2.19.1
173 171
174 172
175 From 8ea9633854e8c2ad94df00866a9b9e3a4394d161 Mon Sep 17 00:00:00 2001 173 From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001
176 From: Mark Brand <mabrand@mabrand.nl> 174 From: Mark Brand <mabrand@mabrand.nl>
177 Date: Thu, 23 Nov 2017 11:28:47 +0200 175 Date: Thu, 23 Nov 2017 11:28:47 +0200
178 Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 176 Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32
179 177
180 Workaround for gcc internal error compiling for mingw32: 178 Workaround for gcc internal error compiling for mingw32:
191 Based on https://codereview.qt-project.org/#/c/212360/ 189 Based on https://codereview.qt-project.org/#/c/212360/
192 190
193 Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 191 Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369
194 192
195 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp 193 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
196 index 23e5e499b2..d0b3159c0d 100644 194 index 6195c324e7..94902bcfc2 100644
197 --- a/src/corelib/global/qrandom.cpp 195 --- a/src/corelib/global/qrandom.cpp
198 +++ b/src/corelib/global/qrandom.cpp 196 +++ b/src/corelib/global/qrandom.cpp
199 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando 197 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
200 198
201 QT_BEGIN_NAMESPACE 199 QT_BEGIN_NAMESPACE
207 # ifdef Q_PROCESSOR_X86_64 205 # ifdef Q_PROCESSOR_X86_64
208 -- 206 --
209 2.19.1 207 2.19.1
210 208
211 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 209 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
212 --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 210 --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400
213 +++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 211 +++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400
214 @@ -46,7 +46,7 @@ 212 @@ -46,7 +46,7 @@
215 QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC 213 QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
216 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC 214 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
217 QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC 215 QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
218 -QMAKE_CFLAGS_ISYSTEM = -isystem 216 -QMAKE_CFLAGS_ISYSTEM = -isystem