diff options
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 | 8 |
1 files changed, 4 insertions, 4 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 b15d9d6804c2..16dcd04ffeb4 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 a17fb43c9257fe1e7a1c57f7c968103ed4ee4c7b Mon Sep 17 00:00:00 2001 +From 9304a56442c6af9deec0a4d084477e0daf63e24e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 2 Nov 2020 13:47:45 +0100 -Subject: [PATCH 05/13] Fix libjpeg workaround for conflict with rpcndr.h +Subject: [PATCH 05/17] 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 @@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e 1 file changed, 1 insertion(+) diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp -index 0d72ba01d0..a706fb4cea 100644 +index 0d72ba01d04..a706fb4cea3 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -26,6 +26,7 @@ @@ -25,5 +25,5 @@ index 0d72ba01d0..a706fb4cea 100644 #ifdef const # undef const // remove crazy C hackery in jconfig.h -- -2.43.0 +2.44.0 |