diff options
| author | Martchus | 2022-10-05 17:53:38 +0200 |
|---|---|---|
| committer | Martchus | 2022-10-05 17:53:38 +0200 |
| commit | e5ec8b1988d52b1baa63a26d7676d4f3cff374a2 (patch) | |
| tree | 0175e4adce51e8b4955b592dbb1cff0e8e2b7041 /0011-Fix-linking-against-static-harfbuzz.patch | |
| parent | 5f9969e8f06b00eef578a8e4c7c71715fc2a71f1 (diff) | |
| download | aur-e5ec8b1988d52b1baa63a26d7676d4f3cff374a2.tar.gz | |
Update patch version, adapt patches to glib2/pcre2 change
Diffstat (limited to '0011-Fix-linking-against-static-harfbuzz.patch')
| -rw-r--r-- | 0011-Fix-linking-against-static-harfbuzz.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index ad8ccb91a07a..df2f230fc9ac 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From ec97898dc6b1446c10a2e357627ffb198b614a81 Mon Sep 17 00:00:00 2001 +From 3c9701cd97287da483664e391b43590db0b16884 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/32] Fix linking against static harfbuzz @@ -8,7 +8,7 @@ Subject: [PATCH 11/32] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 2fe0a018b1..ceeee23164 100644 +index 3f77f67a07..f6da787b13 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -305,7 +305,11 @@ @@ -18,7 +18,7 @@ index 2fe0a018b1..ceeee23164 100644 - "-lharfbuzz" + { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" }, + { "type": "pkgConfig", "args": "--libs harfbuzz", "condition": "features.shared" }, -+ { "libs": "-lharfbuzz -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" }, ++ { "libs": "-lharfbuzz -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" }, + { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" }, + { "libs": "-lharfbuzz", "condition": "features.shared" } ] |