Rebuild (libimagequant)

Use std=gnu17 to avoid errors

.gitignore

@@ -11,3 +11,5 @@ gd-2.0.35.tar.bz2
 /libgd-2.2.5.tar.xz
 /libgd-2.3.0.tar.xz
 /libgd-2.3.1.tar.xz
+/libgd-2.3.2.tar.xz
+/libgd-2.3.3.tar.xz

gd.spec

@@ -5,9 +5,11 @@
 %else
 # Enabled by default
 %bcond_without liq
-%bcond_without raqm
 %bcond_without avif
 %endif
+# disabled as breaks vertical text
+# See https://bugzilla.redhat.com/2022957
+%bcond_with    raqm
 # Not available in Fedora, only in rpmfusion
 # Also see https://github.com/libgd/libgd/issues/678 segfault
 %bcond_with    heif
@@ -15,9 +17,9 @@
 
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.3.2
-Release:       2%{?prever}%{?short}%{?dist}
-License:       MIT
+Version:       2.3.3
+Release:       20%{?prever}%{?short}%{?dist}
+License:       GD
 URL:           http://libgd.github.io/
 %if 0%{?commit:1}
 # git clone https://github.com/libgd/libgd.git; cd gd-libgd
@@ -27,6 +29,11 @@ Source0:       libgd-%{version}-%{commit}.tgz
 Source0:       https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
 %endif
 
+# Needed by PHP see https://github.com/libgd/libgd/pull/766
+Patch0:        libgd-flip.patch
+# Missing header see https://github.com/libgd/libgd/pull/766
+Patch1:        libgd-iostream.patch
+
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
 BuildRequires: gettext-devel
@@ -110,6 +117,8 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
 
 %prep
 %setup -q -n libgd-%{version}%{?prever:-%{prever}}
+%patch -P0 -p1
+%patch -P1 -p1
 
 : $(perl config/getver.pl)
 
@@ -124,7 +133,7 @@ fi
 
 %build
 # Provide a correct default font search path
-CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
+CFLAGS="-std=gnu17 $RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
 /usr/share/fonts/bitstream-vera:\
 /usr/share/fonts/dejavu:\
 /usr/share/fonts/default/Type1:\
@@ -136,12 +145,13 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
 CFLAGS="$CFLAGS -msse -mfpmath=sse"
 %endif
 
-%ifarch aarch64 ppc64 ppc64le s390 s390x
+%ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 riscv64
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1359680
 export CFLAGS="$CFLAGS -ffp-contract=off"
 %endif
 
 %configure \
+    --enable-gd-formats \
     --with-tiff=%{_prefix} \
     --disable-rpath
 make %{?_smp_mflags}
@@ -154,11 +164,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 
 
 %check
-# minor diff in size
-%if %{with raqm}
-XFAIL_TESTS="gdimagestringft/gdimagestringft_bbox"
-export XFAIL_TESTS
-%endif
+# Workaround to https://github.com/libgd/libgd/issues/763
+export TMPDIR=/tmp
 
 : Upstream test suite
 make check
@@ -185,13 +192,94 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 
 %changelog
-* Mon Mar 29 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-2
+* Tue Sep 09 2025 Sandro Mani <manisandro@gmail.com> - 2.3.3-20
+- Rebuild (libimagequant)
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Mar 06 2024 Richard W.M. Jones <rjones@redhat.com> - 2.3.3-16
+- Bump and rebuild package (for riscv64)
+
+* Wed Jan 31 2024 František Zatloukal <fzatlouk@redhat.com> - 2.3.3-15
+- Rebuilt for libavif 1.0.3
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 2.3.3-11
+- Rebuild (libimagequant)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 01 2022 Kalev Lember <klember@redhat.com> - 2.3.3-9
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-8
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-7
+- Rebuild for new libavif
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 29 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-4
 - Rebuild for libavif soname bump
 
-* Wed Mar 17 2021 Filip Januš <fjanus@redhat.com> - 2.3.2-1
+* Fri Nov 19 2021 Remi Collet <remi@remirepo.net> - 2.3.3-3
+- disable libraqm usage, see #2022957
+
+* Mon Sep 20 2021 Paul Howarth <paul@city-fan.org> - 2.3.3-2
+- Explicitly enable gd/gd2 formats, wanted by perl bindings (#2005916)
+
+* Mon Sep 13 2021 Remi Collet <remi@remirepo.net> - 2.3.3-1
+- update to 2.3.3
+- open https://github.com/libgd/libgd/pull/766 missing macros
+- open https://github.com/libgd/libgd/pull/767 missing headers
+
+* Tue Jul 27 2021 Florian Weimer <fweimer@redhat.com> - 2.3.2-9
+- Rebuild again for libavif soname bump
+
+* Thu Jul 22 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-8
+- Rebuild for libavif soname bump
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-6
+- Rebuild for libavif soname bump
+
+* Sun May 23 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-5
+- Rebuild for libavif soname bump
+
+* Mon Mar 29 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-4
+- Rebuild for libavif soname bump
+
+* Wed Mar 17 2021 Filip Januš <fjanus@redhat.com> - 2.3.2-3
 - Add condition if fedora for packages not available in RHEL
+
+* Mon Mar  8 2021 Remi Collet <remi@remirepo.net> - 2.3.2-2
 - enable avif support
 - use bcond
+
+* Mon Mar 08 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.3.2-1
 - rebase to version 2.3.2
 
 * Wed Feb 3 2021 Filip Januš <fjanus@redhat.com> - 2.3.1-1

getlib.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+GETVER="${0%/*}/getver.pl"
+GDLIB_MAJOR=$("${GETVER}" MAJOR)
+GDLIB_MINOR=$("${GETVER}" MINOR)
+GDLIB_REVISION=$("${GETVER}" RELEASE)
+
+# Dynamic library version information
+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+
+GDLIB_LT_CURRENT=3
+# This is the version where the soname (current above) changes.  We use it
+# to reset the revision base back to zero.  It's a bit of a pain, but some
+# systems restrict the revision range below to [0..255] (like OS X).
+GDLIB_PREV_MAJOR=2
+GDLIB_PREV_MINOR=2
+# This isn't 100% correct, but it tends to be a close enough approximation
+# for how we manage the codebase.  It's rare to do a release that doesn't
+# modify the library since this project is centered around the library.
+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
+GDLIB_LT_AGE=0
+
+# The first three fields we feed into libtool and the OS target determines how
+# they get used.  The last two fields we feed into cmake.  We use the same rules
+# as Linux SONAME versioning in libtool, but cmake should handle it for us.
+case $1 in
+CURRENT)
+	printf '%s' "${GDLIB_LT_CURRENT}"
+	;;
+REVISION)
+	printf '%s' "${GDLIB_LT_REVISION}"
+	;;
+AGE)
+	printf '%s' "${GDLIB_LT_AGE}"
+	;;
+VERSION)
+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
+	;;
+SONAME)
+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
+	;;
+esac

libgd-flip.patch

@@ -0,0 +1,50 @@
+From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 14:57:52 +0200
+Subject: [PATCH 1/2] Revert "Fix #318, these macros are not used as planed, we
+ have separate functions for each"
+
+This reverts commit bdc281eadb1d58d5c0c7bbc1125ee4674256df08.
+---
+ src/gd.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/gd.h b/src/gd.h
+index 30560395..1ad9e637 100644
+--- a/src/gd.h
++++ b/src/gd.h
+@@ -1604,6 +1604,11 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+ 
++#define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
++#define GD_FLIP_HORIZONTAL 1
++#define GD_FLIP_VERTICAL 2
++#define GD_FLIP_BOTH 3
++
+ /**
+  * Group: Crop
+  *
+
+From e47c619d792455aad23708d2ec2947455394427e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 14:59:47 +0200
+Subject: [PATCH 2/2] add comment to not remove these macros
+
+---
+ src/gd.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gd.h b/src/gd.h
+index 1ad9e637..71f5a89c 100644
+--- a/src/gd.h
++++ b/src/gd.h
+@@ -1604,6 +1604,8 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+ 
++/* Macros still used in gd extension up to PHP 8.0
++   so please keep these unused macros for now */
+ #define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
+ #define GD_FLIP_HORIZONTAL 1
+ #define GD_FLIP_VERTICAL 2

libgd-iostream.patch

@@ -0,0 +1,35 @@
+From 01bcbdcae35b90de082012e639094c711a7aa2b3 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 15:05:18 +0200
+Subject: [PATCH] install missing header, used by gdpp.h
+
+---
+ src/CMakeLists.txt | 1 +
+ src/Makefile.am    | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3839bc78..c1eea100 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -194,6 +194,7 @@ install(FILES
+ 	gdfontt.h
+ 	gdfx.h
+ 	gdpp.h
++	gd_io_stream.h
+ 	DESTINATION include)
+ 
+ CONFIGURE_FILE(../config/gdlib.pc.cmake gdlib.pc @ONLY)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dbe9243c..c8c779f1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,7 +52,7 @@ EXTRA_DIST = \
+ 	msinttypes/inttypes.h \
+ 	msinttypes/stdint.h
+ 
+-include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gd_color_map.h gd_errors.h gdpp.h
++include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gd_color_map.h gd_errors.h gdpp.h gd_io_stream.h
+ 
+ lib_LTLIBRARIES = libgd.la
+ 

sources

@@ -1 +1 @@
-SHA512 (libgd-2.3.2.tar.xz) = a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
+SHA512 (libgd-2.3.3.tar.xz) = aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c