diff options
| author | Michel Zou | 2018-05-02 20:25:59 +0200 |
|---|---|---|
| committer | Michel Zou | 2018-05-02 20:25:59 +0200 |
| commit | 4d08d8d43697ea96da9cb31f8d1af26ecae0704d (patch) | |
| tree | cc2bddc956408a1808eb3bd8941d27e96c67246b /0011-Fix-linking-against-static-freetype2.patch | |
| download | aur-4d08d8d43697ea96da9cb31f8d1af26ecae0704d.tar.gz | |
import
Diffstat (limited to '0011-Fix-linking-against-static-freetype2.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-freetype2.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch new file mode 100644 index 000000000000..36bf76065090 --- /dev/null +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -0,0 +1,30 @@ +From 3deafc5a5c28faaafb1f1ec52d32c9fc5df2986d Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 3 Feb 2017 20:51:19 +0100 +Subject: [PATCH 11/32] Fix linking against static freetype2 + +--- + src/gui/configure.json | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index bc501bd3fc..f7a4a39fd4 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -158,8 +158,11 @@ + ] + }, + "sources": [ +- { "type": "pkgConfig", "args": "freetype2" }, +- { "type": "freetype", "libs": "-lfreetype" } ++ { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" }, ++ { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" }, ++ { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" }, ++ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" }, ++ { "libs": "-lfreetype", "condition": "features.shared" } + ] + }, + "fontconfig": { +-- +2.16.1 + |