diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-12 11:06:50 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-12 11:06:50 +0100 |
| commit | 9bf2becd7b6596eae1d7078038910ed59a319fa5 (patch) | |
| tree | ddfeba68e09704f17efca4f0221699e191dfc15b /packages/wt/wt3-2.99.0 | |
| parent | ffe697599f46f5f5e24bc63342d8ddeb288170f2 (diff) | |
wt3: created: wt 3.* (including 2.99); retain package wt (which is for 2.*) as 2.* and 3.* are not compatible
Diffstat (limited to 'packages/wt/wt3-2.99.0')
| -rw-r--r-- | packages/wt/wt3-2.99.0/ext.patch | 7 | ||||
| -rw-r--r-- | packages/wt/wt3-2.99.0/src.patch | 18 | ||||
| -rw-r--r-- | packages/wt/wt3-2.99.0/wgooglemap.patch | 15 |
3 files changed, 40 insertions, 0 deletions
diff --git a/packages/wt/wt3-2.99.0/ext.patch b/packages/wt/wt3-2.99.0/ext.patch new file mode 100644 index 0000000000..89246ebbf6 --- /dev/null +++ b/packages/wt/wt3-2.99.0/ext.patch @@ -0,0 +1,7 @@ +--- wt-2.99.0/src/Wt/Ext/CMakeLists.txt 2009-03-11 21:30:10.000000000 +0100 ++++ wt-2.99.0/src/Wt/Ext/CMakeLists.txt.new 2009-03-11 21:31:33.000000000 +0100 +@@ -1,2 +1,3 @@ +-INSTALL_FILES(/include/Wt/Ext "...+[^Ch~]$") ++# avoid CMake* getting included ++INSTALL_FILES(/include/Wt/Ext "^[A-Z][a-z].*[^Ch~]$") + INSTALL_FILES(/include/Wt/Ext ExtDllDefs.h) diff --git a/packages/wt/wt3-2.99.0/src.patch b/packages/wt/wt3-2.99.0/src.patch new file mode 100644 index 0000000000..a3ac249af0 --- /dev/null +++ b/packages/wt/wt3-2.99.0/src.patch @@ -0,0 +1,18 @@ +--- wt-2.99.0/src/CMakeLists.txt 2009-03-06 16:36:30.000000000 +0100 ++++ wt-2.99.0/src/CMakeLists.txt.new 2009-03-11 21:39:06.000000000 +0100 +@@ -33,8 +33,13 @@ + + LINK_DIRECTORIES(${BOOST_LIB_DIRS}) + +-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) +-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++IF(CMAKE_CROSSCOMPILING) ++ ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) ++ GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++ELSE(CMAKE_CROSSCOMPILING) ++ SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring) ++ENDIF(CMAKE_CROSSCOMPILING) ++ + + MACRO (FILE_TO_STRING infile outfile var) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile} diff --git a/packages/wt/wt3-2.99.0/wgooglemap.patch b/packages/wt/wt3-2.99.0/wgooglemap.patch new file mode 100644 index 0000000000..071597fba6 --- /dev/null +++ b/packages/wt/wt3-2.99.0/wgooglemap.patch @@ -0,0 +1,15 @@ +--- wt-2.99.0/src/Wt/WGoogleMap.C.orig 2009-03-12 09:52:56.000000000 +0100 ++++ wt-2.99.0/src/Wt/WGoogleMap.C 2009-03-12 10:13:21.000000000 +0100 +@@ -18,6 +18,12 @@ + #include <sstream> + #include <utility> + #include <iostream> ++ ++#if not defined(_GLIBCXX_HAVE__SINL) && not defined(acosl) ++#define cosl cos ++#define acosl acos ++#define sinl sin ++#endif + + using std::string; + using std::vector; |