diff options
| author | Martchus | 2017-06-08 21:33:56 +0200 |
|---|---|---|
| committer | Martchus | 2017-06-08 21:33:56 +0200 |
| commit | 3df6482af8c916f5105111d1dcf6711e01a56c47 (patch) | |
| tree | 55879cff03b12573e665e21cdd7c7d7e65df1c2d /0012-Fix-linking-against-static-harfbuzz.patch | |
| parent | 288f048fafcb5879c7c038c7e507b6ea98732b93 (diff) | |
| download | aur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz | |
Update to 5.9.0
Diffstat (limited to '0012-Fix-linking-against-static-harfbuzz.patch')
| -rw-r--r-- | 0012-Fix-linking-against-static-harfbuzz.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/0012-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch new file mode 100644 index 000000000000..cab1b3067ec0 --- /dev/null +++ b/0012-Fix-linking-against-static-harfbuzz.patch @@ -0,0 +1,29 @@ +From 9bea663dc73c714d606f5acc65a8f84129f1428e Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 14:22:56 +0200 +Subject: [PATCH 12/31] 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 d6ed20e5c6..8937d38f63 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -126,7 +126,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.13.0 + |