aboutsummarylogtreecommitdiffstats
path: root/0010-Fix-linking-against-static-freetype2.patch
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:34:11 +0200
committerMartchus2017-06-08 21:34:11 +0200
commit846161610d6712abc5d514fd3bf6ee1cc86223cf (patch)
treeffe54aee49a30a2cb0ad3ba6f8941703ab29b07c /0010-Fix-linking-against-static-freetype2.patch
parent65a7f9d368e548df5e089e340bd4f404cdd2430b (diff)
downloadaur-846161610d6712abc5d514fd3bf6ee1cc86223cf.tar.gz
Update to 5.9.0
Diffstat (limited to '0010-Fix-linking-against-static-freetype2.patch')
-rw-r--r--0010-Fix-linking-against-static-freetype2.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
deleted file mode 100644
index 406fff4bd69e..000000000000
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 24c3bda7db1733545350436d8c2f489be5395650 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/30] 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 5006ff5a3a..6530357be9 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -99,8 +99,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.12.1
-