|
|
|
@ -1,17 +1,17 @@
|
|
|
|
|
This file is part of MXE.
|
|
|
|
|
See index.html for further information.
|
|
|
|
|
|
|
|
|
|
From 156f87098b2f799b7b8a0448e46e0c89d7ab1314 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From d7c84c62640dce890a1f9669f3ad3aa28e42379a Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Fri, 1 Mar 2013 13:27:47 +0100
|
|
|
|
|
Subject: [PATCH 1/4] fix duplicate info in .pc files
|
|
|
|
|
Subject: [PATCH 1/3] fix duplicate info in .pc files
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 507cf3a..c7fa6b2 100644
|
|
|
|
|
index 67c4a9d..711ce53 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -481,8 +481,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
|
|
|
|
|
@@ -517,8 +517,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
|
|
|
|
|
)
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ index 507cf3a..c7fa6b2 100644
|
|
|
|
|
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl")
|
|
|
|
|
|
|
|
|
|
ENDIF()
|
|
|
|
|
@@ -538,8 +536,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
|
|
|
|
|
@@ -574,8 +572,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
|
|
|
|
|
)
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
@ -30,20 +30,20 @@ index 507cf3a..c7fa6b2 100644
|
|
|
|
|
|
|
|
|
|
ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL)
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
1.8.1.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From eda515be0addb9f2b9f1caa3d6ea43eb42667346 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 4e65257321c15af69a4374d54a868c7f271a14f7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Fri, 1 Mar 2013 13:44:43 +0100
|
|
|
|
|
Subject: [PATCH 2/4] bin is no lib
|
|
|
|
|
Subject: [PATCH 2/3] bin is no lib
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index c7fa6b2..947cb61 100644
|
|
|
|
|
index 711ce53..357d793 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -299,9 +299,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "")
|
|
|
|
|
@@ -335,9 +335,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "")
|
|
|
|
|
IF(${UNIX})
|
|
|
|
|
SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
|
|
|
|
|
ENDIF(${UNIX})
|
|
|
|
@ -54,20 +54,20 @@ index c7fa6b2..947cb61 100644
|
|
|
|
|
|
|
|
|
|
##############################################################################
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
1.8.1.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From f9209c0f50b0a094dd5a0167fd4e7c0954b43ee1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 70df0e04b235f9d68377bb5258646b076a8bf81c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Thu, 7 Mar 2013 00:00:13 +0100
|
|
|
|
|
Subject: [PATCH 3/4] libdir for mingw too
|
|
|
|
|
Subject: [PATCH 3/3] libdir for mingw too
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 947cb61..ba13324 100644
|
|
|
|
|
index 357d793..e4266af 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -296,9 +296,9 @@ SET(VMIME_PKGCONFIG_LIBS "")
|
|
|
|
|
@@ -332,9 +332,9 @@ SET(VMIME_PKGCONFIG_LIBS "")
|
|
|
|
|
SET(VMIME_PKGCONFIG_CFLAGS "")
|
|
|
|
|
SET(VMIME_PKGCONFIG_REQUIRES "")
|
|
|
|
|
|
|
|
|
@ -80,28 +80,5 @@ index 947cb61..ba13324 100644
|
|
|
|
|
|
|
|
|
|
##############################################################################
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From a2b35277901059271ea22dd360d394ad61cdc81e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Thu, 7 Mar 2013 00:26:12 +0100
|
|
|
|
|
Subject: [PATCH 4/4] link winsock for static builds
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index ba13324..bd268c1 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -623,6 +623,8 @@ IF(WIN32)
|
|
|
|
|
${TARGET_LINK_LIBRARIES}
|
|
|
|
|
"ws2_32"
|
|
|
|
|
)
|
|
|
|
|
+ ELSE()
|
|
|
|
|
+ SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} -lws2_32")
|
|
|
|
|
ENDIF()
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
1.8.1.4
|
|
|
|
|
|
|
|
|
|