diff options
| author | Martchus | 2017-02-09 21:00:00 +0100 |
|---|---|---|
| committer | Martchus | 2017-02-09 21:00:00 +0100 |
| commit | 017bc5699e8507491c2acbe88d0fd51185422c11 (patch) | |
| tree | 13b401ebe2f19ba3c953534dbb1afa4c8f23b2a5 /0011-Fix-linking-against-static-harfbuzz.patch | |
| parent | d5440cf4c6f5db8ea6794b1bdc895ceb9bc55efc (diff) | |
| download | aur-017bc5699e8507491c2acbe88d0fd51185422c11.tar.gz | |
Update to 5.8.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..cb9f7ecfc986 --- /dev/null +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -0,0 +1,29 @@ +From 52c34159dec8c829d1f2928d2c9a56bb7299fbff Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 14:22:56 +0200 +Subject: [PATCH 11/30] 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 6530357be9..c5b9b1542a 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -125,7 +125,11 @@ + "label": "HarfBuzz", + "test": "unix/harfbuzz", + "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.11.1 + |