Mercurial > mxe-octave

comparison src/qtbase-1-fixes.patch @ 5859:6821341b80cb release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qt5 to v5.15.2 * src/qtbase.mk: update version, checksum * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslations.mk: update checksum * src/qtbase-1-fixes.patch: update patch (grafted from 38be0ef93ce30264f5176dfb2d148d92a7861a36)
author John Donoghue <john.donoghue@ieee.org>
date Sun, 29 Nov 2020 13:59:42 -0500
parents 8cfad4a44884
children
comparison
equal deleted inserted replaced
5858:8cfad4a44884 5859:6821341b80cb
61 }, 61 },
62 "imf": { 62 "imf": {
63 -- 63 --
64 2.25.1 64 2.25.1
65 65
66 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
67 --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400
68 +++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400
69 @@ -46,7 +46,7 @@
70 QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
71 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
72 QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
73 -QMAKE_CFLAGS_ISYSTEM = -isystem
74 +QMAKE_CFLAGS_ISYSTEM = -I
75 QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
76 QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
77 QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
78 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 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
79 --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 67 --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400
80 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400 68 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400
81 @@ -162,7 +162,11 @@ 69 @@ -162,7 +162,11 @@
82 70