From 61f0deb3148f3ff785683a7106b761c928ed49c2 Mon Sep 17 00:00:00 2001 From: Jing Zhang Date: Wed, 19 Apr 2023 10:57:02 +0800 Subject: [PATCH] Remove libgd-flip.patch Signed-off-by: Jing Zhang --- gd.spec | 10 +++++----- libgd-flip.patch | 50 ------------------------------------------------ 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 libgd-flip.patch diff --git a/gd.spec b/gd.spec index da74601..5bc37c0 100644 --- a/gd.spec +++ b/gd.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %bcond_with liq %bcond_with raqm %bcond_with avif @@ -12,10 +12,8 @@ License: MIT URL: http://libgd.github.io/ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz -# 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 +Patch0: libgd-iostream.patch BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) >= 9.8.3 @@ -81,7 +79,6 @@ The %{name}-doc package contains documentation files for %{name} %prep %setup -q -n libgd-%{version} %patch0 -p1 -%patch1 -p1 %build # Provide a correct default font search path @@ -147,6 +144,9 @@ rm -fr %{buildroot}%{_datadir}/doc/* %doc CHANGELOG.md CONTRIBUTORS CONTRIBUTING.md README.md %changelog +* Wed Apr 19 2023 Jing Zhang - 2.3.3-6 +- Remove libgd-flip.patch + * Mon Mar 27 2023 Xuchun Shang - 2.3.3-5 - Remove build require for liberation-sans-fonts - Add abi file and doc pkg diff --git a/libgd-flip.patch b/libgd-flip.patch deleted file mode 100644 index 4fa964f..0000000 --- a/libgd-flip.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 -- Gitee