diff options
author | Martchus | 2017-02-09 21:00:10 +0100 |
---|---|---|
committer | Martchus | 2017-02-09 21:00:10 +0100 |
commit | 940a90290b57310b18453f8be45b932af499aaf0 (patch) | |
tree | 2455e9dc9cf2c90461d3f793d1039cfbcb868dd2 /0008-Fix-linking-against-shared-static-libpng.patch | |
parent | b34651a37cae8ed6f3047feb20083b0992d002f8 (diff) | |
download | aur-940a90290b57310b18453f8be45b932af499aaf0.tar.gz |
Update to 5.8.0
Diffstat (limited to '0008-Fix-linking-against-shared-static-libpng.patch')
-rw-r--r-- | 0008-Fix-linking-against-shared-static-libpng.patch | 26 |
1 files changed, 26 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..066b62496483 --- /dev/null +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -0,0 +1,26 @@ +From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Thu, 26 Jan 2017 17:51:31 +0100 +Subject: [PATCH 08/30] Fix linking against shared/static libpng + +--- + 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 1f5011617c..5006ff5a3a 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -161,7 +161,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" } + ] + }, + "mirclient": { +-- +2.11.1 + |