diff options
| author | Martchus | 2024-04-04 10:44:33 +0200 |
|---|---|---|
| committer | Martchus | 2024-04-04 10:44:33 +0200 |
| commit | 54d151502fbdeff6b79262dc438257797d9d6cf1 (patch) | |
| tree | 8436fba97826778bd16b1b8488b512c81fd9dd66 /0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | |
| parent | bc87d5c85b8fead9f26a6c1ba8ebf42c08fad24d (diff) | |
| download | aur-mingw-w64-qt6-base.tar.gz | |
Update to 6.7.0
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 | 4 |
1 files changed, 2 insertions, 2 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 16dcd04ffeb4..1e7e5d742ad5 100644 --- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,4 +1,4 @@ -From 9304a56442c6af9deec0a4d084477e0daf63e24e Mon Sep 17 00:00:00 2001 +From 4819b1a1a2216cb11ebc847e1aec4f7b2587386b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 2 Nov 2020 13:47:45 +0100 Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h @@ -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 0d72ba01d04..a706fb4cea3 100644 +index 6bc7712c617..db5500d99ea 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -26,6 +26,7 @@ |