summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2023-11-04 07:43:04 -0500
committerBen Kohler <bkohler@gentoo.org>2023-11-04 07:43:40 -0500
commiteefddc92a4e972321eefd80796fd4cfdd6ca9b67 (patch)
treed0a680d78e7ee11247a2d39b8e2cc71b48f4ba0c /media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch
parentnet-analyzer/tcptrace: Stabilize 6.6.7_p6-r1 x86, #916848 (diff)
downloadgentoo-eefddc92a4e972321eefd80796fd4cfdd6ca9b67.tar.gz
gentoo-eefddc92a4e972321eefd80796fd4cfdd6ca9b67.tar.bz2
gentoo-eefddc92a4e972321eefd80796fd4cfdd6ca9b67.zip
media-gfx/dcraw: fix build for glibc-2.38
Bug: https://bugs.gentoo.org/911753 Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch')
-rw-r--r--media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch b/media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch
new file mode 100644
index 000000000000..6ef89c2f5eec
--- /dev/null
+++ b/media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch
@@ -0,0 +1,24 @@
+Index: dcraw/parse.c
+===================================================================
+--- dcraw.orig/parse.c
++++ dcraw/parse.c
+@@ -1213,7 +1213,7 @@ void parse_qt (int level, int end)
+ }
+ }
+
+-char *memmem (char *haystack, size_t haystacklen,
++static void *my_memmem (char *haystack, size_t haystacklen,
+ char *needle, size_t needlelen)
+ {
+ char *c;
+@@ -1239,8 +1239,8 @@ void identify()
+ tread (head, 1, 32, ifp);
+ tseek (ifp, 0, SEEK_END);
+ fsize = ftell(ifp);
+- if ((cp = memmem (head, 32, "MMMM", 4)) ||
+- (cp = memmem (head, 32, "IIII", 4))) {
++ if ((cp = my_memmem (head, 32, "MMMM", 4)) ||
++ (cp = my_memmem (head, 32, "IIII", 4))) {
+ parse_phase_one (cp-head);
+ if (cp-head) parse_tiff (0,0);
+ } else if (order == 0x4949 || order == 0x4d4d) {