diff options
| author | Martchus | 2018-12-11 18:56:57 +0000 |
|---|---|---|
| committer | Martchus | 2018-12-11 18:56:57 +0000 |
| commit | f835d8ffaedccfa55c5545559c505caf698f62e2 (patch) | |
| tree | 5b20d43d9d1a17b5cf70ab9e10196cc3deb7ef90 /0011-Fix-linking-against-static-freetype2.patch | |
| parent | c1312e3ce7592b30f5454345d5ae8a61302b8ef3 (diff) | |
| download | aur-f835d8ffaedccfa55c5545559c505caf698f62e2.tar.gz | |
Update to 5.12.0
Diffstat (limited to '0011-Fix-linking-against-static-freetype2.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-freetype2.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index 67d154e39b24..911a609e6a7a 100644 --- a/0011-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,30 +1,32 @@ -From 0ca7e00a0ab483f3050349db030afab902d389c2 Mon Sep 17 00:00:00 2001 +From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/33] Fix linking against static freetype2 --- - src/gui/configure.json | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + src/gui/configure.json | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index d629a45b92..afa3d95f39 100644 +index dbb6f708b0..a7ffa0f113 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -158,8 +158,11 @@ +@@ -163,9 +163,12 @@ ] }, "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, -- { "type": "freetype", "libs": "-lfreetype" } +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, +- { "type": "freetype", "libs": "-s USE_FREETYPE=1", "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" }, -+ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" }, -+ { "libs": "-lfreetype", "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" }, ++ { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" } ] }, "fontconfig": { -- -2.19.0 +2.19.2 |