From a913f5254d065c34c534355410c83c770410f040 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 18:50:47 +0200 Subject: update package wt from 3.3.1 to 3.3.4 * update WtFindSsl.txt patch * remove WRasterImage.C patch: the file was removed * remove fixes for boost: ported to upstream * add patch for WCartesian3DChart (rename conflicting names) --- src/wt-1-fixes.patch | 87 +--------------------------- src/wt-2-rename-variables-near-and-far.patch | 78 +++++++++++++++++++++++++ src/wt.mk | 4 +- 3 files changed, 83 insertions(+), 86 deletions(-) create mode 100644 src/wt-2-rename-variables-near-and-far.patch diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch index 3b09f3a..057ed55 100644 --- a/src/wt-1-fixes.patch +++ b/src/wt-1-fixes.patch @@ -64,10 +64,10 @@ index cd1e640..b1bbe3d 100644 IF (PANGO_INCLUDE_DIR AND FT2_INCLUDE_DIR diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt -index 3cc42d1..ae64671 100644 +index d99f1df..7c1f70b 100644 --- a/cmake/WtFindSsl.txt +++ b/cmake/WtFindSsl.txt -@@ -94,6 +94,11 @@ IF(WIN32) +@@ -109,6 +109,11 @@ IF(WIN32) AND SSL_LIB_DEBUG AND SSL_TOO_LIB_RELEASE AND SSL_TOO_LIB_DEBUG) @@ -76,90 +76,9 @@ index 3cc42d1..ae64671 100644 + SET(SSL_FOUND true) + SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS}) + ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS) - ELSE (WIN32) + ELSEIF(APPLE) FIND_LIBRARY(SSL_LIB NAMES -diff --git a/src/Wt/WRasterImage.C b/src/Wt/WRasterImage.C -index 415d27e..7f1ed17 100644 ---- a/src/Wt/WRasterImage.C -+++ b/src/Wt/WRasterImage.C -@@ -39,15 +39,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; - --- -1.9.3 (Apple Git-50) - - -From 0904c43ee23d0690d4a872efbbda22839b0ef686 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 1 Dec 2014 23:28:45 +1100 -Subject: [PATCH 2/2] fixes for boost - -taken from: -http://redmine.emweb.be/issues/3551 - -diff --git a/src/Wt/Dbo/SqlQueryParse.C b/src/Wt/Dbo/SqlQueryParse.C -index abc2c5d..04c6d92 100644 ---- a/src/Wt/Dbo/SqlQueryParse.C -+++ b/src/Wt/Dbo/SqlQueryParse.C -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/src/Wt/Json/Parser.C b/src/Wt/Json/Parser.C -index ea0d3ad..bcc1a34 100644 ---- a/src/Wt/Json/Parser.C -+++ b/src/Wt/Json/Parser.C -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - - #endif // JSON_PARSER -diff --git a/src/Wt/Render/CssParser.C b/src/Wt/Render/CssParser.C -index 4734d1d..48942bd 100644 ---- a/src/Wt/Render/CssParser.C -+++ b/src/Wt/Render/CssParser.C -@@ -34,7 +34,7 @@ using namespace Wt::Render; - #include - #include - #include --#include -+#include - #include - - #include -@@ -157,8 +157,7 @@ struct fs_error_tag {}; - template< typename Iterator > - struct ErrorReporting - { -- template< typename, typename, typename, typename, typename > // Phoenix v2 -- struct result { typedef void type;}; -+ typedef void result_type; - - ErrorReporting(CssGrammer< Iterator >* grammer) - : grammer_(grammer) -- 1.9.3 (Apple Git-50) diff --git a/src/wt-2-rename-variables-near-and-far.patch b/src/wt-2-rename-variables-near-and-far.patch new file mode 100644 index 0000000..fc56d66 --- /dev/null +++ b/src/wt-2-rename-variables-near-and-far.patch @@ -0,0 +1,78 @@ +This file is part of MXE. +See index.html for further information. + +From e81074f3819bd5b10b047132cfa473516a547afd Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 18:36:39 +0200 +Subject: [PATCH] WCartesian3DChart: rename variables near and far + +"near" and "far" are defined in minwindef.h (mingw-w64): + + #define far + #define near + +Error message: + + wt-3.3.4/src/Wt/Chart/WCartesian3DChart.C:330:16: error: + expected primary-expression before '(' token + WVector4 far( + ^ +--- + src/Wt/Chart/WCartesian3DChart.C | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/Wt/Chart/WCartesian3DChart.C b/src/Wt/Chart/WCartesian3DChart.C +index f028d75..c5fc675 100644 +--- a/src/Wt/Chart/WCartesian3DChart.C ++++ b/src/Wt/Chart/WCartesian3DChart.C +@@ -321,34 +321,34 @@ void WCartesian3DChart::createRay(double x, double y, WVector3 &eye, WVector3 &d + invTransform = + #endif + invTransform.inverted(); +- WVector4 near( ++ WVector4 near_( + x / width().value() * 2 - 1, + y / height().value() * (-2) + 1, + -1.0, + 1.0 + ); +- WVector4 far( +- near.x(), +- near.y(), ++ WVector4 far_( ++ near_.x(), ++ near_.y(), + 1.0, + 1.0 + ); +- near = invTransform * near; +- far = invTransform * far; +- near = near / near.w(); +- far = far / far.w(); +- WVector4 ray = far - near; ++ near_ = invTransform * near_; ++ far_ = invTransform * far_; ++ near_ = near_ / near_.w(); ++ far_ = far_ / far_.w(); ++ WVector4 ray = far_ - near_; + ray.normalize(); + #ifndef WT_TARGET_JAVA + direction = WVector3(ray.x(), ray.z(), ray.y()); +- eye = WVector3(near.x(), near.z(), near.y()); ++ eye = WVector3(near_.x(), near_.z(), near_.y()); + #else + direction.setElement(0, ray.x()); + direction.setElement(1, ray.z()); + direction.setElement(2, ray.y()); +- eye.setElement(0, near.x()); +- eye.setElement(1, near.z()); +- eye.setElement(2, near.y()); ++ eye.setElement(0, near_.x()); ++ eye.setElement(1, near_.z()); ++ eye.setElement(2, near_.y()); + #endif + } + +-- +1.7.10.4 + diff --git a/src/wt.mk b/src/wt.mk index 3f9a96b..6740881 100644 --- a/src/wt.mk +++ b/src/wt.mk @@ -3,8 +3,8 @@ PKG := wt $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.1 -$(PKG)_CHECKSUM := 0ae889c1411864d783962d4878b90efbce7f3382 +$(PKG)_VERSION := 3.3.4 +$(PKG)_CHECKSUM := 131738a16cce9a873dd39138a80976df55cb5564 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/witty/$($(PKG)_FILE) -- cgit v0.12