[packages/gd] add upstream revert of api breakage; rel 2

atler atler at pld-linux.org
Fri Jun 3 12:17:14 CEST 2022


commit 68837b4bcc8f692e584db366ed301a76f6286680
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jun 3 12:15:01 2022 +0200

    add upstream revert of api breakage; rel 2
    
    constants used by php extension

 api-breakage.patch | 27 +++++++++++++++++++++++++++
 gd.spec            |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/gd.spec b/gd.spec
index 35324dc..6479826 100644
--- a/gd.spec
+++ b/gd.spec
@@ -18,7 +18,7 @@ Summary(pl.UTF-8):	Biblioteka do tworzenia grafiki w formacie PNG, JPEG
 Summary(pt_BR.UTF-8):	Biblioteca para manipulação de imagens
 Name:		gd
 Version:	2.3.3
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Libraries
 #Source0Download: https://github.com/libgd/libgd/releases
@@ -26,6 +26,7 @@ Source0:	https://github.com/libgd/libgd/releases/download/%{name}-%{version}/lib
 # Source0-md5:	7a58b54d375eda236414201252a0ee3c
 Patch0:		%{name}-fontpath.patch
 Patch1:		%{name}-loop.patch
+Patch2:		api-breakage.patch
 URL:		https://libgd.github.io/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -171,6 +172,7 @@ para uso pelos programas que usam a libgd.
 %setup -q -n libgd-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/api-breakage.patch b/api-breakage.patch
new file mode 100644
index 0000000..85ea9c0
--- /dev/null
+++ b/api-breakage.patch
@@ -0,0 +1,27 @@
+From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi at remirepo.net>
+Date: Mon, 13 Sep 2021 14:57:52 +0200
+Subject: [PATCH] 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 305603952..1ad9e6378 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
+  *
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gd.git/commitdiff/5a97143678112bab09515b616993e869b8f703db



More information about the pld-cvs-commit mailing list