summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz>2014-03-22 15:57:07 +0000
committerspz <spz>2014-03-22 15:57:07 +0000
commit062f60b675bc368c0bac36370f7dc5c72c7da894 (patch)
treec96420926599d737976cbab20cdcc5f6710c9db5
parent304ea4a717d8010ec113f5279b80dca20f1a55d4 (diff)
downloadpkgsrc-062f60b675bc368c0bac36370f7dc5c72c7da894.tar.gz
build fix following the freetype2 update
-rw-r--r--graphics/py-sk1libs/distinfo3
-rw-r--r--graphics/py-sk1libs/patches/patch-src_imaging_libimagingft___imagingft.c21
2 files changed, 23 insertions, 1 deletions
diff --git a/graphics/py-sk1libs/distinfo b/graphics/py-sk1libs/distinfo
index 925b29f90d9..a6aeb413df7 100644
--- a/graphics/py-sk1libs/distinfo
+++ b/graphics/py-sk1libs/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/01/12 07:57:58 adam Exp $
+$NetBSD: distinfo,v 1.2 2014/03/22 15:57:07 spz Exp $
SHA1 (sk1libs-0.9.1.tar.gz) = dd948558128bb6547b1f277087bf3066104912da
RMD160 (sk1libs-0.9.1.tar.gz) = 38f22205e0b5b6078e31ec6dc4c1d93845533046
Size (sk1libs-0.9.1.tar.gz) = 1019443 bytes
+SHA1 (patch-src_imaging_libimagingft___imagingft.c) = a52035a0601193114b98472c1a6c69e033ecb15d
diff --git a/graphics/py-sk1libs/patches/patch-src_imaging_libimagingft___imagingft.c b/graphics/py-sk1libs/patches/patch-src_imaging_libimagingft___imagingft.c
new file mode 100644
index 00000000000..de9e158e6fb
--- /dev/null
+++ b/graphics/py-sk1libs/patches/patch-src_imaging_libimagingft___imagingft.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_imaging_libimagingft___imagingft.c,v 1.1 2014/03/22 15:57:07 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- src/imaging/libimagingft/_imagingft.c.orig 2009-11-01 00:44:12.000000000 +0000
++++ src/imaging/libimagingft/_imagingft.c
+@@ -70,7 +70,14 @@ struct {
+ const char* message;
+ } ft_errors[] =
+
++#if defined(USE_FREETYPE_2_1)
++/* freetype 2.1 and newer */
++#include <ft2build.h>
++#include FT_ERRORS_H
++#else
++/* freetype 2.0 */
+ #include <freetype/fterrors.h>
++#endif
+
+ /* -------------------------------------------------------------------- */
+ /* font objects */