diff options
Diffstat (limited to 'mail/libvmime/files')
| -rw-r--r-- | mail/libvmime/files/patch-cmake__FindIconv.cmake | 11 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-configure | 59 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-src__mailboxField.cpp | 11 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp | 21 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-vmime__base.hpp | 11 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp | 11 |
6 files changed, 32 insertions, 92 deletions
diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake new file mode 100644 index 000000000000..280eb3ae293e --- /dev/null +++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake @@ -0,0 +1,11 @@ +--- cmake/FindIconv.cmake.orig 2014-06-30 22:48:42.000000000 +0200 ++++ cmake/FindIconv.cmake 2014-07-22 12:50:55.000000000 +0200 +@@ -18,7 +18,7 @@ + IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib") + ELSE() +- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c) ++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2) + ENDIF() + + IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure deleted file mode 100644 index ffe4d9c06dbf..000000000000 --- a/mail/libvmime/files/patch-configure +++ /dev/null @@ -1,59 +0,0 @@ ---- ./configure.orig 2010-11-16 04:56:00.000000000 -0800 -+++ ./configure 2011-05-03 11:24:44.023730993 -0700 -@@ -4120,13 +4120,13 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -4657,13 +4657,13 @@ - CXXFLAGS=$ac_save_CXXFLAGS - elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -+ CXXFLAGS="-g" - else - CXXFLAGS="-g" - fi - else - if test "$GXX" = yes; then -- CXXFLAGS="-O2" -+ CXXFLAGS="" - else - CXXFLAGS= - fi -@@ -15610,13 +15610,13 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -21047,7 +21047,7 @@ - else - # -O2 - OLD_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -O2" -+ CXXFLAGS="$CXXFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc accepts -O2" >&5 - $as_echo_n "checking whether cc accepts -O2... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/mail/libvmime/files/patch-src__mailboxField.cpp b/mail/libvmime/files/patch-src__mailboxField.cpp deleted file mode 100644 index 94d559aa5447..000000000000 --- a/mail/libvmime/files/patch-src__mailboxField.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/mailboxField.cpp.orig 2009-09-06 05:10:27.000000000 -0700 -+++ ./src/mailboxField.cpp 2012-03-08 10:49:05.687243933 -0800 -@@ -51,7 +51,7 @@ - // Here, we cannot simply call "m_mailbox.parse()" because it - // may have more than one address specified (even if this field - // should contain only one). We are never too much careful... -- ref <address> parsedAddress = address::parseNext(buffer, position, end, newPosition); -+ ref <address> parsedAddress = mailbox::parseNext(buffer, position, end, newPosition); - - if (parsedAddress) - { diff --git a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp new file mode 100644 index 000000000000..a58c51e535a8 --- /dev/null +++ b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp @@ -0,0 +1,21 @@ +--- src/vmime/platforms/posix/posixHandler.cpp.orig 2014-07-22 15:24:26.000000000 +0200 ++++ src/vmime/platforms/posix/posixHandler.cpp 2014-07-22 15:59:33.000000000 +0200 +@@ -41,6 +41,7 @@ + #include <errno.h> + + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/stat.h> + + #if VMIME_HAVE_SYSCALL +@@ -238,7 +239,9 @@ + #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID + return static_cast <unsigned int>(::syscall(SYS_gettid)); + #else +- #error We have no implementation of getThreadId() for this platform! ++ long id; ++ ::syscall(SYS_thr_self, &id); ++ return static_cast <unsigned int>(id); + #endif + } + diff --git a/mail/libvmime/files/patch-vmime__base.hpp b/mail/libvmime/files/patch-vmime__base.hpp deleted file mode 100644 index eae3e285d0d3..000000000000 --- a/mail/libvmime/files/patch-vmime__base.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vmime/base.hpp.orig 2010-02-06 10:12:57.000000000 -0800 -+++ ./vmime/base.hpp 2013-09-05 17:05:39.233608129 -0700 -@@ -252,7 +252,7 @@ - template <class X, class Y> - ref <X> dynamicCast(ref <Y> y) - { -- return y.dynamicCast <X>(); -+ return y. template dynamicCast <X>(); - } - - } // vmime diff --git a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp b/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp deleted file mode 100644 index b91cb20864e0..000000000000 --- a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vmime/utility/smartPtrInt.hpp.orig 2009-09-06 05:10:27.000000000 -0700 -+++ ./vmime/utility/smartPtrInt.hpp 2013-09-12 11:22:28.695743913 -0700 -@@ -28,6 +28,8 @@ - #include "vmime/config.hpp" - #include "vmime/utility/smartPtr.hpp" - -+#include <pthread.h> -+ - - namespace vmime { - namespace utility { |