wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-16 22:27:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

exempi: add patch to fix incompatibility with musl NULL

Browse source
This commit is contained in:
John 2023-07-21 22:43:38 +02:00
parent 0b205f1faa
commit 86cedac0e1
1 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
srcpkgs/exempi/patches/nullptr.patch Normal file
View file

@ -0,0 +1,51 @@
src: https://raw.githubusercontent.com/chimera-linux/cports/01ab74ecd61e21095db32f37e16b6c285d93183e/main/exempi/patches/nullptr.patch
commit d1e8054014adeafc606885844c1df65918ee7511
Author: Daniel Kolesa <daniel@octaforge.org>
Date: Fri Apr 8 05:26:02 2022 +0200
fix up some invalid nullptr assignments
C++11 onwards permits NULL to be of type nullptr_t, which prevents
assignment of NULL values to integer types.
diff --git a/samples/source/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp
index e3d8888..5d86bbb 100644
--- a/samples/source/common/DumpFile.cpp
+++ b/samples/source/common/DumpFile.cpp
@@ -2471,7 +2471,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif");
LFA_Seek(file, keep, SEEK_SET, &ok);
assertMsg("seek failed", ok);
- exif_item_id = NULL;
+ exif_item_id = 0;
}
}
//Get the data for xmp - using value from mime_item_id
@@ -2489,7 +2489,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
DumpXMP(xmpContent, xmpLength, offset, "XMP");
LFA_Seek(file, keep, SEEK_SET, &ok);
assertMsg("seek failed", ok);
- mime_item_id = NULL;
+ mime_item_id = 0;
}
}
break;
@@ -2641,7 +2641,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif");
LFA_Seek(file, keep, SEEK_SET, &ok);
assertMsg("seek failed", ok);
- exif_item_id = NULL;
+ exif_item_id = 0;
}
}
//Get the data for xmp - using value from mime_item_id
@@ -2659,7 +2659,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
DumpXMP(xmpContent, xmpLength, offset, "XMP");
LFA_Seek(file, keep, SEEK_SET, &ok);
assertMsg("seek failed", ok);
- mime_item_id = NULL;
+ mime_item_id = 0;
}
}