summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-03-15 15:05:48 (GMT)
committerMark Brand <mabrand@mabrand.nl>2011-03-15 15:05:48 (GMT)
commit8435e60aed19cba01fcbf5043a098dbad647d2d6 (patch)
treeccfe5196c6df9abcd99a041b773252013ca38d5e /src
parent4fdf6105ec0bde4973f1c09567af506a73ca2965 (diff)
downloadmxe-8435e60aed19cba01fcbf5043a098dbad647d2d6.zip
mxe-8435e60aed19cba01fcbf5043a098dbad647d2d6.tar.gz
mxe-8435e60aed19cba01fcbf5043a098dbad647d2d6.tar.bz2
package vmime: fix .pc file
Diffstat (limited to 'src')
-rw-r--r--src/vmime-1-fixes.patch37
1 files changed, 30 insertions, 7 deletions
diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch
index 5659d0d..844abd9 100644
--- a/src/vmime-1-fixes.patch
+++ b/src/vmime-1-fixes.patch
@@ -44,7 +44,7 @@ GITDIR=~/projects/vmime/git/vmime
From c6f077e695b75d9ff9a32d1621f6a320c8ce70f1 Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Tue, 30 Nov 2010 14:57:03 +0000
-Subject: [PATCH 1/7] Initialize and delete object.
+Subject: [PATCH 1/8] Initialize and delete object.
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@577 5301114d-f842-0410-bbdd-996ee0417009
@@ -78,7 +78,7 @@ index 0f3e9ec..d71c3ca 100644
From 41203315eacf53230dd7bdb0cf2b0d1078ddee39 Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Wed, 8 Dec 2010 08:52:54 +0000
-Subject: [PATCH 2/7] No extra space between ':' and '<' in MAIL FROM and RCPT TO. Wait for server response after QUIT and before closing connection.
+Subject: [PATCH 2/8] No extra space between ':' and '<' in MAIL FROM and RCPT TO. Wait for server response after QUIT and before closing connection.
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@579 5301114d-f842-0410-bbdd-996ee0417009
@@ -119,7 +119,7 @@ index 204daae..d9fb7b8 100644
From 969b56f4bd61ddb8277c04ac2a1e35e029ec058b Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Fri, 10 Dec 2010 16:24:06 +0000
-Subject: [PATCH 3/7] Fixed unit test after bug fix.
+Subject: [PATCH 3/8] Fixed unit test after bug fix.
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@580 5301114d-f842-0410-bbdd-996ee0417009
@@ -143,7 +143,7 @@ index 5015552..6552f9e 100644
From 50743da0712b216533acdc09069f1bfc81f988c6 Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Fri, 10 Dec 2010 16:54:38 +0000
-Subject: [PATCH 4/7] Fixed boundary parsing (thanks to John van der Kamp, Zarafa).
+Subject: [PATCH 4/8] Fixed boundary parsing (thanks to John van der Kamp, Zarafa).
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@581 5301114d-f842-0410-bbdd-996ee0417009
@@ -231,7 +231,7 @@ index 12c4f74..df2bf85 100644
From b6d2b4765c9472ff333cace13c57c6af0e866ee0 Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Fri, 21 Jan 2011 15:28:06 +0000
-Subject: [PATCH 5/7] Fixed possible infinite loop (thanks to John van der Kamp, Zarafa).
+Subject: [PATCH 5/8] Fixed possible infinite loop (thanks to John van der Kamp, Zarafa).
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@582 5301114d-f842-0410-bbdd-996ee0417009
@@ -283,7 +283,7 @@ index b84f376..746ac94 100644
From 022339ab63430d792d0314f51dd7854eabd5736e Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Fri, 28 Jan 2011 12:11:08 +0000
-Subject: [PATCH 6/7] Fixed possible read to invalid memory location (thanks to Alexander Konovalov).
+Subject: [PATCH 6/8] Fixed possible read to invalid memory location (thanks to Alexander Konovalov).
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@583 5301114d-f842-0410-bbdd-996ee0417009
@@ -307,7 +307,7 @@ index 1c1c1a6..fa08d33 100644
From 7f1024917b3df6be013e18a2e0f0f1b13f4d112b Mon Sep 17 00:00:00 2001
From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
Date: Wed, 9 Mar 2011 18:03:31 +0000
-Subject: [PATCH 7/7] Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixed 'no encoding' when forced.
+Subject: [PATCH 7/8] Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixed 'no encoding' when forced.
git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@584 5301114d-f842-0410-bbdd-996ee0417009
(cherry picked from commit 07ebf241115eba44675223e307d212c772e1cc08)
@@ -509,3 +509,26 @@ index df2bf85..b129913 100644
--
1.7.4.1
+
+From 9a1437295208e86a3b9ebe503826ee52c7175997 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 15 Mar 2011 15:59:05 +0100
+Subject: [PATCH 8/8] fix .pc file for mingw
+
+
+diff --git a/SConstruct b/SConstruct
+index fb01edf..ed0c376 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1709,7 +1709,7 @@ fi
+
+ # -- Link with Winsock (Windows)
+ if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then
+- VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32"
++ VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -liconv -lws2_32"
+ fi
+
+ # -- getaddrinfo (POSIX)
+--
+1.7.4.1
+