diff options
| -rw-r--r-- | src/wt-3-wserver-dllimport.patch | 84 | ||||
| -rw-r--r-- | src/wt-4-secur32-ws2-32-in-lowercase.patch | 29 | ||||
| -rw-r--r-- | src/wt.mk | 24 |
3 files changed, 136 insertions, 1 deletions
diff --git a/src/wt-3-wserver-dllimport.patch b/src/wt-3-wserver-dllimport.patch new file mode 100644 index 0000000..ff923b8 --- /dev/null +++ b/src/wt-3-wserver-dllimport.patch @@ -0,0 +1,84 @@ +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 + { diff --git a/src/wt-4-secur32-ws2-32-in-lowercase.patch b/src/wt-4-secur32-ws2-32-in-lowercase.patch new file mode 100644 index 0000000..b9aafb0 --- /dev/null +++ b/src/wt-4-secur32-ws2-32-in-lowercase.patch @@ -0,0 +1,29 @@ +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 + @@ -40,4 +40,26 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 endef -$(PKG)_BUILD_SHARED = +define $(PKG)_BUILD_SHARED + # build wt libraries + mkdir '$(1).build' + cd '$(1).build' && cmake \ + -DCONFIGDIR='$(PREFIX)/$(TARGET)/etc/wt' \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTS=OFF \ + -DSHARED_LIBS=ON \ + -DBOOST_DYNAMIC=ON \ + -DBOOST_PREFIX='$(PREFIX)/$(TARGET)' \ + -DBOOST_COMPILER=_win32 \ + -DSSL_PREFIX='$(PREFIX)/$(TARGET)' \ + -DOPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + -DGM_PREFIX='$(PREFIX)/$(TARGET)' \ + -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \ + -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ + -DENABLE_QT4=ON \ + -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + '$(1)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).build' -j 1 VERBOSE=1 + $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 +endef |