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 /0012-Fix-linking-against-static-harfbuzz.patch | |
parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz |
Update to 5.13.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, 0 insertions, 29 deletions
diff --git a/0012-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch deleted file mode 100644 index c492b0ba5211..000000000000 --- a/0012-Fix-linking-against-static-harfbuzz.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 95f8ae9b5c7600313f1c6f3f4a7c1f50afef3069 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 18 Sep 2016 14:22:56 +0200 -Subject: [PATCH 12/34] 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 184c9368f2..db6d4d68c9 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.21.0 - |