diff options
| author | Martchus | 2017-06-08 21:34:05 +0200 |
|---|---|---|
| committer | Martchus | 2017-06-08 21:34:05 +0200 |
| commit | dea669da7483affe56a58aeae1b7ddb2f7b528d9 (patch) | |
| tree | 0e69beb722c6e0ae05bd09adddab7dcc6bf9edc0 /0008-Fix-linking-against-shared-static-libpng.patch | |
| parent | f67235f7789e3073e968f496c2bce838c2245662 (diff) | |
| download | aur-dea669da7483affe56a58aeae1b7ddb2f7b528d9.tar.gz | |
Update to 5.9.0
Diffstat (limited to '0008-Fix-linking-against-shared-static-libpng.patch')
| -rw-r--r-- | 0008-Fix-linking-against-shared-static-libpng.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5dcad..465da4060937 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,26 +1,27 @@ -From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001 +From 4fb07cf7290b97694586f3f30489165f114ca439 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 +Subject: [PATCH 08/31] 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 1f5011617c..5006ff5a3a 100644 +index 73e59a7ad9..6dee7d18aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -161,7 +161,8 @@ +@@ -162,7 +162,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": { + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } -- -2.12.1 +2.13.0 |