From d2acf18c1eedf3f1970767384aea94c00f8cc94e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 27 Jul 2013 16:11:19 +0200 Subject: [PATCH] Update patches for cmake 2.8.11 and 2.8-git to include some of our changes that are not merged yet. --- dev-util/cmake/patches/cmake-2.8-git.patch | 12 +++++ dev-util/cmake/patches/cmake-2.8.11.2.patch | 52 ++++++++++++++------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8-git.patch b/dev-util/cmake/patches/cmake-2.8-git.patch index cf4523c08..6fac71153 100644 --- a/dev-util/cmake/patches/cmake-2.8-git.patch +++ b/dev-util/cmake/patches/cmake-2.8-git.patch @@ -1,3 +1,15 @@ +diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake +--- cmake-2.8-git-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800 ++++ cmake-2.8-git/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800 +@@ -54,7 +54,7 @@ + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE AND NOT BEOS) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake --- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 +++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patch b/dev-util/cmake/patches/cmake-2.8.11.2.patch index 1af677725..6b3bd2f94 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patch +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patch @@ -1,4 +1,40 @@ diff -urN cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.11.2/Modules/Platform/Haiku.cmake +--- cmake-2.8.11.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000 ++++ cmake-2.8.11.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000 +@@ -46,20 +46,22 @@ + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty + ) + + find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty + ) + + find_library(FREETYPE_LIBRARY +@@ -68,6 +70,7 @@ + ENV FREETYPE_DIR + PATH_SUFFIXES lib + PATHS ++ /boot/system/lib + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + --- cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 +++ cmake-2.8.11.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 @@ -1,20 +1,25 @@ @@ -211,19 +247,3 @@ diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.11.2/Utilities/ # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.11.2/Utilities/cmzlib/zutil.h ---- cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 -+++ cmake-2.8.11.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif