diff options
Diffstat (limited to 'src/wt-1-fixes.patch')
| -rw-r--r-- | src/wt-1-fixes.patch | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch new file mode 100644 index 0000000..14ccbe3 --- /dev/null +++ b/src/wt-1-fixes.patch @@ -0,0 +1,129 @@ +# This file is part of MXE. +# See index.html for further information. + +diff -ur a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt +--- a/cmake/WtFindBoost-vintage.txt 2011-11-15 04:49:29.000000000 -0300 ++++ b/cmake/WtFindBoost-vintage.txt 2012-02-02 19:21:07.108060403 -0300 +@@ -70,6 +70,7 @@ + boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION} + boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION} + boost_thread-${BOOST_COMPILER}-mt ++ boost_thread${BOOST_COMPILER}-mt + boost_thread-mt-${BOOST_VERSION} + boost_thread-mt + boost_thread-${BOOST_COMPILER}-${BOOST_VERSION} +diff -ur a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt +--- a/cmake/WtFindGm.txt 2011-04-01 07:35:50.000000000 -0300 ++++ b/cmake/WtFindGm.txt 2012-02-02 21:31:04.157439938 -0300 +@@ -59,6 +59,12 @@ + ELSE(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR) + SET(GM_FOUND FALSE) + ENDIF(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR) ++ ++ IF(GM_INCLUDE_DIR AND GM_LIBS) ++ SET(GM_FOUND TRUE) ++ SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR}) ++ SET(GM_LIBRARIES optimized ${GM_LIBS}) ++ ENDIF(GM_INCLUDE_DIR AND GM_LIBS) + ELSE(WIN32) + FIND_LIBRARY(GM_LIB + NAMES +diff -ur a/cmake/WtFindHaru.txt b/cmake/WtFindHaru.txt +--- a/cmake/WtFindHaru.txt 2011-01-10 05:50:55.000000000 -0300 ++++ b/cmake/WtFindHaru.txt 2012-02-02 21:32:08.165440382 -0300 +@@ -44,6 +44,7 @@ + FIND_LIBRARY(Z_LIB + NAMES + zlib ++ libz + PATHS + ${HARU_PREFIX}/lib + ${USERLIB_PREFIX}/lib +@@ -58,6 +59,17 @@ + SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} ${Z_LIB}) + ENDIF(Z_LIB) + ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG) ++ ++ IF(HARU_LIB_RELEASE) ++ SET(HARU_LIB optimized ${HARU_LIB_RELEASE}) ++ IF(PNG_LIB_RELEASE) ++ SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${PNG_LIB_RELEASE}) ++ ENDIF(PNG_LIB_RELEASE) ++ IF(Z_LIB) ++ SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${Z_LIB}) ++ ENDIF(Z_LIB) ++ ENDIF(HARU_LIB_RELEASE) ++ + SET(HARU_SUPPORT_LIBS_FOUND TRUE) + ELSE(WIN32) + FIND_LIBRARY(HARU_LIB +diff -ur a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt +--- a/cmake/WtFindPangoFt2.txt 2011-11-28 06:26:54.000000000 -0300 ++++ b/cmake/WtFindPangoFt2.txt 2012-02-02 21:17:14.341434198 -0300 +@@ -36,11 +36,15 @@ + ${GLIB2_INCLUDE_DIR} + ${GLIB2_CONFIG_INCLUDE_DIR}) + +-SET(PANGO_FT2_LIBRARIES +- ${PANGO_FT2_LIBRARY} +- ${PANGO_LIBRARY} +- ${GOBJECT2_LIBRARY} +- ${GLIB2_LIBRARY}) ++IF(PANGO_FT2_LIBS) ++ SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS}) ++ELSE(PANGO_FT2_LIBS) ++ SET(PANGO_FT2_LIBRARIES ++ ${PANGO_FT2_LIBRARY} ++ ${PANGO_LIBRARY} ++ ${GOBJECT2_LIBRARY} ++ ${GLIB2_LIBRARY}) ++ENDIF(PANGO_FT2_LIBS) + + IF (PANGO_INCLUDE_DIR + AND FT2_INCLUDE_DIR +diff -ur a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt +--- a/cmake/WtFindSsl.txt 2011-09-19 09:34:19.000000000 -0300 ++++ b/cmake/WtFindSsl.txt 2012-02-02 21:17:53.033434468 -0300 +@@ -81,6 +81,11 @@ + AND SSL_LIB_DEBUG + AND SSL_TOO_LIB_RELEASE + AND SSL_TOO_LIB_DEBUG) ++ ++ IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS) ++ SET(SSL_FOUND true) ++ SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS}) ++ ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS) + ELSE (WIN32) + FIND_LIBRARY(SSL_LIB + NAMES +diff -ur a/src/http/Configuration.C b/src/http/Configuration.C +--- a/src/http/Configuration.C 2011-11-24 13:17:42.000000000 -0300 ++++ b/src/http/Configuration.C 2012-02-02 19:21:07.112060403 -0300 +@@ -18,7 +18,7 @@ + #endif + #ifdef WIN32 + #include <process.h> // for getpid() +-#include <Winsock2.h> // for gethostname() ++#include <winsock2.h> // for gethostname() + #endif + #include <iostream> + #include <fstream> +diff -ur a/src/Wt/WRasterImage.C b/src/Wt/WRasterImage.C +--- a/src/Wt/WRasterImage.C 2011-11-24 13:17:42.000000000 -0300 ++++ b/src/Wt/WRasterImage.C 2012-02-02 19:21:07.112060403 -0300 +@@ -38,15 +38,6 @@ + #define M_PI 3.14159265358979323846 + #endif + +-#ifdef WIN32 +-namespace { +- double round(double x) +- { +- return floor(x + 0.5); +- } +-} +-#endif +- + namespace { + static const double EPSILON = 1E-5; + |