Mercurial > mxe-octave

annotate src/wt-1-fixes.patch @ 5947:09d3533acacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents 11504b1a840f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
1 This file is part of MXE.
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
2 See index.html for further information.
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
3
2839
11504b1a840f update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2781
diff changeset
4 From e04e1c624c65e0acb0249aa3c4980d95e79f592c Mon Sep 17 00:00:00 2001
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
5 From: Mark Brand <mabrand@mabrand.nl>
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
6 Date: Mon, 18 Jun 2012 13:23:21 +0200
2781
095252f38f87 update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2634
diff changeset
7 Subject: [PATCH] fixes for mxe
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
8
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
9
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
10 diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
11 index e48b21e..1198139 100644
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
12 --- a/cmake/WtFindBoost-vintage.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
13 +++ b/cmake/WtFindBoost-vintage.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
14 @@ -70,6 +70,7 @@ ELSE(MSVC)
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
15 boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
16 boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
17 boost_thread-${BOOST_COMPILER}-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
18 + boost_thread${BOOST_COMPILER}-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
19 boost_thread-mt-${BOOST_VERSION}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
20 boost_thread-mt
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
21 boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
22 diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
23 index 76697fc..9bc0fa1 100644
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
24 --- a/cmake/WtFindGm.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
25 +++ b/cmake/WtFindGm.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
26 @@ -59,6 +59,12 @@ IF(WIN32)
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
27 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
28 SET(GM_FOUND FALSE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
29 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
30 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
31 + IF(GM_INCLUDE_DIR AND GM_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
32 + SET(GM_FOUND TRUE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
33 + SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
34 + SET(GM_LIBRARIES optimized ${GM_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
35 + ENDIF(GM_INCLUDE_DIR AND GM_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
36 ELSE(WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
37 FIND_LIBRARY(GM_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
38 NAMES
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
39 diff --git a/cmake/WtFindHaru.txt b/cmake/WtFindHaru.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
40 index 4dba35f..642bd58 100644
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
41 --- a/cmake/WtFindHaru.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
42 +++ b/cmake/WtFindHaru.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
43 @@ -44,6 +44,7 @@ IF(WIN32)
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
44 FIND_LIBRARY(Z_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
45 NAMES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
46 zlib
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
47 + libz
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
48 PATHS
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
49 ${HARU_PREFIX}/lib
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
50 ${USERLIB_PREFIX}/lib
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
51 @@ -58,6 +59,17 @@ IF(WIN32)
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
52 SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} ${Z_LIB})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
53 ENDIF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
54 ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
55 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
56 + IF(HARU_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
57 + SET(HARU_LIB optimized ${HARU_LIB_RELEASE})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
58 + IF(PNG_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
59 + SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${PNG_LIB_RELEASE})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
60 + ENDIF(PNG_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
61 + IF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
62 + SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${Z_LIB})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
63 + ENDIF(Z_LIB)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
64 + ENDIF(HARU_LIB_RELEASE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
65 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
66 SET(HARU_SUPPORT_LIBS_FOUND TRUE)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
67 ELSE(WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
68 FIND_LIBRARY(HARU_LIB
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
69 diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
70 index cd1e640..b1bbe3d 100644
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
71 --- a/cmake/WtFindPangoFt2.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
72 +++ b/cmake/WtFindPangoFt2.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
73 @@ -36,11 +36,15 @@ SET(PANGO_FT2_INCLUDE_DIRS
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
74 ${GLIB2_INCLUDE_DIR}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
75 ${GLIB2_CONFIG_INCLUDE_DIR})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
76
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
77 -SET(PANGO_FT2_LIBRARIES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
78 - ${PANGO_FT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
79 - ${PANGO_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
80 - ${GOBJECT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
81 - ${GLIB2_LIBRARY})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
82 +IF(PANGO_FT2_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
83 + SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
84 +ELSE(PANGO_FT2_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
85 + SET(PANGO_FT2_LIBRARIES
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
86 + ${PANGO_FT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
87 + ${PANGO_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
88 + ${GOBJECT2_LIBRARY}
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
89 + ${GLIB2_LIBRARY})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
90 +ENDIF(PANGO_FT2_LIBS)
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 (PANGO_INCLUDE_DIR
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
93 AND FT2_INCLUDE_DIR
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
94 diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
95 index fdbcb5f..578baf1 100644
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
96 --- a/cmake/WtFindSsl.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
97 +++ b/cmake/WtFindSsl.txt
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
98 @@ -81,6 +81,11 @@ IF(WIN32)
2234
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
99 AND SSL_LIB_DEBUG
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
100 AND SSL_TOO_LIB_RELEASE
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
101 AND SSL_TOO_LIB_DEBUG)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
102 +
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
103 + IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
104 + SET(SSL_FOUND true)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
105 + SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
106 + ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
107 ELSE (WIN32)
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
108 FIND_LIBRARY(SSL_LIB
109d622402db new packages: libharu wt
Luis Saavedra <luis94855510@gmail.com>
parents:
diff changeset
109 NAMES
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
110 diff --git a/src/Wt/WRasterImage.C b/src/Wt/WRasterImage.C
2839
11504b1a840f update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2781
diff changeset
111 index 471edfa..95632be 100644
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
112 --- a/src/Wt/WRasterImage.C
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
113 +++ b/src/Wt/WRasterImage.C
2839
11504b1a840f update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2781
diff changeset
114 @@ -39,15 +39,6 @@
2234
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
2634
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
130 --
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
131 1.7.10.4
63b62afe771b update package wt
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
132