diff options
author | Koop Mast <kwm@FreeBSD.org> | 2015-12-10 22:13:58 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2015-12-10 22:13:58 +0000 |
commit | e1add76b39f7f567867b624b0b52f78a85935d50 (patch) | |
tree | daabc6f4f878fbc04f9c28f1afe6afb317ffe79f /x11-fonts | |
parent | Update cairo to 1.14.6. (diff) |
Update freetype2 to 2.6.2. [1]
Mark magicpoint broken, maintainer is notified.
Exp-runs run by antoine@
This version also fixes shadowing of TYPEOF in ftconfig.h [2]
PR: 203554 [1], 202083 [2]
Submitted by: rhurlin@gwdg.de [2]
Notes
Notes:
svn path=/head/; revision=403474
Diffstat (limited to 'x11-fonts')
-rw-r--r-- | x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake index fa75a8cd357f..b4a4b23becdd 100644 --- a/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake +++ b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake @@ -1,6 +1,6 @@ ---- 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 @@ +--- cmake/modules/FREETYPEConfig.cmake.orig 2008-04-07 22:45:10.000000000 +0200 ++++ cmake/modules/FREETYPEConfig.cmake 2015-12-02 14:40:47.871063000 +0100 +@@ -1,10 +1,10 @@ # # Find the native FREETYPE includes and library # (from Scribus) @@ -15,8 +15,3 @@ 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 |