Mercurial > mxe-octave

annotate src/wt-1-fixes.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children 63b62afe771b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2236
diff changeset
1 # This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 # See index.html for further information.
2236
5dbbf5061efc add missing mce header to patch
Mark Brand <mabrand@mabrand.nl>
parents: 2234
diff changeset
3
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
4 diff -ur a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
5 --- a/cmake/WtFindBoost-vintage.txt 2011-11-15 04:49:29.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
6 +++ b/cmake/WtFindBoost-vintage.txt 2012-02-02 19:21:07.108060403 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
7 @@ -70,6 +70,7 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
8 boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
9 boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
10 boost_thread-${BOOST_COMPILER}-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
11 + boost_thread${BOOST_COMPILER}-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
12 boost_thread-mt-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
13 boost_thread-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
14 boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
15 diff -ur a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
16 --- a/cmake/WtFindGm.txt 2011-04-01 07:35:50.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
17 +++ b/cmake/WtFindGm.txt 2012-02-02 21:31:04.157439938 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
18 @@ -59,6 +59,12 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
19 ELSE(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
20 SET(GM_FOUND FALSE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
21 ENDIF(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
22 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
23 + IF(GM_INCLUDE_DIR AND GM_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
24 + SET(GM_FOUND TRUE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
25 + SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
26 + SET(GM_LIBRARIES optimized ${GM_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
27 + ENDIF(GM_INCLUDE_DIR AND GM_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
28 ELSE(WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
29 FIND_LIBRARY(GM_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
30 NAMES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
31 diff -ur a/cmake/WtFindHaru.txt b/cmake/WtFindHaru.txt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
32 --- a/cmake/WtFindHaru.txt 2011-01-10 05:50:55.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
33 +++ b/cmake/WtFindHaru.txt 2012-02-02 21:32:08.165440382 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
34 @@ -44,6 +44,7 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
35 FIND_LIBRARY(Z_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
36 NAMES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
37 zlib
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
38 + libz
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
39 PATHS
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
40 ${HARU_PREFIX}/lib
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
41 ${USERLIB_PREFIX}/lib
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
42 @@ -58,6 +59,17 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
43 SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} ${Z_LIB})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
44 ENDIF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
45 ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
46 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
47 + IF(HARU_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
48 + SET(HARU_LIB optimized ${HARU_LIB_RELEASE})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
49 + IF(PNG_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
50 + SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${PNG_LIB_RELEASE})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
51 + ENDIF(PNG_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
52 + IF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
53 + SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${Z_LIB})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
54 + ENDIF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
55 + ENDIF(HARU_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
56 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
57 SET(HARU_SUPPORT_LIBS_FOUND TRUE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
58 ELSE(WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
59 FIND_LIBRARY(HARU_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
60 diff -ur a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
61 --- a/cmake/WtFindPangoFt2.txt 2011-11-28 06:26:54.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
62 +++ b/cmake/WtFindPangoFt2.txt 2012-02-02 21:17:14.341434198 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
63 @@ -36,11 +36,15 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
64 ${GLIB2_INCLUDE_DIR}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
65 ${GLIB2_CONFIG_INCLUDE_DIR})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
66
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
67 -SET(PANGO_FT2_LIBRARIES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
68 - ${PANGO_FT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
69 - ${PANGO_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
70 - ${GOBJECT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
71 - ${GLIB2_LIBRARY})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
72 +IF(PANGO_FT2_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
73 + SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
74 +ELSE(PANGO_FT2_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
75 + SET(PANGO_FT2_LIBRARIES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
76 + ${PANGO_FT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
77 + ${PANGO_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
78 + ${GOBJECT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
79 + ${GLIB2_LIBRARY})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
80 +ENDIF(PANGO_FT2_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
81
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
82 IF (PANGO_INCLUDE_DIR
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
83 AND FT2_INCLUDE_DIR
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
84 diff -ur a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
85 --- a/cmake/WtFindSsl.txt 2011-09-19 09:34:19.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
86 +++ b/cmake/WtFindSsl.txt 2012-02-02 21:17:53.033434468 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
87 @@ -81,6 +81,11 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
88 AND SSL_LIB_DEBUG
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
89 AND SSL_TOO_LIB_RELEASE
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
90 AND SSL_TOO_LIB_DEBUG)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
91 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
92 + IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
93 + SET(SSL_FOUND true)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
94 + SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
95 + ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
96 ELSE (WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
97 FIND_LIBRARY(SSL_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
98 NAMES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
99 diff -ur a/src/http/Configuration.C b/src/http/Configuration.C
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
100 --- a/src/http/Configuration.C 2011-11-24 13:17:42.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
101 +++ b/src/http/Configuration.C 2012-02-02 19:21:07.112060403 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
102 @@ -18,7 +18,7 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
103 #endif
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
104 #ifdef WIN32
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
105 #include <process.h> // for getpid()
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
106 -#include <Winsock2.h> // for gethostname()
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
107 +#include <winsock2.h> // for gethostname()
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
108 #endif
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
109 #include <iostream>
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
110 #include <fstream>
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
111 diff -ur a/src/Wt/WRasterImage.C b/src/Wt/WRasterImage.C
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
112 --- a/src/Wt/WRasterImage.C 2011-11-24 13:17:42.000000000 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
113 +++ b/src/Wt/WRasterImage.C 2012-02-02 19:21:07.112060403 -0300
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
114 @@ -38,15 +38,6 @@
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
115 #define M_PI 3.14159265358979323846
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
116 #endif
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
117
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
118 -#ifdef WIN32
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
119 -namespace {
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
120 - double round(double x)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
121 - {
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
122 - return floor(x + 0.5);
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
123 - }
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
124 -}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
125 -#endif
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
126 -
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
127 namespace {
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
128 static const double EPSILON = 1E-5;
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
129