diff options
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/vmime-1-fixes.patch | 67 | ||||
| -rw-r--r-- | src/vmime.mk | 7 |
3 files changed, 52 insertions, 24 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">18846c3</td> + <td id="vmime-version">36bbdea</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 afe2b38..a8c7048 100644 --- a/src/vmime-1-fixes.patch +++ b/src/vmime-1-fixes.patch @@ -1,25 +1,58 @@ This file is part of MXE. See index.html for further information. -From 4273540b3b893d0c9a8b7d21ebb9147acc7d1477 Mon Sep 17 00:00:00 2001 +From 72fc51163706467f935beee4ac9a45c0e5662699 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 12 Nov 2012 13:58:12 +0100 -Subject: [PATCH] add private dependencies to .pc file (MXE-specific) - - -diff --git a/libvmime.pc.in b/libvmime.pc.in -index 5745c52..d9e153f 100644 ---- a/libvmime.pc.in -+++ b/libvmime.pc.in -@@ -7,6 +7,8 @@ Name: @VMIME_LIBRARY_NAME@ - Description: @VMIME_PACKAGE_DESCRIPTION@ - Version: @VMIME_PACKAGE_VERSION@ - Requires: @VMIME_PKGCONFIG_REQUIRES@ -+Requires.private: gnutls libgsasl - Libs: -L${libdir} -lvmime @VMIME_PKGCONFIG_LIBS@ -+Libs.private: -liconv -lws2_32 - Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ +Date: Fri, 1 Mar 2013 13:27:47 +0100 +Subject: [PATCH 1/2] fix duplicate info in .pc files + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4b655a..c37407e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -480,8 +480,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) + ) + ENDIF() + +- SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}") +- SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${GSASL_INCLUDE_DIR}") + SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl") + + ENDIF() +@@ -537,8 +535,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) + ) + ENDIF() + +- SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}") +- SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${GNUTLS_INCLUDE_DIR}") + SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} gnutls") + + ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL) +-- +1.7.10.4 + + +From 65d518e5822da1bbfbc1506829785ce3df638852 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 + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c37407e..6fc2e38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -298,9 +298,6 @@ SET(VMIME_PKGCONFIG_REQUIRES "") + IF(${UNIX}) + SET(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + ENDIF(${UNIX}) +-IF(${WIN32}) +- SET(libdir ${CMAKE_INSTALL_PREFIX}/bin) +-ENDIF(${WIN32}) + + ############################################################################## -- 1.7.10.4 diff --git a/src/vmime.mk b/src/vmime.mk index fbcfe25..56ad358 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,7 +3,7 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 8cea33126bd0d1bb3f365d76706d858d4fffaf1c +$(PKG)_CHECKSUM := 92cd1364c51b608bd85ed6d642f24663bbf847fa $(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 @@ -26,13 +26,8 @@ define $(PKG)_BUILD -DVMIME_BUILD_SHARED_LIBRARY=OFF \ . - # Disable VMIME_HAVE_MLANG_H - # We have the header, but there is no implementation for IMultiLanguage in MinGW - $(SED) -i 's,^#define VMIME_HAVE_MLANG_H 1$$,,' '$(1)/vmime/config.hpp' - $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' install - $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(PREFIX)/$(TARGET)/include/vmime/' $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \ |