* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 029df9db41b422111966430faa85fa12d96bdde4 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 3 Feb 2017 20:51:19 +0100
|
|
Subject: [PATCH 10/32] Fix linking against static freetype2
|
|
|
|
---
|
|
src/gui/configure.json | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
|
index e0043542ec..6c5e99fa9a 100644
|
|
--- a/src/gui/configure.json
|
|
+++ b/src/gui/configure.json
|
|
@@ -238,8 +238,10 @@
|
|
},
|
|
"headers": "ft2build.h",
|
|
"sources": [
|
|
- { "type": "pkgConfig", "args": "freetype2" },
|
|
- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
|
|
+ { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
|
|
+ { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec -lbrotlicommon -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
|
|
+ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
|
|
+ { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
|
|
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
|
|
{ "libs": "-lfreetype" }
|
|
],
|
|
--
|
|
2.43.0
|
|
|