diff options
| author | Michel Zou | 2019-02-22 18:26:23 +0100 |
|---|---|---|
| committer | Michel Zou | 2019-02-22 18:26:23 +0100 |
| commit | ea2da1870c5d80e4c77364d198aa1fad64b8c4f0 (patch) | |
| tree | 09c9102d7a602ff0d04c165cec8ece1e216705cc /0008-Fix-linking-against-shared-static-libpng.patch | |
| parent | 12107bedc14b62761fd2de498659c6b19768d59c (diff) | |
| download | aur-mingw-w64-qt5-base-nostatx.tar.gz | |
5.12.1
Diffstat (limited to '0008-Fix-linking-against-shared-static-libpng.patch')
| -rw-r--r-- | 0008-Fix-linking-against-shared-static-libpng.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index e1842babbb3e..c6d0a2cbfb69 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,7 +1,7 @@ -From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001 +From 95710d93c0d010afaa8ac7433b99827346bc011b 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 +Subject: [PATCH 08/34] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0332631ec8..dbb6f708b0 100644 +index 89934c8f1d..9124e3e77e 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -308,8 +308,10 @@ +@@ -385,8 +385,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 0332631ec8..dbb6f708b0 100644 ], "use": [ -- -2.19.2 +2.20.1 |