mirror of https://git.wownero.com/dsc/mxe.git
update package vmime
This commit is contained in:
parent
7e84b41929
commit
bae3ccbef0
|
@ -1,10 +1,10 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 96e55516b44e03bb5c2882ef436bdd89757ed287 Mon Sep 17 00:00:00 2001
|
||||
From 80a6fbf5170509f5eab94dd36f64ad8a0406e928 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 14 May 2013 09:21:46 +0200
|
||||
Subject: [PATCH] predefine VMIME_STATIC for convenience
|
||||
Subject: [PATCH 1/3] predefine VMIME_STATIC for convenience
|
||||
|
||||
|
||||
diff --git a/vmime.pc.in b/vmime.pc.in
|
||||
|
@ -19,5 +19,54 @@ index fc1103e..11dd0ea 100644
|
|||
+Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ -DVMIME_STATIC
|
||||
|
||||
--
|
||||
1.8.4
|
||||
1.8.4.5
|
||||
|
||||
|
||||
From f5b2e83eb4b96c6cd061bcca9249dc40d1ec3fb2 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 10 Jan 2014 03:20:11 +0100
|
||||
Subject: [PATCH 2/3] remove -ansi because it interferes with -std=c++11
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aac379c..9aa0283 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1020,7 +1020,7 @@ ELSE()
|
||||
|
||||
SET(
|
||||
CMAKE_CXX_FLAGS
|
||||
- "${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -ansi -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
|
||||
+ "${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
|
||||
CACHE STRING
|
||||
"g++ Compiler Flags"
|
||||
FORCE
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
|
||||
From 64daad47a33daaf9f5120941a9255be9d40391f0 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Wed, 26 Mar 2014 23:45:05 +0100
|
||||
Subject: [PATCH 3/3] workaround for stricmp decl problem on mingw32
|
||||
(mingw.org)
|
||||
|
||||
|
||||
diff --git a/src/vmime/platforms/windows/windowsCodepages.hpp b/src/vmime/platforms/windows/windowsCodepages.hpp
|
||||
index dfd6afd..f01bc47 100644
|
||||
--- a/src/vmime/platforms/windows/windowsCodepages.hpp
|
||||
+++ b/src/vmime/platforms/windows/windowsCodepages.hpp
|
||||
@@ -32,6 +32,10 @@
|
||||
|
||||
|
||||
#include <string.h>
|
||||
+#define stricmp _stricmp
|
||||
+extern "C" {
|
||||
+_CRTIMP int __cdecl __MINGW_NOTHROW _stricmp (const char*, const char*);
|
||||
+}
|
||||
|
||||
|
||||
namespace vmime {
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
# This file was generated by CMake because it detected TRY_RUN() commands
|
||||
# in crosscompiling mode. It will be overwritten by the next CMake run.
|
||||
# Copy it to a safe location, set the variables to appropriate values
|
||||
# and use it then to preset the CMake cache (using -C).
|
||||
|
||||
|
||||
# _RUN_RESULT_VAR
|
||||
# indicates whether the executable would have been able to run on its
|
||||
# target platform. If so, set _RUN_RESULT_VAR to
|
||||
# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
|
||||
# The _COMPILE_RESULT_VAR variable holds the build result for this TRY_RUN().
|
||||
#
|
||||
# Source file : /home/brand/projects/mxe/mxe/tmp-vmime/kisli-vmime-5f63d47/cmake/cmake-cxx11/Modules/CheckCXX11Features/cxx11-test-__func__.cpp
|
||||
# Executable : /home/brand/projects/mxe/mxe/tmp-vmime/kisli-vmime-5f63d47/CMakeFiles/cmTryCompileExec3506745296-_RUN_RESULT_VAR.exe
|
||||
# Run arguments :
|
||||
# Called from: [2] /home/brand/projects/mxe/mxe/tmp-vmime/kisli-vmime-5f63d47/cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake
|
||||
# [1] /home/brand/projects/mxe/mxe/tmp-vmime/kisli-vmime-5f63d47/CMakeLists.txt
|
||||
|
||||
SET( _RUN_RESULT_VAR
|
||||
0
|
||||
CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
|
10
src/vmime.mk
10
src/vmime.mk
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := vmime
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 043c3d2
|
||||
$(PKG)_CHECKSUM := e5df22a860c8f2173667dada53eb1c997c16b401
|
||||
$(PKG)_VERSION := 4cf7e02
|
||||
$(PKG)_CHECKSUM := 62054750162b4691498c97353c113e9d1de40cec
|
||||
$(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)
|
||||
|
@ -32,6 +32,10 @@ define $(PKG)_BUILD
|
|||
-DICU_LIBRARIES="`'$(TARGET)-pkg-config' --libs-only-l icu-i18n`" \
|
||||
-DVMIME_CHARSETCONV_LIB_IS_ICONV=ON \
|
||||
-DVMIME_CHARSETCONV_LIB_IS_ICU=OFF \
|
||||
-DVMIME_CHARSETCONV_LIB_IS_WIN=OFF \
|
||||
-DVMIME_SHARED_PTR_USE_CXX=ON \
|
||||
-DCXX11_COMPILER_FLAGS=ON \
|
||||
-C../../src/vmime-TryRunResults.cmake \
|
||||
.
|
||||
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
|
@ -39,7 +43,7 @@ define $(PKG)_BUILD
|
|||
$(MAKE) -C '$(1)' install
|
||||
|
||||
$(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp'
|
||||
$(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \
|
||||
$(TARGET)-g++ -s -std=c++0x -o '$(1)/examples/test-vmime.exe' \
|
||||
'$(1)/examples/example6.cpp' \
|
||||
`'$(TARGET)-pkg-config' vmime --cflags --libs`
|
||||
$(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/'
|
||||
|
|
Loading…
Reference in New Issue