diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2018-02-28 20:43:21 +0100 |
|---|---|---|
| committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2018-03-08 09:05:52 +0100 |
| commit | 7ac43c44e80541a53ed1751de904b0d8a5dc3a4a (patch) | |
| tree | b91a5670d1050b24c70e73a627026cc3274b0177 /gnu/packages/image.scm | |
| parent | 254a88199f32d35e39c8913bc557ea2db69bd04e (diff) | |
| download | gnu-guix-7ac43c44e80541a53ed1751de904b0d8a5dc3a4a.tar gnu-guix-7ac43c44e80541a53ed1751de904b0d8a5dc3a4a.tar.gz | |
gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.
Rename the function and 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/
* gnu/packages/patches/giflib-make-reallocarray-private.patch: New
file
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/image.scm(giflib)[source](patches): New field.
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc7..a397189037 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -572,7 +572,9 @@ error-resilience, a Java-viewer for j2k-images, ...") version ".tar.bz2")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) + "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) + (patches (search-patches + "giflib-make-reallocarray-private.patch")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library |