diff options
| author | Martchus | 2019-03-26 21:40:16 +0100 |
|---|---|---|
| committer | Martchus | 2019-03-26 21:40:16 +0100 |
| commit | e894634fca446cfdeded4af326b52f2ca863ccb3 (patch) | |
| tree | 5db6b73312855ae4b16c5b1117d7c3ffb7f70c57 /0011-Fix-linking-against-static-freetype2.patch | |
| parent | e7ce83a899aa41cd57c4f5e7633308ea9f82de2c (diff) | |
| download | aur-e894634fca446cfdeded4af326b52f2ca863ccb3.tar.gz | |
Update to 5.12.2
Diffstat (limited to '0011-Fix-linking-against-static-freetype2.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-freetype2.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index bcbdbf749b03..0908b405a72d 100644 --- a/0011-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001 +From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 @@ -8,10 +8,10 @@ Subject: [PATCH 11/34] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 9124e3e77e..f3628f415d 100644 +index 19fd92bce7..822214a0aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -237,8 +237,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644 + { "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": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], - "use": [ -- -2.20.1 +2.21.0 |