aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-08-03 22:53:12 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-08-03 22:53:12 +0000
commitfde62730b14435a946c0e60e6dce73adce4164ab (patch)
tree7444b16bf6b66cab201d4061ce50e7145419969d /print
parent68bf3df3ebeb62f53bc5e1b28b053864ba08108e (diff)
downloadports-fde62730b14435a946c0e60e6dce73adce4164ab.tar.gz
ports-fde62730b14435a946c0e60e6dce73adce4164ab.zip
Add a patch from FreeType CVS that fixes X11 crashes with certain
(usually multi-byte character set) fonts. Reported by: many Obtained from: FreeType CVS Approved by: portmgr (implicit)
Notes
Notes: svn path=/head/; revision=140762
Diffstat (limited to 'print')
-rw-r--r--print/freetype2/Makefile1
-rw-r--r--print/freetype2/files/patch-src_sfnt_sfdriver.c18
2 files changed, 19 insertions, 0 deletions
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 4e7fbf3fcb99..d80ad32a9944 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freetype2
PORTVERSION= 2.1.10
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/freetype2/files/patch-src_sfnt_sfdriver.c b/print/freetype2/files/patch-src_sfnt_sfdriver.c
new file mode 100644
index 000000000000..0d877ff7b8e3
--- /dev/null
+++ b/print/freetype2/files/patch-src_sfnt_sfdriver.c
@@ -0,0 +1,18 @@
+--- src/sfnt/sfdriver.c.orig Wed Aug 3 18:46:34 2005
++++ src/sfnt/sfdriver.c Wed Aug 3 18:47:24 2005
+@@ -367,8 +367,13 @@
+ /* see `ttsbit.h' and `sfnt.h' */
+ tt_face_set_sbit_strike,
+ tt_face_load_sbit_strikes,
+- 0 /* tt_find_sbit_image */,
+- 0 /* tt_load_sbit_metrics */,
++#ifdef FT_OPTIMIZE_MEMORY
++ 0,
++ 0,
++#else
++ tt_find_sbit_image,
++ tt_load_sbit_metrics,
++#endif
+ tt_face_load_sbit_image,
+ tt_face_free_sbit_strikes,
+