diff options
author | Martchus | 2017-06-08 21:34:05 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:34:05 +0200 |
commit | dea669da7483affe56a58aeae1b7ddb2f7b528d9 (patch) | |
tree | 0e69beb722c6e0ae05bd09adddab7dcc6bf9edc0 /0011-Fix-linking-against-static-harfbuzz.patch | |
parent | f67235f7789e3073e968f496c2bce838c2245662 (diff) | |
download | aur-dea669da7483affe56a58aeae1b7ddb2f7b528d9.tar.gz |
Update to 5.9.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, 0 insertions, 29 deletions
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch deleted file mode 100644 index a4abc6062191..000000000000 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ /dev/null @@ -1,29 +0,0 @@ -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.12.1 - |