From 310d4b26e9774998ff7a3ff494c9c48eb21c1aac Mon Sep 17 00:00:00 2001
From: Flavio Heleno <flaviohbatista@gmail.com>
Date: Tue, 11 May 2021 21:06:04 -0300
Subject: [PATCH 1/2] Fix bundled libgd includes

---
 ext/gd/gd.c                     | 14 +++++++-------
 ext/gd/libgd/gd_crop.c          |  3 ++-
 ext/gd/libgd/gd_interpolation.c |  2 +-
 ext/gd/libgd/gd_wbmp.c          |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index dedbab181b35..fbe239b269ff 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -57,13 +57,13 @@
 
 #include "gd_compat.h"
 
-#include <gd.h>
-#include <gd_errors.h>
-#include <gdfontt.h>  /* 1 Tiny font */
-#include <gdfonts.h>  /* 2 Small font */
-#include <gdfontmb.h> /* 3 Medium bold font */
-#include <gdfontl.h>  /* 4 Large font */
-#include <gdfontg.h>  /* 5 Giant font */
+#include "libgd/gd.h"
+#include "libgd/gd_errors.h"
+#include "libgd/gdfontt.h"  /* 1 Tiny font */
+#include "libgd/gdfonts.h"  /* 2 Small font */
+#include "libgd/gdfontmb.h" /* 3 Medium bold font */
+#include "libgd/gdfontl.h"  /* 4 Large font */
+#include "libgd/gdfontg.h"  /* 5 Giant font */
 
 #if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
 # include <ft2build.h>
diff --git a/ext/gd/libgd/gd_crop.c b/ext/gd/libgd/gd_crop.c
index b4bff2700688..676545c4dbc9 100644
--- a/ext/gd/libgd/gd_crop.c
+++ b/ext/gd/libgd/gd_crop.c
@@ -19,11 +19,12 @@
  *  (end code)
  **/
 
-#include <gd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
+#include "gd.h"
+
 static int gdGuessBackgroundColorFromCorners(gdImagePtr im, int *color);
 static int gdColorMatch(gdImagePtr im, int col1, int col2, float threshold);
 
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index a7cf69165cae..3fce0100e8d9 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -58,7 +58,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <gd.h>
+#include "gd.h"
 #include "gdhelpers.h"
 
 #ifdef _MSC_VER
diff --git a/ext/gd/libgd/gd_wbmp.c b/ext/gd/libgd/gd_wbmp.c
index 13dc9e38d618..22d1c4f4c66d 100644
--- a/ext/gd/libgd/gd_wbmp.c
+++ b/ext/gd/libgd/gd_wbmp.c
@@ -51,13 +51,13 @@
    ----------------------------------------------------------------------------
  */
 
-#include <gd.h>
-#include <gdfonts.h>
-#include <gd_errors.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
 
+#include "gd.h"
+#include "gdfonts.h"
+#include "gd_errors.h"
 #include "wbmp.h"
 
 

From 5d50c68a0fe099d2733f814d9aa7c4b24082ef27 Mon Sep 17 00:00:00 2001
From: Flavio Heleno <flaviohbatista@gmail.com>
Date: Wed, 12 May 2021 08:36:43 -0300
Subject: [PATCH 2/2] Ensure external libgd support is not broken

---
 ext/gd/gd.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index fbe239b269ff..b6e094bc38cc 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -57,13 +57,23 @@
 
 #include "gd_compat.h"
 
-#include "libgd/gd.h"
-#include "libgd/gd_errors.h"
-#include "libgd/gdfontt.h"  /* 1 Tiny font */
-#include "libgd/gdfonts.h"  /* 2 Small font */
-#include "libgd/gdfontmb.h" /* 3 Medium bold font */
-#include "libgd/gdfontl.h"  /* 4 Large font */
-#include "libgd/gdfontg.h"  /* 5 Giant font */
+#ifdef HAVE_GD_BUNDLED
+# include "libgd/gd.h"
+# include "libgd/gd_errors.h"
+# include "libgd/gdfontt.h"  /* 1 Tiny font */
+# include "libgd/gdfonts.h"  /* 2 Small font */
+# include "libgd/gdfontmb.h" /* 3 Medium bold font */
+# include "libgd/gdfontl.h"  /* 4 Large font */
+# include "libgd/gdfontg.h"  /* 5 Giant font */
+#else
+# include <gd.h>
+# include <gd_errors.h>
+# include <gdfontt.h>  /* 1 Tiny font */
+# include <gdfonts.h>  /* 2 Small font */
+# include <gdfontmb.h> /* 3 Medium bold font */
+# include <gdfontl.h>  /* 4 Large font */
+# include <gdfontg.h>  /* 5 Giant font */
+#endif
 
 #if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
 # include <ft2build.h>