diff options
| author | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
| commit | 3602daba968a0e16ff8817cb961f23cd54730acc (patch) | |
| tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /x11-fonts | |
| parent | b6e03796b2af561162757d9125b17f9d15197d64 (diff) | |
| download | freebsd-ports-graphics-3602daba968a0e16ff8817cb961f23cd54730acc.tar.gz freebsd-ports-graphics-3602daba968a0e16ff8817cb961f23cd54730acc.tar.zst freebsd-ports-graphics-3602daba968a0e16ff8817cb961f23cd54730acc.zip | |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake | 22 | ||||
| -rw-r--r-- | x11-fonts/ttmkfdir/files/patch-ttf.cpp | 24 |
2 files changed, 39 insertions, 7 deletions
diff --git a/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake new file mode 100644 index 00000000000..fa75a8cd357 --- /dev/null +++ b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake @@ -0,0 +1,22 @@ +--- cmake/modules/FREETYPEConfig.cmake.orig 2008-04-07 23:45:10.000000000 +0300 ++++ cmake/modules/FREETYPEConfig.cmake 2013-12-23 19:53:13.000000000 +0200 +@@ -1,14 +1,14 @@ + # + # Find the native FREETYPE includes and library + # (from Scribus) +- FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h +- /usr/include/ +- /usr/local/include/ +- /usr/X11R6/include/ ++ FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h ++ /usr/include ++ /usr/local/include ++ /usr/X11R6/include + NO_CMAKE_SYSTEM_PATH + ) + +- FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h ++ FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h + /usr/include/freetype2 + /usr/local/include/freetype2 + /usr/X11R6/include/freetype2 diff --git a/x11-fonts/ttmkfdir/files/patch-ttf.cpp b/x11-fonts/ttmkfdir/files/patch-ttf.cpp index 7718aea5016..da260f32bd0 100644 --- a/x11-fonts/ttmkfdir/files/patch-ttf.cpp +++ b/x11-fonts/ttmkfdir/files/patch-ttf.cpp @@ -1,6 +1,16 @@ ---- ttf.cpp 2003-01-08 00:25:25.000000000 -0500 -+++ ttf.cpp 2012-12-07 12:34:54.000000000 -0500 -@@ -51,20 +51,27 @@ +--- ttf.cpp.orig 2003-01-08 06:25:25.000000000 +0100 ++++ ttf.cpp 2013-12-17 00:08:13.000000000 +0100 +@@ -3,7 +3,8 @@ + #include <cctype> + #include <cstring> + +-#include "freetype/tttables.h" ++#include <ft2build.h> ++#include FT_TRUETYPE_TABLES_H + #include "ttmkfdir.h" + #include "ttf.h" + #include "ttos2val.h" +@@ -51,20 +52,27 @@ bool Face::MappingPresent (int cmapidx, NumericMapping *m, int enc_size, int start_code, bool enc_comp) { @@ -35,7 +45,7 @@ } Face::Face (const std::string &filename) -@@ -239,7 +246,7 @@ +@@ -239,7 +247,7 @@ for (i = 0; i < n; i++) { if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) { std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl; @@ -44,7 +54,7 @@ }; platform = NamePtr.platform_id; encoding = NamePtr.encoding_id; -@@ -483,7 +490,7 @@ +@@ -483,7 +491,7 @@ const char * Face::PanoseWeight (void) const { @@ -53,7 +63,7 @@ "any", "no fit", "very light", -@@ -548,7 +555,7 @@ +@@ -548,7 +556,7 @@ const char * Face::PanoseWidth (void) const { @@ -62,7 +72,7 @@ "any", "no fit", "old style", -@@ -561,7 +568,7 @@ +@@ -561,7 +569,7 @@ "monospaced", }; |