Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (3a8404d8bbe03692374d6a090ee17ddbb653b36f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (3a8404d8bbe03692374d6a090ee17ddbb653b36f)
  • Date: Fri, 30 Dec 2016 09:49:06 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

graphics-libs/gd/HISTORY | 4 +
graphics-libs/gd/PRE_BUILD | 5 -
graphics-libs/gd/libgd-fix-build-without-freetype.patch | 53
++++++++++++++++
3 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit 3a8404d8bbe03692374d6a090ee17ddbb653b36f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gd: fix buidling without freetype

diff --git a/graphics-libs/gd/HISTORY b/graphics-libs/gd/HISTORY
index 0a095e4..3fb9d14 100644
--- a/graphics-libs/gd/HISTORY
+++ b/graphics-libs/gd/HISTORY
@@ -1,3 +1,7 @@
+2016-12-30 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, libgd-fix-build-without-freetype.patch:
+ Fix buidling without freetype
+
2016-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.3, security update, fixes CVE-2016-5766,
CVE-2016-6132, CVE-2016-6214 CVE-2016-6207 and CVE-2016-6128
diff --git a/graphics-libs/gd/PRE_BUILD b/graphics-libs/gd/PRE_BUILD
index b20daeb..b8c8cea 100755
--- a/graphics-libs/gd/PRE_BUILD
+++ b/graphics-libs/gd/PRE_BUILD
@@ -1,5 +1,6 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < "${SPELL_DIRECTORY}/libgd-fix-build-without-freetype.patch" &&

if ! [ -f configure ]; then
./bootstrap.sh
diff --git a/graphics-libs/gd/libgd-fix-build-without-freetype.patch
b/graphics-libs/gd/libgd-fix-build-without-freetype.patch
new file mode 100644
index 0000000..603e315
--- /dev/null
+++ b/graphics-libs/gd/libgd-fix-build-without-freetype.patch
@@ -0,0 +1,53 @@
+From b7a01fe6e3a2b70c4f77f577947d36ae925dad06 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Wed, 10 Aug 2016 13:35:08 +0800
+Subject: [PATCH] gdft: fix build when freetype is disabled
+
+In file included from gdft.c:20:0:
+entities.h:17:4: error: 'entities' defined but not used
[-Werror=unused-variable]
+
+gdft.c:1741:15: error: 'font_path' defined but not used
[-Werror=unused-function]
+ static char * font_path(char **fontpath, char *name_list)
+---
+ src/gdft.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/gdft.c b/src/gdft.c
+index 9661f2b..57b3d79 100644
+--- a/src/gdft.c
++++ b/src/gdft.c
+@@ -17,7 +17,6 @@
+
+ #include "gd.h"
+ #include "gdhelpers.h"
+-#include "entities.h"
+ #include "gd_intern.h"
+
+ /* 2.0.10: WIN32, not MSWIN32 */
+@@ -46,7 +45,10 @@ static int fontConfigFlag = 0;
+ static char *font_pattern(char **fontpath, char *fontpattern);
+ #endif
+
++#ifdef HAVE_LIBFREETYPE
++#include "entities.h"
+ static char *font_path(char **fontpath, char *name_list);
++#endif
+
+ /* 2.0.30: move these up here so we can build correctly without freetype
+ but with fontconfig */
+@@ -1737,6 +1739,7 @@ static char * font_pattern(char **fontpath, char
*fontpattern)
+
+ #endif /* HAVE_LIBFONTCONFIG */
+
++#ifdef HAVE_LIBFREETYPE
+ /* Look up font using font names as file names. */
+ static char * font_path(char **fontpath, char *name_list)
+ {
+@@ -1855,6 +1858,7 @@ static char * font_path(char **fontpath, char
*name_list)
+ *fontpath = fullname;
+ return NULL;
+ }
++#endif
+
+ /*
+ Function: gdFTUseFontConfig



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (3a8404d8bbe03692374d6a090ee17ddbb653b36f), Remko van der Vossen, 12/30/2016

Archive powered by MHonArc 2.6.24.

Top of Page