From 97ae681c77222ca57270a6c75b44f6b0c21a758b Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Mar 11 2024 09:34:19 +0000
Subject: groups.d/231.native_packages_etc.group: giflib: bump to v5.2.2


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 19e63aa..3013ee1 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -169,9 +169,10 @@ zstd";
 : ${PKG_GHOSTPDL_CONFIGURE_ARGS_EXTRA:="--with-system-libtiff --with-memory-alignment=8 --without-x --without-local-zlib"};
 : ${PKG_GHOSTPDL_ENV_VARS_EXTRA:="CCAUX=cc:CFLAGSAUX=${DEFAULT_CFLAGS} -L${PREFIX}/lib:LDFLAGSAUX=-L${PREFIX}/lib:SHARE_ZLIB=-lz:ZLIBDIR=${PREFIX}/include"};
 : ${PKG_GHOSTPDL_MAKEFLAGS_BUILD_EXTRA:="TARGET_ARCH_FILE=${BUILD_WORKDIR}/ghostpdl-native-${DEFAULT_TARGET}/ghostpdl-${PKG_GHOSTPDL_VERSION}/arch/${DEFAULT_TARGET}.h"};
-: ${PKG_GIFLIB_SHA256SUM:=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd};
-: ${PKG_GIFLIB_VERSION:=5.2.1};
+: ${PKG_GIFLIB_SHA256SUM:=be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb};
+: ${PKG_GIFLIB_VERSION:=5.2.2};
 : ${PKG_GIFLIB_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/giflib/giflib-${PKG_GIFLIB_VERSION}.tar.gz};
+: ${PKG_GIFLIB_CFLAGS_BUILD_EXTRA:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -std=gnu99 -DHAVE_REALLOCARRAY"};
 : ${PKG_GIFLIB_BUILD_DIR:=giflib-${PKG_GIFLIB_VERSION}};
 : ${PKG_GNUCHESS_DEPENS:="ncurses"};
 : ${PKG_GNUCHESS_SHA256SUM:=ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890};
diff --git a/patches/giflib-5.2.1.local.patch b/patches/giflib-5.2.1.local.patch
deleted file mode 100644
index 597708b..0000000
--- a/patches/giflib-5.2.1.local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru giflib-5.2.1.orig/Makefile giflib-5.2.1/Makefile
---- giflib-5.2.1.orig/Makefile	2019-06-24 18:08:57.000000000 +0200
-+++ giflib-5.2.1/Makefile	2020-06-22 16:38:04.273418161 +0200
-@@ -61,7 +61,7 @@
- 
- LDLIBS=libgif.a -lm
- 
--all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
-+all: libgif.so libgif.a libutil.a $(UTILS)
- 	$(MAKE) -C doc
- 
- $(UTILS):: libgif.a libutil.a
diff --git a/patches/giflib-5.2.2.local.patch b/patches/giflib-5.2.2.local.patch
new file mode 100644
index 0000000..8452d9a
--- /dev/null
+++ b/patches/giflib-5.2.2.local.patch
@@ -0,0 +1,20 @@
+diff -ru giflib-5.2.2.orig/Makefile giflib-5.2.2/Makefile
+--- giflib-5.2.2.orig/Makefile	2024-02-19 02:01:50.000000000 +0100
++++ giflib-5.2.2/Makefile	2024-03-11 10:30:17.730765319 +0100
+@@ -8,7 +8,6 @@
+ #
+ OFLAGS = -O0 -g
+ OFLAGS  = -O2
+-CFLAGS  = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+ 
+ SHELL = /bin/sh
+ TAR = tar
+@@ -87,7 +86,7 @@
+ LIBUTILSOMAJOR	= libutil.$(LIBMAJOR).$(SOEXTENSION)
+ endif
+ 
+-all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
++all: $(LIBGIFSO) libgif.a libutil.a $(UTILS)
+ ifeq ($(UNAME), Darwin)
+ else
+ 	$(MAKE) -C doc