On 5 ноября 2012 г. 10:21:06 David Coppa wrote: > On Mon, Nov 5, 2012 at 7:05 AM, David Coppa <dco...@gmail.com> wrote: > >> what changed in the meantime? some tightening? > > > > Yeah, very strange. This always used to work without patching. > > Further investigation is needed :( > > Ok, I've found it. > > I think it's a regression from 2.8.9... > > Change line 62 of /usr/local/share/cmake/Modules/FindFreetype.cmake > from: > > PATH_SUFFIXES include/freetype2 include > > To: > > PATH_SUFFIXES freetype2 include/freetype2 include > > > I will provide a new patch after. I'm now trying to find the problems > with gettext Landry has pointed out.
Looks like someone upstream did it 180 degrees right. PATH_SUFFIXES doesn't need to mention "include" at all. This patches works fine too and probably should be pushed upstream (to be appended to initial David's patch). -- WBR, Vadim Zhukov Index: patches/patch-Modules_FindFreetype_cmake =================================================================== RCS file: patches/patch-Modules_FindFreetype_cmake diff -N patches/patch-Modules_FindFreetype_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Modules_FindFreetype_cmake 5 Nov 2012 18:44:06 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- Modules/FindFreetype.cmake.orig Mon Nov 5 02:04:32 2012 ++++ Modules/FindFreetype.cmake Mon Nov 5 22:40:55 2012 +@@ -49,7 +49,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES freetype2 + ) + + find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +@@ -59,7 +59,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/conf + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES freetype2 + ) + + find_library(FREETYPE_LIBRARY
