[packages/giflib] - added extern patch (add C extern guards in gif_util.h); release 2

qboosh qboosh at pld-linux.org
Thu Aug 29 20:06:50 CEST 2024


commit 6ddce2a8eaba76ed165dc479d7b553756e23d303
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Aug 29 19:52:27 2024 +0200

    - added extern patch (add C extern guards in gif_util.h); release 2

 giflib-extern.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 giflib.spec         |  4 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)
---
diff --git a/giflib.spec b/giflib.spec
index 6770034..36de440 100644
--- a/giflib.spec
+++ b/giflib.spec
@@ -10,12 +10,13 @@ Summary(ru.UTF-8):	Библиотека для работы с GIF-файлам
 Summary(uk.UTF-8):	Бібліотека для роботи з GIF-файлами
 Name:		giflib
 Version:	5.2.2
-Release:	1
+Release:	2
 License:	MIT-like
 Group:		Libraries
 Source0:	https://downloads.sourceforge.net/giflib/%{name}-%{version}.tar.gz
 # Source0-md5:	913dd251492134e235ee3c9a91987a4d
 Patch0:		%{name}-make.patch
+Patch1:		%{name}-extern.patch
 URL:		https://sourceforge.net/projects/giflib/
 BuildRequires:	ImageMagick
 BuildRequires:	gcc >= 5:3.2
@@ -143,6 +144,7 @@ GIF.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
diff --git a/giflib-extern.patch b/giflib-extern.patch
new file mode 100644
index 0000000..40e507f
--- /dev/null
+++ b/giflib-extern.patch
@@ -0,0 +1,47 @@
+--- giflib-5.2.2/gif_lib.h.orig	2024-02-19 08:35:14.000000000 +0100
++++ giflib-5.2.2/gif_lib.h	2024-08-29 19:25:22.379409692 +0200
+@@ -9,10 +9,6 @@ SPDX-License-Identifier: MIT
+ #ifndef _GIF_LIB_H_
+ #define _GIF_LIB_H_ 1
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif /* __cplusplus */
+-
+ #define GIFLIB_MAJOR 5
+ #define GIFLIB_MINOR 2
+ #define GIFLIB_RELEASE 2
+@@ -29,6 +25,10 @@ extern "C" {
+ #define GIF87_STAMP "GIF87a" /* First chars in file - GIF stamp.  */
+ #define GIF89_STAMP "GIF89a" /* First chars in file - GIF stamp.  */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef unsigned char GifPixelType;
+ typedef unsigned char *GifRowType;
+ typedef unsigned char GifByteType;
+--- giflib-5.2.2/getarg.h.orig	2024-02-19 03:20:00.000000000 +0100
++++ giflib-5.2.2/getarg.h	2024-08-29 19:29:19.581457992 +0200
+@@ -23,6 +23,10 @@ SPDX-License-Identifier: MIT
+ #define CMD_ERR_NumRead 4   /* Failed on reading number. */
+ #define CMD_ERR_AllSatis 5  /* Fail to satisfy (must-'!') option. */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ bool GAGetArgs(int argc, char **argv, char *CtrlStr, ...);
+ void GAPrintErrMsg(int Error);
+ void GAPrintHowTo(char *CtrlStr);
+@@ -49,6 +53,9 @@ int GifQuantizeBuffer(unsigned int Width
+ 		exit(-3);                                                      \
+ 	}
+ 
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* _GETARG_H */
+ 
+ /* end */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/giflib.git/commitdiff/6ddce2a8eaba76ed165dc479d7b553756e23d303



More information about the pld-cvs-commit mailing list