From ed50b51c04bd303fc5043b1bfb63aa53a90a7f17 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Mon, 8 Mar 2021 08:46:53 +0100 Subject: [PATCH 01/39] rebase to version 2.3.2 --- .gitignore | 1 + gd.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 06c7b99..fd789a9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ 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 diff --git a/gd.spec b/gd.spec index b19861e..54321ba 100644 --- a/gd.spec +++ b/gd.spec @@ -4,7 +4,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ @@ -164,6 +164,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Mar 08 2021 Ondrej Dubaj - 2.3.2-1 +- rebase to version 2.3.2 + * Wed Feb 3 2021 Filip Januš - 2.3.1-1 - Upstream released new version 2.3.1 - patch bug615 is no more needed - fixed by upstream in release diff --git a/sources b/sources index d9cd306..a6d5c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgd-2.3.1.tar.xz) = 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80 +SHA512 (libgd-2.3.2.tar.xz) = a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2 From 3147fefdfdd062b964b06efc7149e7453900ca6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Mar 2021 15:21:47 +0100 Subject: [PATCH 02/39] enable avif support use bcond --- gd.spec | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gd.spec b/gd.spec index 54321ba..f216b7a 100644 --- a/gd.spec +++ b/gd.spec @@ -1,11 +1,17 @@ -%global with_liq 1 -%global with_raqm 1 +# Enabled by default +%bcond_without liq +%bcond_without raqm +%bcond_without avif + +# Not available in Fedora, only in rpmfusion +# Also see https://github.com/libgd/libgd/issues/678 segfault +%bcond_with heif Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 1%{?prever}%{?short}%{?dist} +Release: 2%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -25,12 +31,18 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libwebp-devel -%if %{with_liq} +%if %{with liq} BuildRequires: libimagequant-devel %endif -%if %{with_raqm} +%if %{with raqm} BuildRequires: libraqm-devel %endif +%if %{with avif} +BuildRequires: libavif-devel +%endif +%if %{with heif} +BuildRequires: libheif-devel +%endif BuildRequires: libX11-devel BuildRequires: libXpm-devel BuildRequires: zlib-devel @@ -74,12 +86,18 @@ Requires: libwebp-devel%{?_isa} Requires: libX11-devel%{?_isa} Requires: libXpm-devel%{?_isa} Requires: zlib-devel%{?_isa} -%if %{with_liq} +%if %{with liq} Requires: libimagequant-devel%{?_isa} %endif -%if %{with_raqm} +%if %{with raqm} Requires: libraqm-devel %endif +%if %{with avif} +Requires: libavif-devel +%endif +%if %{with heif} +Requires: libheif-devel +%endif %description devel @@ -164,6 +182,10 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Mar 8 2021 Remi Collet - 2.3.2-2 +- enable avif support +- use bcond + * Mon Mar 08 2021 Ondrej Dubaj - 2.3.2-1 - rebase to version 2.3.2 From b81dacf96690c269f5f09b495121cde547050c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Wed, 17 Mar 2021 11:04:22 +0100 Subject: [PATCH 03/39] Add condition if fedora for packages not available in RHEL --- gd.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gd.spec b/gd.spec index f216b7a..a144825 100644 --- a/gd.spec +++ b/gd.spec @@ -1,8 +1,13 @@ +%if 0%{?rhel} +%bcond_with liq +%bcond_with raqm +%bcond_with avif +%else # Enabled by default %bcond_without liq %bcond_without raqm %bcond_without avif - +%endif # Not available in Fedora, only in rpmfusion # Also see https://github.com/libgd/libgd/issues/678 segfault %bcond_with heif @@ -11,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 2%{?prever}%{?short}%{?dist} +Release: 3%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -21,8 +26,6 @@ Source0: libgd-%{version}-%{commit}.tgz %else Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz %endif -# Missing, temporary workaround, fixed upstream for next version -Source1: https://raw.githubusercontent.com/libgd/libgd/gd-%{version}/config/getlib.sh BuildRequires: freetype-devel BuildRequires: fontconfig-devel @@ -107,7 +110,6 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q -n libgd-%{version}%{?prever:-%{prever}} -install -m 0755 %{SOURCE1} config/ : $(perl config/getver.pl) @@ -153,9 +155,10 @@ 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 : Upstream test suite make check @@ -182,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Mar 17 2021 Filip Januš - 2.3.2-3 +- Add condition if fedora for packages not available in RHEL + * Mon Mar 8 2021 Remi Collet - 2.3.2-2 - enable avif support - use bcond From d79d40c91884b00eda7586e049a2fd60870bde59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 29 Mar 2021 23:25:31 +0200 Subject: [PATCH 04/39] Rebuild for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index a144825..9015c92 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 3%{?prever}%{?short}%{?dist} +Release: 4%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Mar 29 2021 Robert-André Mauchin - 2.3.2-4 +- Rebuild for libavif soname bump + * Wed Mar 17 2021 Filip Januš - 2.3.2-3 - Add condition if fedora for packages not available in RHEL From 5bdcbb1ca5fdb5ed821a9e5568e4b4bebcbe3e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 23 May 2021 20:40:52 +0200 Subject: [PATCH 05/39] Rebuild for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 9015c92..1367a04 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 4%{?prever}%{?short}%{?dist} +Release: 5%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Sun May 23 2021 Robert-André Mauchin - 2.3.2-5 +- Rebuild for libavif soname bump + * Mon Mar 29 2021 Robert-André Mauchin - 2.3.2-4 - Rebuild for libavif soname bump From 36135175c4af8a5d8ad01d7c2466670001fa90e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 19 Jul 2021 22:39:29 +0200 Subject: [PATCH 06/39] Rebuild for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 1367a04..887ad2c 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 5%{?prever}%{?short}%{?dist} +Release: 6%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Jul 19 2021 Robert-André Mauchin - 2.3.2-6 +- Rebuild for libavif soname bump + * Sun May 23 2021 Robert-André Mauchin - 2.3.2-5 - Rebuild for libavif soname bump From 9ee1cda69e2ffa92fbda4d2f5762ee38afdc849f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:53:31 +0000 Subject: [PATCH 07/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 887ad2c..729c740 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 6%{?prever}%{?short}%{?dist} +Release: 7%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 19 2021 Robert-André Mauchin - 2.3.2-6 - Rebuild for libavif soname bump From 87692e31f63a324ceeafcd400f71cd1768909788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 22 Jul 2021 08:53:28 +0200 Subject: [PATCH 08/39] Rebuild for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 729c740..73bac9a 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 7%{?prever}%{?short}%{?dist} +Release: 8%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jul 22 2021 Robert-André Mauchin - 2.3.2-8 +- Rebuild for libavif soname bump + * Wed Jul 21 2021 Fedora Release Engineering - 2.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d1b1741b85e60f1d728c42d1ce075b9b88331ebe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 27 Jul 2021 19:14:28 +0200 Subject: [PATCH 09/39] Rebuild again for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 73bac9a..3ec515b 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.2 -Release: 8%{?prever}%{?short}%{?dist} +Release: 9%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -185,6 +185,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Tue Jul 27 2021 Florian Weimer - 2.3.2-9 +- Rebuild again for libavif soname bump + * Thu Jul 22 2021 Robert-André Mauchin - 2.3.2-8 - Rebuild for libavif soname bump From 929b9853b064584a0ecdd3dd025901a728ef2d75 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Sep 2021 15:21:00 +0200 Subject: [PATCH 10/39] 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 --- .gitignore | 1 + gd.spec | 16 ++++++++++++-- libgd-flip.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++ libgd-iostream.patch | 35 +++++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 libgd-flip.patch create mode 100644 libgd-iostream.patch diff --git a/.gitignore b/.gitignore index fd789a9..b95fae7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ gd-2.0.35.tar.bz2 /libgd-2.3.0.tar.xz /libgd-2.3.1.tar.xz /libgd-2.3.2.tar.xz +/libgd-2.3.3.tar.xz diff --git a/gd.spec b/gd.spec index 3ec515b..8af6af3 100644 --- a/gd.spec +++ b/gd.spec @@ -15,8 +15,8 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd -Version: 2.3.2 -Release: 9%{?prever}%{?short}%{?dist} +Version: 2.3.3 +Release: 1%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -27,6 +27,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 +115,8 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q -n libgd-%{version}%{?prever:-%{prever}} +%patch0 -p1 +%patch1 -p1 : $(perl config/getver.pl) @@ -185,6 +192,11 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Sep 13 2021 Remi Collet - 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 - 2.3.2-9 - Rebuild again for libavif soname bump diff --git a/libgd-flip.patch b/libgd-flip.patch new file mode 100644 index 0000000..4fa964f --- /dev/null +++ b/libgd-flip.patch @@ -0,0 +1,50 @@ +From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001 +From: Remi Collet +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 +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 diff --git a/libgd-iostream.patch b/libgd-iostream.patch new file mode 100644 index 0000000..c80b3ec --- /dev/null +++ b/libgd-iostream.patch @@ -0,0 +1,35 @@ +From 01bcbdcae35b90de082012e639094c711a7aa2b3 Mon Sep 17 00:00:00 2001 +From: Remi Collet +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 + diff --git a/sources b/sources index a6d5c0b..4bad33c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgd-2.3.2.tar.xz) = a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2 +SHA512 (libgd-2.3.3.tar.xz) = aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c From d5127de01fe3a948cf2ab7cbd3f03af7f74dd3ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Sep 2021 15:28:11 +0200 Subject: [PATCH 11/39] Workaround to https://github.com/libgd/libgd/issues/763 --- gd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gd.spec b/gd.spec index 8af6af3..5c8349a 100644 --- a/gd.spec +++ b/gd.spec @@ -167,6 +167,9 @@ 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 From e8921493d7ddfd07189b9d19b030212a4f3c9f4d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Sep 2021 15:39:17 +0200 Subject: [PATCH 12/39] all tests pass now --- gd.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gd.spec b/gd.spec index 5c8349a..328d846 100644 --- a/gd.spec +++ b/gd.spec @@ -161,12 +161,6 @@ 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 From 73bca05a7eec01ff87ec629209827d51023825d5 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 20 Sep 2021 14:29:33 +0100 Subject: [PATCH 13/39] Explicitly enable gd/gd2 formats, wanted by perl bindings (#2005916) --- gd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 328d846..33f64f3 100644 --- a/gd.spec +++ b/gd.spec @@ -16,7 +16,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 1%{?prever}%{?short}%{?dist} +Release: 2%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -149,6 +149,7 @@ export CFLAGS="$CFLAGS -ffp-contract=off" %endif %configure \ + --enable-gd-formats \ --with-tiff=%{_prefix} \ --disable-rpath make %{?_smp_mflags} @@ -189,6 +190,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Sep 20 2021 Paul Howarth - 2.3.3-2 +- Explicitly enable gd/gd2 formats, wanted by perl bindings (#2005916) + * Mon Sep 13 2021 Remi Collet - 2.3.3-1 - update to 2.3.3 - open https://github.com/libgd/libgd/pull/766 missing macros From 0e79f9e82b49739a1d9b446c6a9518943578def4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Nov 2021 09:09:33 +0100 Subject: [PATCH 14/39] disable libraqm usage, see #2022957 --- gd.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gd.spec b/gd.spec index 33f64f3..26de3c4 100644 --- a/gd.spec +++ b/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 @@ -16,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 2%{?prever}%{?short}%{?dist} +Release: 3%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -190,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Sep 13 2021 Remi Collet - 2.3.3-3 +- disable libraqm usage, see #2022957 + * Mon Sep 20 2021 Paul Howarth - 2.3.3-2 - Explicitly enable gd/gd2 formats, wanted by perl bindings (#2005916) From b94a8608fa36d8fe79a5bc97d7981d0121cfc71a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Nov 2021 09:10:47 +0100 Subject: [PATCH 15/39] fix date --- gd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 26de3c4..93f4ac3 100644 --- a/gd.spec +++ b/gd.spec @@ -192,7 +192,7 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog -* Mon Sep 13 2021 Remi Collet - 2.3.3-3 +* Fri Nov 19 2021 Remi Collet - 2.3.3-3 - disable libraqm usage, see #2022957 * Mon Sep 20 2021 Paul Howarth - 2.3.3-2 From 108109b5e00d0e9d78672b3b3db6e77169e0dbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 29 Nov 2021 17:54:31 +0100 Subject: [PATCH 16/39] Rebuild for libavif soname bump --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 93f4ac3..f863f3d 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 3%{?prever}%{?short}%{?dist} +Release: 4%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Nov 29 2021 Robert-André Mauchin - 2.3.3-4 +- Rebuild for libavif soname bump + * Fri Nov 19 2021 Remi Collet - 2.3.3-3 - disable libraqm usage, see #2022957 From 8606558b1a2dcc5a74daf511bb42913273e362e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:01:44 +0000 Subject: [PATCH 17/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index f863f3d..9bb9a52 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 4%{?prever}%{?short}%{?dist} +Release: 5%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 29 2021 Robert-André Mauchin - 2.3.3-4 - Rebuild for libavif soname bump From d33cb816a61950a92eb2d87426f9a5f1d7a706ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 22 Jun 2022 16:38:43 +0200 Subject: [PATCH 18/39] Rebuild for new libavif From 9b3b0202ea9fbe47ada73e249c3721472fd42ff0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 04:14:05 +0000 Subject: [PATCH 19/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 9bb9a52..e00679f 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 5%{?prever}%{?short}%{?dist} +Release: 6%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7d55f74d25a02034f3a1c31801a6b32ca0d8a691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 23 Oct 2022 19:59:25 +0200 Subject: [PATCH 20/39] Rebuild for new libavif --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index e00679f..fc03794 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 6%{?prever}%{?short}%{?dist} +Release: 7%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Sun Oct 23 2022 Robert-André Mauchin - 2.3.3-7 +- Rebuild for new libavif + * Thu Jul 21 2022 Fedora Release Engineering - 2.3.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d027ecf8df4423140aa965110dca20a0c8b7fabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 23 Oct 2022 21:21:59 +0200 Subject: [PATCH 21/39] Rebuild for new libavif --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index fc03794..73e8279 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 7%{?prever}%{?short}%{?dist} +Release: 8%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Sun Oct 23 2022 Robert-André Mauchin - 2.3.3-8 +- Rebuild for new libavif + * Sun Oct 23 2022 Robert-André Mauchin - 2.3.3-7 - Rebuild for new libavif From 7218bb5984af9dc9c543fe9eb833669a5456b781 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 1 Dec 2022 18:07:01 +0100 Subject: [PATCH 22/39] Rebuild for new libavif --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 73e8279..934b958 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 8%{?prever}%{?short}%{?dist} +Release: 9%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Dec 01 2022 Kalev Lember - 2.3.3-9 +- Rebuild for new libavif + * Sun Oct 23 2022 Robert-André Mauchin - 2.3.3-8 - Rebuild for new libavif From 3de2885b1fb80b988c6719c8df80fc5164be06a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:28:55 +0000 Subject: [PATCH 23/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 934b958..7cb30ae 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 9%{?prever}%{?short}%{?dist} +Release: 10%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 01 2022 Kalev Lember - 2.3.3-9 - Rebuild for new libavif From d5f9f168fc8f374f2042c89764d1223cbefc4b75 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 4 Mar 2023 06:22:26 +0100 Subject: [PATCH 24/39] Rebuild (libimagequant) --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 7cb30ae..b2e23f2 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 10%{?prever}%{?short}%{?dist} +Release: 11%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Sat Mar 04 2023 Sandro Mani - 2.3.3-11 +- Rebuild (libimagequant) + * Thu Jan 19 2023 Fedora Release Engineering - 2.3.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3a56a132c6aca9beb18b60ced4cb1514ea79724a Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Mon, 6 Mar 2023 09:39:32 +0100 Subject: [PATCH 25/39] migrated to SPDX license From f6d849bb1558db8c31b98a763b9278c125c3ffbe Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Mon, 6 Mar 2023 10:03:17 +0100 Subject: [PATCH 26/39] Fix licence to GD https://spdx.org/licenses/GD.html --- gd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index b2e23f2..22e738e 100644 --- a/gd.spec +++ b/gd.spec @@ -19,7 +19,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 Release: 11%{?prever}%{?short}%{?dist} -License: MIT +License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} # git clone https://github.com/libgd/libgd.git; cd gd-libgd From fb21de21861d8596106dcb9010a0d46b13e2f095 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 28 Jun 2023 16:16:50 -0400 Subject: [PATCH 27/39] Fix build with -march=x86-64-v3 While it hasn't been necessary for x86_64 baseline, setting -march=x86-64-v3 (as in ELN) triggers test failures in gdimagecopyresampled/bug00201 and gdimagegrayscale/basic. Adding -ffp-contract=off as on most other arches avoids that. --- gd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 22e738e..9c0f666 100644 --- a/gd.spec +++ b/gd.spec @@ -145,7 +145,7 @@ 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 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1359680 export CFLAGS="$CFLAGS -ffp-contract=off" %endif From e6c68b14f1f69dc44243b70be0849fb35d72ede1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:54:17 +0000 Subject: [PATCH 28/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 9c0f666..057d8b4 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 11%{?prever}%{?short}%{?dist} +Release: 12%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Mar 04 2023 Sandro Mani - 2.3.3-11 - Rebuild (libimagequant) From 85c16c5f541595f2f2cac0d0841b4f73381b155f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 20:22:52 +0000 Subject: [PATCH 29/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 057d8b4..1382f27 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 12%{?prever}%{?short}%{?dist} +Release: 13%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ff7dcbb625abd47a90644807d0dab74dd3fb649f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:37:27 +0000 Subject: [PATCH 30/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 1382f27..ac033cf 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 13%{?prever}%{?short}%{?dist} +Release: 14%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.3.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d6e08362f428258bbaf36bf71941cc592f27e6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 31 Jan 2024 16:25:44 +0100 Subject: [PATCH 31/39] Rebuilt for libavif 1.0.3 --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index ac033cf..7083c0f 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 14%{?prever}%{?short}%{?dist} +Release: 15%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jan 31 2024 František Zatloukal - 2.3.3-15 +- Rebuilt for libavif 1.0.3 + * Wed Jan 24 2024 Fedora Release Engineering - 2.3.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 91aa2f072ab6e6069945b901b3147831fd3f1624 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 13 Dec 2023 15:25:50 +0200 Subject: [PATCH 32/39] Enable -ffp-contract=off for riscv64 Signed-off-by: David Abdurachmanov --- gd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 7083c0f..0afbaa4 100644 --- a/gd.spec +++ b/gd.spec @@ -145,7 +145,7 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\ CFLAGS="$CFLAGS -msse -mfpmath=sse" %endif -%ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 +%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 From 868a48cf0df340fc4a7658ffd07e56be22fbf145 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Mar 2024 12:03:19 +0000 Subject: [PATCH 33/39] Bump and rebuild package (for riscv64) --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 0afbaa4..a7410b3 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 15%{?prever}%{?short}%{?dist} +Release: 16%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Mar 06 2024 Richard W.M. Jones - 2.3.3-16 +- Bump and rebuild package (for riscv64) + * Wed Jan 31 2024 František Zatloukal - 2.3.3-15 - Rebuilt for libavif 1.0.3 From 28a7ac481ea19989414b6d011d1b1555d866d3e1 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 34/39] Eliminate use of obsolete %patchN syntax (#2283636) --- gd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gd.spec b/gd.spec index a7410b3..0a3561f 100644 --- a/gd.spec +++ b/gd.spec @@ -117,8 +117,8 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q -n libgd-%{version}%{?prever:-%{prever}} -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 : $(perl config/getver.pl) From c47b15e0da109b8157b6562d51e8fe1b6d510c26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 00:17:00 +0000 Subject: [PATCH 35/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 0a3561f..5a7ba28 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 16%{?prever}%{?short}%{?dist} +Release: 17%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.3.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Mar 06 2024 Richard W.M. Jones - 2.3.3-16 - Bump and rebuild package (for riscv64) From fee8c1495e82652ab6b9b1201180ba0b99773181 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:35:32 +0000 Subject: [PATCH 36/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 5a7ba28..4d25aca 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 17%{?prever}%{?short}%{?dist} +Release: 18%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 2.3.3-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 21929bf17b0dc1489a83cbba54093ecc1809c7a2 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Sun, 2 Feb 2025 21:54:39 +0000 Subject: [PATCH 37/39] gcc now uses std=gnu23 Use std=gnu17 to avoid errors --- gd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index 4d25aca..eb5f0ce 100644 --- a/gd.spec +++ b/gd.spec @@ -133,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:\ From a641c09bbc2be46de2bf3b35d4603c694e638aef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 21:10:43 +0000 Subject: [PATCH 38/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index eb5f0ce..dbfedeb 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 18%{?prever}%{?short}%{?dist} +Release: 19%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 773db4a7db9fac7962543c0913bf74d33d1d1f4e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 9 Sep 2025 22:25:59 +0200 Subject: [PATCH 39/39] Rebuild (libimagequant) --- gd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gd.spec b/gd.spec index dbfedeb..7f22720 100644 --- a/gd.spec +++ b/gd.spec @@ -18,7 +18,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.3.3 -Release: 19%{?prever}%{?short}%{?dist} +Release: 20%{?prever}%{?short}%{?dist} License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -192,6 +192,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Tue Sep 09 2025 Sandro Mani - 2.3.3-20 +- Rebuild (libimagequant) + * Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild