aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-03-23 12:28:59 +0800
committermarcus <marcus@FreeBSD.org>2004-03-23 12:28:59 +0800
commit56def019a3082885b05981ac18172a30257297d5 (patch)
tree716ea6d7362f87d8a4a6b91714907bfb93a45737
parenta1a72c589901b0c402532d08ea5c63168d9e65c7 (diff)
downloadfreebsd-ports-graphics-56def019a3082885b05981ac18172a30257297d5.tar.gz
freebsd-ports-graphics-56def019a3082885b05981ac18172a30257297d5.tar.zst
freebsd-ports-graphics-56def019a3082885b05981ac18172a30257297d5.zip
Fix build with freetype2-2.1.7.
Reported by: bento via kris
-rw-r--r--graphics/panorama/files/patch-configure26
-rw-r--r--graphics/panorama/files/patch-plugins_image_filter_text_if_text.cpp12
-rw-r--r--graphics/py-imaging/files/patch-_imagingft.c12
3 files changed, 47 insertions, 3 deletions
diff --git a/graphics/panorama/files/patch-configure b/graphics/panorama/files/patch-configure
index 07dc917f009..31f8accd4bd 100644
--- a/graphics/panorama/files/patch-configure
+++ b/graphics/panorama/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig Wed Feb 12 13:06:57 2003
-+++ configure Sat Dec 13 16:06:49 2003
+--- configure.orig Tue Feb 11 23:06:57 2003
++++ configure Mon Mar 22 23:22:46 2004
@@ -7699,7 +7699,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18,7 +18,27 @@
fi
-@@ -10538,3 +10538,4 @@
+@@ -7964,7 +7964,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -7999,7 +8000,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -10538,3 +10540,4 @@
ln -s $ac_aux_dir/Makefile.deps . 2>/dev/null
ln -s $ac_aux_dir/install-sh . 2>/dev/null
diff --git a/graphics/panorama/files/patch-plugins_image_filter_text_if_text.cpp b/graphics/panorama/files/patch-plugins_image_filter_text_if_text.cpp
new file mode 100644
index 00000000000..cc265fa5caf
--- /dev/null
+++ b/graphics/panorama/files/patch-plugins_image_filter_text_if_text.cpp
@@ -0,0 +1,12 @@
+--- plugins/image_filter/text/if_text.cpp.orig Mon Mar 22 23:23:31 2004
++++ plugins/image_filter/text/if_text.cpp Mon Mar 22 23:23:43 2004
+@@ -18,7 +18,8 @@
+
+ #include <cmath>
+ #include <string.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "llapi/file.h"
+ #include "llapi/scene.h"
+ #include "if_text.h"
diff --git a/graphics/py-imaging/files/patch-_imagingft.c b/graphics/py-imaging/files/patch-_imagingft.c
new file mode 100644
index 00000000000..78da98e402c
--- /dev/null
+++ b/graphics/py-imaging/files/patch-_imagingft.c
@@ -0,0 +1,12 @@
+--- _imagingft.c.orig Mon Mar 22 23:27:33 2004
++++ _imagingft.c Mon Mar 22 23:28:03 2004
+@@ -15,7 +15,8 @@
+ #include "Python.h"
+ #include "Imaging.h"
+
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #if PY_VERSION_HEX < 0x01060000
+ #define PyObject_DEL(op) PyMem_DEL((op))