aboutsummarylogtreecommitdiffstats
path: root/0011-Fix-linking-against-static-freetype2.patch
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:33:56 +0200
committerMartchus2017-06-08 21:33:56 +0200
commit3df6482af8c916f5105111d1dcf6711e01a56c47 (patch)
tree55879cff03b12573e665e21cdd7c7d7e65df1c2d /0011-Fix-linking-against-static-freetype2.patch
parent288f048fafcb5879c7c038c7e507b6ea98732b93 (diff)
downloadaur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz
Update to 5.9.0
Diffstat (limited to '0011-Fix-linking-against-static-freetype2.patch')
-rw-r--r--0011-Fix-linking-against-static-freetype2.patch30
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..bfec7c52398b
--- /dev/null
+++ b/0011-Fix-linking-against-static-freetype2.patch
@@ -0,0 +1,30 @@
+From 50aa5c34a1240f86092a90241fba27a332f9003c Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 3 Feb 2017 20:51:19 +0100
+Subject: [PATCH 11/31] 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 6dee7d18aa..d6ed20e5c6 100644
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -100,8 +100,11 @@
+ "label": "FreeType",
+ "test": "unix/freetype",
+ "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.13.0
+