|
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Boris Nagaev <bnagaev@gmail.com>
|
|
|
|
From: Boris Nagaev <bnagaev@gmail.com>
|
|
|
|
Date: Sat, 1 Apr 2017 15:17:43 +0200
|
|
|
|
Date: Sat, 1 Apr 2017 15:17:43 +0200
|
|
|
|
Subject: [PATCH 1/5] Wt fixes
|
|
|
|
Subject: [PATCH 1/3] Wt fixes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
|
|
|
|
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
|
|
|
@ -55,37 +55,10 @@ index 1111111..2222222 100644
|
|
|
|
IF (PANGO_INCLUDE_DIR
|
|
|
|
IF (PANGO_INCLUDE_DIR
|
|
|
|
AND FT2_INCLUDE_DIR
|
|
|
|
AND FT2_INCLUDE_DIR
|
|
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
|
|
|
Date: Wed, 15 Aug 2018 13:28:31 +1000
|
|
|
|
|
|
|
|
Subject: [PATCH 2/5] fix w32 build posix threads enabled
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/http/Reply.C b/src/http/Reply.C
|
|
|
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
|
|
|
--- a/src/http/Reply.C
|
|
|
|
|
|
|
|
+++ b/src/http/Reply.C
|
|
|
|
|
|
|
|
@@ -25,6 +25,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef WT_WIN32
|
|
|
|
|
|
|
|
#ifndef __MINGW32__
|
|
|
|
|
|
|
|
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
|
|
|
|
|
|
|
|
// gmtime_r can be defined by mingw
|
|
|
|
|
|
|
|
#ifndef gmtime_r
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
@@ -43,6 +44,7 @@ struct tm* gmtime_r(const time_t* t, struct tm* r)
|
|
|
|
|
|
|
|
#endif // gmtime_r
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace Wt {
|
|
|
|
|
|
|
|
LOGGER("wthttp");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
Date: Mon, 17 Sep 2018 23:31:42 +0200
|
|
|
|
Date: Mon, 17 Sep 2018 23:31:42 +0200
|
|
|
|
Subject: [PATCH 3/5] fix missing gmtime_r definition
|
|
|
|
Subject: [PATCH 2/3] fix missing gmtime_r definition
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/http/Reply.C b/src/http/Reply.C
|
|
|
|
diff --git a/src/http/Reply.C b/src/http/Reply.C
|
|
|
@ -104,9 +77,22 @@ index 1111111..2222222 100644
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
Date: Sat, 6 Jul 2019 17:25:06 +0200
|
|
|
|
Date: Sat, 6 Jul 2019 17:25:06 +0200
|
|
|
|
Subject: [PATCH 4/5] fix build on case senstive filesystem
|
|
|
|
Subject: [PATCH 3/3] fix build on case senstive filesystem
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
|
|
|
--- a/src/CMakeLists.txt
|
|
|
|
|
|
|
|
+++ b/src/CMakeLists.txt
|
|
|
|
|
|
|
|
@@ -574,7 +574,7 @@ IF(HAVE_SSL)
|
|
|
|
|
|
|
|
TARGET_LINK_LIBRARIES(wt PRIVATE ${OPENSSL_LIBRARIES})
|
|
|
|
|
|
|
|
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
|
|
|
|
- TARGET_LINK_LIBRARIES(wt PRIVATE Crypt32.lib)
|
|
|
|
|
|
|
|
+ TARGET_LINK_LIBRARIES(wt PRIVATE crypt32.lib)
|
|
|
|
|
|
|
|
ENDIF(WIN32)
|
|
|
|
|
|
|
|
ELSE(HAVE_SSL)
|
|
|
|
|
|
|
|
MESSAGE("** Disabling crypto support (Auth::SHA1HashFunction, HTTPS support): requires OpenSSL.")
|
|
|
|
diff --git a/src/Wt/Dbo/backend/MySQL.C b/src/Wt/Dbo/backend/MySQL.C
|
|
|
|
diff --git a/src/Wt/Dbo/backend/MySQL.C b/src/Wt/Dbo/backend/MySQL.C
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
--- a/src/Wt/Dbo/backend/MySQL.C
|
|
|
|
--- a/src/Wt/Dbo/backend/MySQL.C
|
|
|
@ -137,36 +123,3 @@ index 1111111..2222222 100644
|
|
|
|
#endif // WT_WIN32
|
|
|
|
#endif // WT_WIN32
|
|
|
|
|
|
|
|
|
|
|
|
#include "Wt/Dbo/backend/Postgres.h"
|
|
|
|
#include "Wt/Dbo/backend/Postgres.h"
|
|
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
|
|
|
Date: Sat, 9 Nov 2019 01:33:27 +1100
|
|
|
|
|
|
|
|
Subject: [PATCH 5/5] fix build on case senstive filesystem
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/cmake/WtFindOdbc.txt b/cmake/WtFindOdbc.txt
|
|
|
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
|
|
|
--- a/cmake/WtFindOdbc.txt
|
|
|
|
|
|
|
|
+++ b/cmake/WtFindOdbc.txt
|
|
|
|
|
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
|
|
|
# - ODBC_PREFIX
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
|
|
|
|
-SET(ODBC_LIBRARY Odbc32)
|
|
|
|
|
|
|
|
+SET(ODBC_LIBRARY odbc32)
|
|
|
|
|
|
|
|
SET(ODBC_LIBRARIES ${ODBC_LIBRARY})
|
|
|
|
|
|
|
|
SET(ODBC_INCLUDE "")
|
|
|
|
|
|
|
|
SET(ODBC_FOUND TRUE)
|
|
|
|
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
|
|
|
--- a/src/CMakeLists.txt
|
|
|
|
|
|
|
|
+++ b/src/CMakeLists.txt
|
|
|
|
|
|
|
|
@@ -559,7 +559,7 @@ IF(HAVE_SSL)
|
|
|
|
|
|
|
|
TARGET_LINK_LIBRARIES(wt PRIVATE ${OPENSSL_LIBRARIES})
|
|
|
|
|
|
|
|
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
|
|
|
|
- TARGET_LINK_LIBRARIES(wt PRIVATE Crypt32.lib)
|
|
|
|
|
|
|
|
+ TARGET_LINK_LIBRARIES(wt PRIVATE crypt32.lib)
|
|
|
|
|
|
|
|
ENDIF(WIN32)
|
|
|
|
|
|
|
|
ELSE(HAVE_SSL)
|
|
|
|
|
|
|
|
MESSAGE("** Disabling crypto support (Auth::SHA1HashFunction, HTTPS support): requires OpenSSL.")
|
|
|
|
|
|
|
|