diff options
| author | Martchus | 2019-06-26 14:41:33 +0200 |
|---|---|---|
| committer | Martchus | 2019-06-26 14:41:33 +0200 |
| commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
| tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0011-Fix-linking-against-static-harfbuzz.patch | |
| parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
| download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz | |
Update to 5.13.0
Diffstat (limited to '0011-Fix-linking-against-static-harfbuzz.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-harfbuzz.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch new file mode 100644 index 000000000000..f07979b5036e --- /dev/null +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -0,0 +1,29 @@ +From 4f637a1ae1182f9327cc5fd198961e906cff59eb Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 14:22:56 +0200 +Subject: [PATCH 11/33] 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 972f9914ea..894c10259d 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -306,7 +306,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.22.0 + |