diff options
| author | nox <nox@FreeBSD.org> | 2014-04-19 01:03:05 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2014-04-19 01:03:05 +0800 |
| commit | b6937486f4e76190e2a021a1f3e1a67864d69796 (patch) | |
| tree | f299d1fc559371062b1eb9d1fd4a1dcb884af83a | |
| parent | c1e63543e979924025cf15008fc5b1fd293473e0 (diff) | |
| download | freebsd-ports-gnome-b6937486f4e76190e2a021a1f3e1a67864d69796.tar.gz freebsd-ports-gnome-b6937486f4e76190e2a021a1f3e1a67864d69796.tar.zst freebsd-ports-gnome-b6937486f4e76190e2a021a1f3e1a67864d69796.zip | |
Fix build with MKFONT and without it but with (updated) freetype present.
PR: ports/187984 [1], ports/188526 [2]
Submitted by: Joseph Mingrone <jrm@ftfl.ca> [1]
Submitted by: Andrey Zholos <aaz@q-fu.com> [2]
| -rw-r--r-- | sysutils/grub2/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/grub2/files/patch-util-grub-mkfont.c | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile index 777eecde9ae3..9d5acbe263c3 100644 --- a/sysutils/grub2/Makefile +++ b/sysutils/grub2/Makefile @@ -48,7 +48,9 @@ PLIST_SUB+= EFIEMU=${EFIEMU} LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu MAN1+= grub-mkfont.1 +CONFIGURE_ARGS+= --enable-grub-mkfont .else +CONFIGURE_ARGS+= --disable-grub-mkfont MKFONT= "@comment " .endif diff --git a/sysutils/grub2/files/patch-util-grub-mkfont.c b/sysutils/grub2/files/patch-util-grub-mkfont.c new file mode 100644 index 000000000000..36ed69c1f538 --- /dev/null +++ b/sysutils/grub2/files/patch-util-grub-mkfont.c @@ -0,0 +1,13 @@ +--- util/grub-mkfont.c.orig ++++ util/grub-mkfont.c +@@ -39,7 +39,7 @@ + #include FT_FREETYPE_H + #include FT_TRUETYPE_TAGS_H + #include FT_TRUETYPE_TABLES_H +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + + #undef __FTERRORS_H__ + #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { + + |