mirror of https://git.wownero.com/dsc/mxe.git
wt: update from 3.3.4 to 3.3.5
Remove patches merged in upstream.
This commit is contained in:
Boris Nagaev
parent
94b36dc353
commit
4eecf2c071
|
|
@ -1,78 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From e81074f3819bd5b10b047132cfa473516a547afd Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 051edee4feb365a0f79fa971c7bf95dfe2b4f58a Mon Sep 17 00:00:00 2001
|
||||
From: Koen Deforche <koen@emweb.be>
|
||||
Date: Tue, 21 Apr 2015 21:24:09 +0200
|
||||
Subject: [PATCH 22/22] Several changes:
|
||||
|
||||
- applied patch from Stefan Ruppert for building on mingw64
|
||||
---
|
||||
src/Wt/WServer | 6 ++---
|
||||
src/Wt/WServer.C | 15 ++++++++++++
|
||||
|
||||
diff --git a/src/Wt/WServer b/src/Wt/WServer
|
||||
index 0be01bd..9d25551 100644
|
||||
--- a/src/Wt/WServer
|
||||
+++ b/src/Wt/WServer
|
||||
@@ -441,7 +441,7 @@ public:
|
||||
*
|
||||
* \sa setLocalizedStrings()
|
||||
*/
|
||||
- WT_API WLocalizedStrings *localizedStrings() { return localizedStrings_; }
|
||||
+ WT_API WLocalizedStrings *localizedStrings();
|
||||
|
||||
#ifndef WT_TARGET_JAVA
|
||||
|
||||
@@ -461,7 +461,7 @@ public:
|
||||
* This is the logger class used in WApplication::log() and
|
||||
* Wt::log() functions.
|
||||
*/
|
||||
- WT_API WLogger& logger() { return logger_; }
|
||||
+ WT_API WLogger& logger();
|
||||
|
||||
/*! \brief Adds an entry to the log.
|
||||
*
|
||||
@@ -477,7 +477,7 @@ public:
|
||||
|
||||
WT_API Configuration& configuration();
|
||||
|
||||
- WT_API WebController *controller() { return webController_; }
|
||||
+ WT_API WebController *controller();
|
||||
|
||||
#ifndef WT_TARGET_JAVA
|
||||
WT_API void scheduleStop();
|
||||
diff --git a/src/Wt/WServer.C b/src/Wt/WServer.C
|
||||
index ddf710d..0941fd4 100644
|
||||
--- a/src/Wt/WServer.C
|
||||
+++ b/src/Wt/WServer.C
|
||||
@@ -78,6 +78,11 @@ void WServer::setLocalizedStrings(WLocalizedStrings *stringResolver)
|
||||
localizedStrings_ = stringResolver;
|
||||
}
|
||||
|
||||
+WLocalizedStrings *WServer::localizedStrings()
|
||||
+{
|
||||
+ return localizedStrings_;
|
||||
+}
|
||||
+
|
||||
void WServer::setIOService(WIOService& ioService)
|
||||
{
|
||||
if (ioService_) {
|
||||
@@ -128,6 +133,11 @@ void WServer::setConfiguration(const std::string& file,
|
||||
application_ = application;
|
||||
}
|
||||
|
||||
+WLogger& WServer::logger()
|
||||
+{
|
||||
+ return logger_;
|
||||
+}
|
||||
+
|
||||
WLogEntry WServer::log(const std::string& type) const
|
||||
{
|
||||
WLogEntry e = logger_.entry(type);
|
||||
@@ -168,6 +178,11 @@ Configuration& WServer::configuration()
|
||||
return *configuration_;
|
||||
}
|
||||
|
||||
+WebController *WServer::controller()
|
||||
+{
|
||||
+ return webController_;
|
||||
+}
|
||||
+
|
||||
bool WServer::readConfigurationProperty(const std::string& name,
|
||||
std::string& value) const
|
||||
{
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 80e187872cc72153417ab1f2d9b6caa3c156eef1 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Sun, 30 Aug 2015 22:28:48 +0200
|
||||
Subject: [PATCH] WtFindPostgresql: secur32 ws2_32 in lowercase
|
||||
|
||||
Fix mingw64 build
|
||||
---
|
||||
cmake/WtFindPostgresql.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/WtFindPostgresql.txt b/cmake/WtFindPostgresql.txt
|
||||
index 68403ae..9a298cc 100644
|
||||
--- a/cmake/WtFindPostgresql.txt
|
||||
+++ b/cmake/WtFindPostgresql.txt
|
||||
@@ -59,7 +59,7 @@ IF(POSTGRES_LIBRARIES AND POSTGRES_INCLUDE)
|
||||
SET(POSTGRES_FOUND TRUE)
|
||||
SET(POSTGRES_INCLUDE_DIRS ${POSTGRES_INCLUDE})
|
||||
IF (WIN32)
|
||||
- SET(POSTGRES_LIBRARIES Secur32.lib Ws2_32.lib ${POSTGRES_LIBRARIES})
|
||||
+ SET(POSTGRES_LIBRARIES secur32.lib ws2_32.lib ${POSTGRES_LIBRARIES})
|
||||
ENDIF (WIN32)
|
||||
ENDIF(POSTGRES_LIBRARIES AND POSTGRES_INCLUDE)
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
PKG := wt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 3.3.4
|
||||
$(PKG)_CHECKSUM := 327f9c64504366e3f2fa2c8f1d1a23efc7b8fba8ace3869de375d668f99ede10
|
||||
$(PKG)_VERSION := 3.3.5
|
||||
$(PKG)_CHECKSUM := c136ce78ee00fe950071ab56a112b5d9a1fc19944b56a530b1826de865523eaf
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/witty/$($(PKG)_FILE)
|
||||
$(PKG)_URL := https://github.com/kdeforche/wt/archive/$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_DEPS := gcc boost graphicsmagick libharu openssl pango postgresql qt sqlite
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
|
|
|
|||
Loading…
Reference in New Issue