diff options
author | Michel Zou | 2019-02-22 18:26:23 +0100 |
---|---|---|
committer | Michel Zou | 2019-02-22 18:26:23 +0100 |
commit | ea2da1870c5d80e4c77364d198aa1fad64b8c4f0 (patch) | |
tree | 09c9102d7a602ff0d04c165cec8ece1e216705cc /0011-Fix-linking-against-static-freetype2.patch | |
parent | 12107bedc14b62761fd2de498659c6b19768d59c (diff) | |
download | aur-mingw-w64-qt5-base-nostatx.tar.gz |
5.12.1
Diffstat (limited to '0011-Fix-linking-against-static-freetype2.patch')
-rw-r--r-- | 0011-Fix-linking-against-static-freetype2.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index 911a609e6a7a..bcbdbf749b03 100644 --- a/0011-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,32 +1,30 @@ -From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001 +From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d 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 +Subject: [PATCH 11/34] Fix linking against static freetype2 --- - src/gui/configure.json | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + 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 dbb6f708b0..a7ffa0f113 100644 +index 9124e3e77e..f3628f415d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -163,9 +163,12 @@ - ] +@@ -237,8 +237,11 @@ }, + "headers": "ft2build.h", "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, - { "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 && !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": { + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + ], + "use": [ -- -2.19.2 +2.20.1 |