diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-03-06 23:09:09 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-03-06 23:09:09 (GMT) |
| commit | d822db277f86fd901b4eec695da9786088a1f142 (patch) | |
| tree | 36d065e6cc42983b57c84eaa64d1a101b2e7e155 | |
| parent | 9e0b8825f260b522f9de403594af179f240dfb9c (diff) | |
| download | mxe-d822db277f86fd901b4eec695da9786088a1f142.zip mxe-d822db277f86fd901b4eec695da9786088a1f142.tar.gz mxe-d822db277f86fd901b4eec695da9786088a1f142.tar.bz2 | |
update package vmime
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/vmime-1-fixes.patch | 44 | ||||
| -rw-r--r-- | src/vmime.mk | 2 |
3 files changed, 37 insertions, 11 deletions
@@ -2136,7 +2136,7 @@ aptitude -t squeeze-backports install cmake yasm</pre> </tr> <tr> <td id="vmime-package">vmime</td> - <td id="vmime-version">36bbdea</td> + <td id="vmime-version">aa8f39e</td> <td id="vmime-website"><a href="http://www.vmime.org/">VMime</a></td> </tr> <tr> diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch index a8c7048..06927a4 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 72fc51163706467f935beee4ac9a45c0e5662699 Mon Sep 17 00:00:00 2001 +From 156f87098b2f799b7b8a0448e46e0c89d7ab1314 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/2] 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 f4b655a..c37407e 100644 +index 507cf3a..c7fa6b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -480,8 +480,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) +@@ -481,8 +481,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) ) ENDIF() @@ -20,7 +20,7 @@ index f4b655a..c37407e 100644 SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl") ENDIF() -@@ -537,8 +535,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) +@@ -538,8 +536,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) ) ENDIF() @@ -33,17 +33,17 @@ index f4b655a..c37407e 100644 1.7.10.4 -From 65d518e5822da1bbfbc1506829785ce3df638852 Mon Sep 17 00:00:00 2001 +From eda515be0addb9f2b9f1caa3d6ea43eb42667346 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/2] bin is no lib +Subject: [PATCH 2/3] bin is no lib diff --git a/CMakeLists.txt b/CMakeLists.txt -index c37407e..6fc2e38 100644 +index c7fa6b2..947cb61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -298,9 +298,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "") +@@ -299,9 +299,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "") IF(${UNIX}) SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) ENDIF(${UNIX}) @@ -56,3 +56,29 @@ index c37407e..6fc2e38 100644 -- 1.7.10.4 + +From f9209c0f50b0a094dd5a0167fd4e7c0954b43ee1 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/3] libdir for mingw too + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 947cb61..ba13324 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,9 +296,9 @@ SET(VMIME_PKGCONFIG_LIBS "") + SET(VMIME_PKGCONFIG_CFLAGS "") + SET(VMIME_PKGCONFIG_REQUIRES "") + +-IF(${UNIX}) ++IF (UNIX OR MINGW) + SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +-ENDIF(${UNIX}) ++ENDIF(UNIX OR MINGW) + + + ############################################################################## +-- +1.7.10.4 + diff --git a/src/vmime.mk b/src/vmime.mk index 56ad358..c850c91 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,7 +3,7 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 92cd1364c51b608bd85ed6d642f24663bbf847fa +$(PKG)_CHECKSUM := bf56447522efb6f376ae0e0b82da2db0367dd64e $(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 |