diff options
| author | Martchus | 2019-06-26 14:41:40 +0200 |
|---|---|---|
| committer | Martchus | 2019-06-26 14:41:40 +0200 |
| commit | aa664310e068d16f3fa9dd3ed1e62814180a9fb9 (patch) | |
| tree | 7d61b955907f9eb70e08097e2ae1c3ee9403aee8 /0010-Fix-linking-against-static-freetype2.patch | |
| parent | 8b969caa0f50120f042897bb106deb198bca4bab (diff) | |
| download | aur-aa664310e068d16f3fa9dd3ed1e62814180a9fb9.tar.gz | |
Update to 5.13.0
Diffstat (limited to '0010-Fix-linking-against-static-freetype2.patch')
| -rw-r--r-- | 0010-Fix-linking-against-static-freetype2.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch new file mode 100644 index 000000000000..027fec2a68a0 --- /dev/null +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -0,0 +1,30 @@ +From c75a87b8378987e9a63235984021377755418ba1 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 3 Feb 2017 20:51:19 +0100 +Subject: [PATCH 10/33] 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 36325920cd..972f9914ea 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -238,8 +238,11 @@ + }, + "headers": "ft2build.h", + "sources": [ +- { "type": "pkgConfig", "args": "freetype2" }, +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, ++ { "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 && !config.wasm" }, ++ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, ++ { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } + ], +-- +2.22.0 + |