summaryrefslogtreecommitdiffstats
path: root/src/wt-1-fixes.patch
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2017-04-01 13:19:13 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2017-04-01 19:12:19 (GMT)
commit4951ac90b3782474cd3a98f16b00edf5caa804ab (patch)
treecf4b3fcda6537e2b7d3949863c950c6ecd442168 /src/wt-1-fixes.patch
parent671d517af3c0504a62dd37862b102c3ebeba5593 (diff)
downloadmxe-4951ac90b3782474cd3a98f16b00edf5caa804ab.zip
mxe-4951ac90b3782474cd3a98f16b00edf5caa804ab.tar.gz
mxe-4951ac90b3782474cd3a98f16b00edf5caa804ab.tar.bz2
update wt to 3.3.7
Diffstat (limited to 'src/wt-1-fixes.patch')
-rw-r--r--src/wt-1-fixes.patch31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch
index 11b129c..e619196 100644
--- a/src/wt-1-fixes.patch
+++ b/src/wt-1-fixes.patch
@@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
-From 91ffd2fb6f9c5ed3017af5363b3f14313a45ea9c Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Mon, 18 Jun 2012 13:23:21 +0200
-Subject: [PATCH 1/2] fixes for mxe
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Sat, 1 Apr 2017 15:17:43 +0200
+Subject: [PATCH] Wt fixes
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
-index e48b21e..1198139 100644
+index 1111111..2222222 100644
--- a/cmake/WtFindBoost-vintage.txt
+++ b/cmake/WtFindBoost-vintage.txt
@@ -70,6 +70,7 @@ ELSE(MSVC)
@@ -21,7 +21,7 @@ index e48b21e..1198139 100644
boost_thread-mt
boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
-index 76697fc..9bc0fa1 100644
+index 1111111..2222222 100644
--- a/cmake/WtFindGm.txt
+++ b/cmake/WtFindGm.txt
@@ -59,6 +59,12 @@ IF(WIN32)
@@ -38,10 +38,10 @@ index 76697fc..9bc0fa1 100644
FIND_LIBRARY(GM_LIB
NAMES
diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
-index cd1e640..b1bbe3d 100644
+index 1111111..2222222 100644
--- a/cmake/WtFindPangoFt2.txt
+++ b/cmake/WtFindPangoFt2.txt
-@@ -36,11 +36,15 @@ SET(PANGO_FT2_INCLUDE_DIRS
+@@ -43,13 +43,17 @@ SET(PANGO_FT2_INCLUDE_DIRS
${GLIB2_INCLUDE_DIR}
${GLIB2_CONFIG_INCLUDE_DIR})
@@ -49,7 +49,9 @@ index cd1e640..b1bbe3d 100644
- ${PANGO_FT2_LIBRARY}
- ${PANGO_LIBRARY}
- ${GOBJECT2_LIBRARY}
-- ${GLIB2_LIBRARY})
+- ${GLIB2_LIBRARY}
+- ${FONTCONFIG_LIBRARY}
+- )
+IF(PANGO_FT2_LIBS)
+ SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS})
+ELSE(PANGO_FT2_LIBS)
@@ -57,16 +59,18 @@ index cd1e640..b1bbe3d 100644
+ ${PANGO_FT2_LIBRARY}
+ ${PANGO_LIBRARY}
+ ${GOBJECT2_LIBRARY}
-+ ${GLIB2_LIBRARY})
++ ${GLIB2_LIBRARY}
++ ${FONTCONFIG_LIBRARY}
++ )
+ENDIF(PANGO_FT2_LIBS)
IF (PANGO_INCLUDE_DIR
AND FT2_INCLUDE_DIR
diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
-index d99f1df..7c1f70b 100644
+index 1111111..2222222 100644
--- a/cmake/WtFindSsl.txt
+++ b/cmake/WtFindSsl.txt
-@@ -109,6 +109,11 @@ IF(WIN32)
+@@ -110,6 +110,11 @@ IF(WIN32)
AND SSL_LIB_DEBUG
AND SSL_TOO_LIB_RELEASE
AND SSL_TOO_LIB_DEBUG)
@@ -78,6 +82,3 @@ index d99f1df..7c1f70b 100644
ELSEIF(APPLE)
FIND_LIBRARY(SSL_LIB
NAMES
---
-1.9.3 (Apple Git-50)
-