5d03d81154
debug-and-release is broken (no d suffixes for libraries) build with and create separate debug info package for the shared build and skip debug versions for the static build for now for static, using built-in zlib breaks afaict it doesn’t actually build and CMake complains about ominous Qt5::ZLIB-NOTFOUND targets when you try to use the result system zlib can link successfully statically neither build tests nor examples adjusted patches: 0008 adds a hunk which adjusts a hard coded import lib suffix, otherwise plugin loading breaks 0011 fix pkg-config call for static dbus linking 0041 plugin prl files also have no lib prefix 0044 fix patch to actually iterate all libs (the result actually wasn’t required in 5.13, it just preempted errors) and adjust lib list removed patches: 0005 was upstreamed 0034 is imo just nice, but doesn’t fix anything, therefore removed as non-essential 0038 don’t know why that was necessary (but would apply still…) 0037, 0039, 0040, 0042 and 0043 are superseded by Qt’s new implementation 0059 didn’t apply, don’t know what it was supposed to fix the qml plugins actually link now (as well as the QVirtualKeyboardPlugin)
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/src/corelib/text/qregularexpression.cpp qt-everywhere-src-5.12.4/qtbase/src/corelib/text/qregularexpression.cpp
|
|
--- qt-everywhere-src-5.12.4-orig/qtbase/src/corelib/text/qregularexpression.cpp 2019-06-12 23:59:14.000000000 +0300
|
|
+++ qt-everywhere-src-5.12.4/qtbase/src/corelib/text/qregularexpression.cpp 2019-06-15 14:59:25.087038500 +0300
|
|
@@ -53,6 +53,10 @@
|
|
#include <QtCore/qdatastream.h>
|
|
|
|
#define PCRE2_CODE_UNIT_WIDTH 16
|
|
+#ifdef QT_STATIC
|
|
+#define PCRE_STATIC
|
|
+#define PCRE2_STATIC
|
|
+#endif
|
|
|
|
#include <pcre2.h>
|
|
|
|
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/src/network/configure.json qt-everywhere-src-5.12.4/qtbase/src/network/configure.json
|
|
--- qt-everywhere-src-5.12.4-orig/qtbase/src/network/configure.json 2019-06-12 23:59:14.000000000 +0300
|
|
+++ qt-everywhere-src-5.12.4/qtbase/src/network/configure.json 2019-06-15 14:59:25.102638600 +0300
|
|
@@ -92,7 +92,7 @@
|
|
"condition": "config.msvc"
|
|
},
|
|
{
|
|
- "libs": "-lssl -lcrypto",
|
|
+ "libs": "-lssl -lcrypto -lws2_32 -lcrypt32 -lgdi32",
|
|
"condition": "!config.msvc"
|
|
}
|
|
]
|