diff options
| author | Michel Zou | 2018-05-02 20:25:59 +0200 |
|---|---|---|
| committer | Michel Zou | 2018-05-02 20:25:59 +0200 |
| commit | 4d08d8d43697ea96da9cb31f8d1af26ecae0704d (patch) | |
| tree | cc2bddc956408a1808eb3bd8941d27e96c67246b /0008-Fix-linking-against-shared-static-libpng.patch | |
| download | aur-4d08d8d43697ea96da9cb31f8d1af26ecae0704d.tar.gz | |
import
Diffstat (limited to '0008-Fix-linking-against-shared-static-libpng.patch')
| -rw-r--r-- | 0008-Fix-linking-against-shared-static-libpng.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch new file mode 100644 index 000000000000..13b1f738ba68 --- /dev/null +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -0,0 +1,27 @@ +From 9914d843bf7833fb04303cb96cff6912cfc7a7f3 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Thu, 26 Jan 2017 17:51:31 +0100 +Subject: [PATCH 08/32] Fix linking against shared/static libpng + +Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf +--- + src/gui/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index dab66fafb4..bc501bd3fc 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -291,7 +291,8 @@ + "sources": [ + { "type": "pkgConfig", "args": "libpng" }, + { "libs": "-llibpng", "condition": "config.msvc" }, +- { "libs": "-lpng", "condition": "!config.msvc" } ++ { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" }, ++ { "libs": "-lpng", "condition": "!config.msvc && features.shared" } + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } +-- +2.16.1 + |