diff options
Diffstat (limited to '0011-Fix-linking-against-static-harfbuzz.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-harfbuzz.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index d078ef3096aa..a3fc79e0754b 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,29 +1,29 @@ -From c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001 +From d5ca57cecd935d1475d5b5677391e703a9733989 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 -Subject: [PATCH 11/31] Fix linking against static harfbuzz +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 872deb3ad3..7daaaa5a11 100644 +index d9b540ce428..69cb564e868 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -307,7 +307,11 @@ +@@ -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": "-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.25.0 +2.44.0 |