summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2013-02-05 23:08:38 (GMT)
committerMark Brand <mabrand@mabrand.nl>2013-02-05 23:08:38 (GMT)
commit894c208af55907e729f29cab558c4001e6da0cf8 (patch)
treee408309e016971ee36ce0ee5b946d34054bb3187 /src
parent9ccd96c08a796c63c4296de4a7aba30405c71487 (diff)
downloadmxe-894c208af55907e729f29cab558c4001e6da0cf8.zip
mxe-894c208af55907e729f29cab558c4001e6da0cf8.tar.gz
mxe-894c208af55907e729f29cab558c4001e6da0cf8.tar.bz2
update package vmime
Diffstat (limited to 'src')
-rw-r--r--src/vmime-1-fixes.patch22
-rw-r--r--src/vmime.mk2
2 files changed, 12 insertions, 12 deletions
diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch
index cec1bec..60215cb 100644
--- a/src/vmime-1-fixes.patch
+++ b/src/vmime-1-fixes.patch
@@ -1,17 +1,17 @@
This file is part of MXE.
See index.html for further information.
-From 9b197ef9721624c30b1df40d5e049d6e45d42a7e Mon Sep 17 00:00:00 2001
+From 1a7959cf317dcb06db55dc44cdf58c89ee223321 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 12 Nov 2012 12:28:25 +0100
Subject: [PATCH 1/2] disable shared libs (MXE-specific)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f044a2..93c90f4 100644
+index 0b9e221..2ca9f1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -81,21 +81,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
+@@ -86,21 +86,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
ENDIF()
ENDIF()
@@ -33,7 +33,7 @@ index 4f044a2..93c90f4 100644
# Static library
#
# Note: cannot have two targets with the same name so the static version has
-@@ -115,19 +100,12 @@ SET_TARGET_PROPERTIES(
+@@ -120,19 +105,12 @@ SET_TARGET_PROPERTIES(
# These next two lines are required but it is unclear exactly what they do.
# The CMake FAQ mentions they are necessary and it does not work otherwise.
@@ -53,7 +53,7 @@ index 4f044a2..93c90f4 100644
TARGETS ${VMIME_LIBRARY_NAME}-static
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
-@@ -215,11 +193,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git;~$;build/")
+@@ -220,11 +198,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git;~$;build/")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
# Set components
@@ -66,7 +66,7 @@ index 4f044a2..93c90f4 100644
SET(CPACK_COMPONENT_STATICLIBS_DISPLAY_NAME "Static libraries")
SET(CPACK_COMPONENT_STATICLIBS_DESCRIPTION
-@@ -229,7 +203,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
+@@ -234,7 +208,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
"C/C++ header files.")
@@ -74,7 +74,7 @@ index 4f044a2..93c90f4 100644
SET(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "")
-@@ -434,12 +407,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
+@@ -438,12 +411,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
${GSASL_INCLUDE_DIR}
)
@@ -87,7 +87,7 @@ index 4f044a2..93c90f4 100644
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}")
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GSASL_INCLUDE_DIR}")
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl")
-@@ -491,12 +458,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -493,12 +460,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
${GNUTLS_LIBRARY_DIRS}
)
@@ -100,7 +100,7 @@ index 4f044a2..93c90f4 100644
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}")
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GNUTLS_INCLUDE_DIR}")
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgnutls")
-@@ -508,12 +469,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -510,12 +471,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
${OPENSSL_INCLUDE_DIR}
)
@@ -113,7 +113,7 @@ index 4f044a2..93c90f4 100644
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}")
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${OPENSSL_INCLUDE_DIR}")
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libopenssl")
-@@ -537,12 +492,6 @@ INCLUDE_DIRECTORIES(
+@@ -539,12 +494,6 @@ INCLUDE_DIRECTORIES(
${ICONV_INCLUDE_DIR}
)
@@ -130,7 +130,7 @@ index 4f044a2..93c90f4 100644
1.7.10.4
-From e31ae435d956b7c8395828df103bbddc135d4aa7 Mon Sep 17 00:00:00 2001
+From 2484acc9f40d72d7dc09e6115c9a2a93eb1c41e6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 12 Nov 2012 13:58:12 +0100
Subject: [PATCH 2/2] add private dependencies to .pc file (MXE-specific)
diff --git a/src/vmime.mk b/src/vmime.mk
index cedb278..d2c1918 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -3,7 +3,7 @@
PKG := vmime
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := edbeb4e3e96148788d469f19614de9743940a6d9
+$(PKG)_CHECKSUM := 803c81b3793341c8f5db405d977f5ee710a4b2e3
$(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$(PKG)_FILE