diff options
| author | markd <markd@pkgsrc.org> | 2013-12-12 01:04:14 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-12-12 01:04:14 +0000 |
| commit | 31b7acd766d5ece2d701876f13411f5dea42310a (patch) | |
| tree | 9a428f3b262a0d2c64a10b0bbe3027da97d93280 /print | |
| parent | d693236af3a489079aaa69d8bf7d076437762d93 (diff) | |
| download | pkgsrc-31b7acd766d5ece2d701876f13411f5dea42310a.tar.gz | |
Fix build wth freetype 2.5.x
Diffstat (limited to 'print')
4 files changed, 52 insertions, 1 deletions
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 38e26841fcb..f8c06f4d7ce 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2013/08/16 09:01:48 wiz Exp $ +$NetBSD: distinfo,v 1.34 2013/12/12 01:04:14 markd Exp $ SHA1 (libgnomeprint-2.18.8.tar.bz2) = cfb77148923b24b1651982a21b3cb55e312ff6d5 RMD160 (libgnomeprint-2.18.8.tar.bz2) = 4f786ad61dc27177c350a5baa27cfc8b1140c32e @@ -7,4 +7,7 @@ SHA1 (patch-aa) = 73dffa07cb1218b41784563dc822c08b3455fd59 SHA1 (patch-ab) = 04499f4ce10315b894d85228588c24e9576f4df3 SHA1 (patch-ac) = 907b2ec2c194ae10d7fe7eea6e2e52a128b5ca14 SHA1 (patch-ad) = c414b9176635c90b95764ca9291a14718f7cfa00 +SHA1 (patch-libgnomeprint_gnome-font-face.c) = 187b423832684a3812a4a298193d0aac30dff25c +SHA1 (patch-libgnomeprint_gnome-print-gdi.c) = f76d9e0d507de4681b13594176fe3f645903de07 +SHA1 (patch-libgnomeprint_gnome-rfont.c) = 8df1d055249bf735e0aa81783daf08735f206a96 SHA1 (patch-libgnomeprint_grammar.y) = 57551905603957304b5b8b09d19ed38587a5ccaa diff --git a/print/libgnomeprint/patches/patch-libgnomeprint_gnome-font-face.c b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-font-face.c new file mode 100644 index 00000000000..9866851f627 --- /dev/null +++ b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-font-face.c @@ -0,0 +1,16 @@ +$NetBSD: patch-libgnomeprint_gnome-font-face.c,v 1.1 2013/12/12 01:04:14 markd Exp $ + +Fix build with freetype 2.5.x + +--- libgnomeprint/gnome-font-face.c.orig 2010-02-09 12:32:51.000000000 +0000 ++++ libgnomeprint/gnome-font-face.c +@@ -36,7 +36,8 @@ + #include <stdarg.h> + #include <locale.h> + +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H + + #include <libgnomeprint/gnome-print-private.h> + #include <libgnomeprint/gnome-font-private.h> diff --git a/print/libgnomeprint/patches/patch-libgnomeprint_gnome-print-gdi.c b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-print-gdi.c new file mode 100644 index 00000000000..da0e5d85509 --- /dev/null +++ b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-print-gdi.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libgnomeprint_gnome-print-gdi.c,v 1.1 2013/12/12 01:04:14 markd Exp $ + +Fix build with freetype 2.5.x + +--- libgnomeprint/gnome-print-gdi.c.orig 2010-02-09 12:32:51.000000000 +0000 ++++ libgnomeprint/gnome-print-gdi.c +@@ -36,7 +36,7 @@ + #include <libgnomeprint/gp-gc-private.h> + + #include <ft2build.h> +-#include <freetype/freetype.h> ++#include FT_FREETYPE_H + + #define WIN32_LEAN_AND_MEAN + #include <windows.h> diff --git a/print/libgnomeprint/patches/patch-libgnomeprint_gnome-rfont.c b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-rfont.c new file mode 100644 index 00000000000..6fd1665f34a --- /dev/null +++ b/print/libgnomeprint/patches/patch-libgnomeprint_gnome-rfont.c @@ -0,0 +1,17 @@ +$NetBSD: patch-libgnomeprint_gnome-rfont.c,v 1.1 2013/12/12 01:04:14 markd Exp $ + +Fix build with freetype 2.5.x + +--- libgnomeprint/gnome-rfont.c.orig 2010-02-09 12:32:51.000000000 +0000 ++++ libgnomeprint/gnome-rfont.c +@@ -28,8 +28,8 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftglyph.h> +-#include <freetype/ftbbox.h> ++#include FT_GLYPH_H ++#include FT_BBOX_H + #include <libart_lgpl/art_misc.h> + #include <libart_lgpl/art_affine.h> + #include <libart_lgpl/art_vpath.h> |