diff options
| author | Martchus | 2021-06-10 15:42:12 +0200 |
|---|---|---|
| committer | Martchus | 2021-06-10 15:42:12 +0200 |
| commit | 748c0527a1c4f4ca049054b9ce9d217cda574ee6 (patch) | |
| tree | 8e11cb06160bfc1a56702f22117195c388b02b68 /0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | |
| parent | c1d86d30df80db0b2bdfc39f919ad794242fde64 (diff) | |
| download | aur-748c0527a1c4f4ca049054b9ce9d217cda574ee6.tar.gz | |
Update to 6.1.1
Diffstat (limited to '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch')
| -rw-r--r-- | 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index acde0a0acbe2..76a5a43990a9 100644 --- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,7 +1,7 @@ -From f3ca9d271a0919b086ca6864d9682ae11f05543e Mon Sep 17 00:00:00 2001 +From 187e32fa4e8f92796d75f2bd47efb464e4638aec Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 2 Nov 2020 13:47:45 +0100 -Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h +Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is @@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644 #ifdef const # undef const // remove crazy C hackery in jconfig.h -- -2.31.1 +2.32.0 |