* 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.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 2fb25bad89b6df6903f81d9efac2aa000513d02d Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
|
Subject: [PATCH 11/32] Fix linking against static harfbuzz
|
|
|
|
---
|
|
src/gui/configure.json | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
|
index 6c5e99fa9a..d8afe79b0b 100644
|
|
--- a/src/gui/configure.json
|
|
+++ b/src/gui/configure.json
|
|
@@ -305,7 +305,11 @@
|
|
},
|
|
"headers": "harfbuzz/hb.h",
|
|
"sources": [
|
|
- "-lharfbuzz"
|
|
+ { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },
|
|
+ { "type": "pkgConfig", "args": "--libs harfbuzz", "condition": "features.shared" },
|
|
+ { "libs": "-lharfbuzz -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
|
|
+ { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" },
|
|
+ { "libs": "-lharfbuzz", "condition": "features.shared" }
|
|
]
|
|
},
|
|
"imf": {
|
|
--
|
|
2.43.0
|
|
|