* Add latest patches from KDE * Fix linking against static brotli which is now a dependency of mingw-w64-freetype2
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 0d8428e3978921225f0810a863000d3184c25596 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 0ec8cbf876..5fecce5401 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 -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
|
|
+ { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" },
|
|
+ { "libs": "-lharfbuzz", "condition": "features.shared" }
|
|
]
|
|
},
|
|
"imf": {
|
|
--
|
|
2.33.0
|
|
|