unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob d29ac05c82604cf5ee1c11d0b7bc351176abb6d4 1614 bytes (raw)
name: gnu/packages/patches/giflib-make-reallocarray-private.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
Move the declaration from gif_lib.h to gif_lib_private.h to solve
conflicts when some .c-file #includes both stdlib.h and gif_lib.h.
See also https://sourceforge.net/p/giflib/bugs/110/

diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c
--- giflib-5.1.4.orig/lib/gifalloc.c	2018-02-28 20:31:02.294682673 +0100
+++ giflib-5.1.4/lib/gifalloc.c	2018-02-28 20:39:12.093799085 +0100
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gif_lib.h"
+#include "gif_lib_private.h"
 
 #define MAX(x, y)    (((x) > (y)) ? (x) : (y))
 
diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h
--- giflib-5.1.4.orig/lib/gif_lib.h	2018-02-28 20:31:02.294682673 +0100
+++ giflib-5.1.4/lib/gif_lib.h	2018-02-28 20:31:43.135716712 +0100
@@ -244,9 +244,6 @@
                                      GifPixelType ColorTransIn2[]);
 extern int GifBitSize(int n);
 
-extern void *
-reallocarray(void *optr, size_t nmemb, size_t size);
-
 /******************************************************************************
  Support for the in-core structures allocation (slurp mode).              
 ******************************************************************************/
diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h
--- giflib-5.1.4.orig/lib/gif_lib_private.h	2018-02-28 20:31:02.294682673 +0100
+++ giflib-5.1.4/lib/gif_lib_private.h	2018-02-28 20:31:56.208257947 +0100
@@ -54,6 +54,9 @@
     bool gif89;
 } GifFilePrivateType;
 
+extern void *
+reallocarray(void *optr, size_t nmemb, size_t size);
+
 #endif /* _GIF_LIB_PRIVATE_H */
 
 /* end */

debug log:

solving d29ac05c8 ...
found d29ac05c8 in https://yhetil.org/guix-patches/20180228201202.1481-1-h.goebel@crazy-compilers.com/

applying [1/1] https://yhetil.org/guix-patches/20180228201202.1481-1-h.goebel@crazy-compilers.com/
diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch
new file mode 100644
index 000000000..d29ac05c8

1:17: trailing whitespace.
 
1:20: trailing whitespace.
 
1:22: trailing whitespace.
 
1:29: trailing whitespace.
 
1:34: trailing whitespace.
  Support for the in-core structures allocation (slurp mode).              
Checking patch gnu/packages/patches/giflib-make-reallocarray-private.patch...
Applied patch gnu/packages/patches/giflib-make-reallocarray-private.patch cleanly.
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.

index at:
100644 d29ac05c82604cf5ee1c11d0b7bc351176abb6d4	gnu/packages/patches/giflib-make-reallocarray-private.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).