diff options
| author | kwm <kwm@FreeBSD.org> | 2013-12-07 02:57:55 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-12-07 02:57:55 +0800 |
| commit | 0ee4c1dd7bc0496298acbbf338cc1b83cf087733 (patch) | |
| tree | a472dff6ce3498773cbed971c9c9d79989c6520d | |
| parent | cc9d267e7fbebf68d356db7ba8209520044fd72e (diff) | |
| download | freebsd-ports-gnome-0ee4c1dd7bc0496298acbbf338cc1b83cf087733.tar.gz freebsd-ports-gnome-0ee4c1dd7bc0496298acbbf338cc1b83cf087733.tar.zst freebsd-ports-gnome-0ee4c1dd7bc0496298acbbf338cc1b83cf087733.zip | |
Add patches to fix the build with freetype 2.5.1.
Stageify, use new lib_depend syntax.
| -rw-r--r-- | print/libgnomeprint/Makefile | 14 | ||||
| -rw-r--r-- | print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c | 12 | ||||
| -rw-r--r-- | print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c | 14 |
3 files changed, 34 insertions, 6 deletions
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 96b32cea41f4..142e5f325b5f 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -16,8 +16,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - popt:${PORTSDIR}/devel/popt +LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libpopt.so:${PORTSDIR}/devel/popt USES= bison pathfix gettext gmake pkgconfig USE_GNOME= gnomeprefix intlhack gnomehier glib20 pango libxml2 \ @@ -33,12 +33,11 @@ PLIST_SUB= VERSION=${PORTVERSION} \ OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCUPS} CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= gnomecups-1:${PORTSDIR}/print/libgnomecups +LIB_DEPENDS+= libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" .else CONFIGURE_ARGS+= --without-cups @@ -52,8 +51,11 @@ post-patch: @${REINPLACE_CMD} -e "/^SUBDIRS =/s|doc||" ${WRKSRC}/Makefile.in post-install: - @${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts - @${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts + @${TOUCH} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint-2-2.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*/*.so .include <bsd.port.mk> diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c new file mode 100644 index 000000000000..a5888bb74283 --- /dev/null +++ b/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c @@ -0,0 +1,12 @@ +--- libgnomeprint/gnome-font-face.c.orig 2013-12-06 19:26:26.000000000 +0100 ++++ libgnomeprint/gnome-font-face.c 2013-12-06 19:27:43.000000000 +0100 +@@ -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/files/patch-libgnomeprint_gnome-rfont.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c new file mode 100644 index 000000000000..22e1c1c9ab56 --- /dev/null +++ b/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c @@ -0,0 +1,14 @@ +--- libgnomeprint/gnome-rfont.c.orig 2013-12-06 19:28:40.000000000 +0100 ++++ libgnomeprint/gnome-rfont.c 2013-12-06 19:29:56.000000000 +0100 +@@ -27,9 +27,8 @@ + #include <string.h> + + #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> |