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 /0008-Fix-linking-against-shared-static-libpng.patch | |
| parent | c1312e3ce7592b30f5454345d5ae8a61302b8ef3 (diff) | |
| download | aur-f835d8ffaedccfa55c5545559c505caf698f62e2.tar.gz | |
Update to 5.12.0
Diffstat (limited to '0008-Fix-linking-against-shared-static-libpng.patch')
| -rw-r--r-- | 0008-Fix-linking-against-shared-static-libpng.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index ce8aee38fc68..e1842babbb3e 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,27 +1,30 @@ -From dc1443e4b4cbc38d31934674b006f0458fe86298 Mon Sep 17 00:00:00 2001 +From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/33] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- - src/gui/configure.json | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/gui/configure.json | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 219385a108..d629a45b92 100644 +index 0332631ec8..dbb6f708b0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -291,7 +291,8 @@ - "sources": [ +@@ -308,8 +308,10 @@ { "type": "pkgConfig", "args": "libpng" }, + { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, -- { "libs": "-lpng", "condition": "!config.msvc" } +- { "libs": "-lpng16", "condition": "!config.msvc" }, +- { "libs": "-lpng", "condition": "!config.msvc" }, ++ { "libs": "-lpng16 -lz", "condition": "!config.msvc && !features.shared" }, + { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" }, -+ { "libs": "-lpng", "condition": "!config.msvc && features.shared" } ++ { "libs": "-lpng16", "condition": "!config.msvc && features.shared" }, ++ { "libs": "-lpng", "condition": "!config.msvc && features.shared" }, + { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" } ], "use": [ - { "lib": "zlib", "condition": "features.system-zlib" } -- -2.19.0 +2.19.2 |