mirror of https://git.wownero.com/dsc/mxe.git
upgrade package vmime to 0.9.1-svn-r537
r537 | vincent-richard | 2010-03-10 16:54:23 +0100 (Wed, 10 Mar 2010) | 1 line Fixed compilation issue with 'const'. r536 | vincent-richard | 2010-03-10 14:29:33 +0100 (Wed, 10 Mar 2010) | 1 line Fixed bug #2966885: memory leak caused by strong ref (thanks to tuxx from SF). r535 | vincent-richard | 2010-03-06 13:48:39 +0100 (Sat, 06 Mar 2010) | 1 line Use 'glibtoolize' instead of 'libtoolize' on MacOSX. Removed "sed hack" for libtoolsize from vmime.mk since r535.
This commit is contained in:
parent
cb64a061d1
commit
4ddb2de249
|
@ -0,0 +1,65 @@
|
||||||
|
This file is part of mingw-cross-env.
|
||||||
|
See doc/index.html for further information.
|
||||||
|
|
||||||
|
diff -urN a/bootstrap b/bootstrap
|
||||||
|
--- a/bootstrap 2010-03-12 09:49:06.176332875 +0100
|
||||||
|
+++ b/bootstrap 2010-03-12 09:50:54.138458453 +0100
|
||||||
|
@@ -13,6 +13,13 @@
|
||||||
|
(mkdir autotools >& /dev/null)
|
||||||
|
(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
|
||||||
|
|
||||||
|
+# Check for "glibtoolize" instead of "libtoolize" on OSX
|
||||||
|
+LIBTOOLIZE=libtoolize
|
||||||
|
+if which glibtoolize > /dev/null 2>&1; then
|
||||||
|
+ LIBTOOLIZE=glibtoolize
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+
|
||||||
|
DIE=0
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
@@ -36,7 +43,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $DIE = 0 ; then
|
||||||
|
- echo -n "* Running libtoolize... " ; (libtoolize --copy --force --automake >& bootstrap.tmpout) \
|
||||||
|
+ echo -n "* Running libtoolize... " ; ($LIBTOOLIZE --copy --force --automake >& bootstrap.tmpout) \
|
||||||
|
&& (echo "[OK]" ; cat bootstrap.tmpout ; rm -f bootstrap.tmpout) \
|
||||||
|
|| (echo "[NO]" ; cat bootstrap.tmpout ; rm -f bootstrap.tmpout ; not_a_command >& /dev/null) || DIE=1
|
||||||
|
fi
|
||||||
|
diff -urN a/src/security/sasl/defaultSASLAuthenticator.cpp b/src/security/sasl/defaultSASLAuthenticator.cpp
|
||||||
|
--- a/src/security/sasl/defaultSASLAuthenticator.cpp 2010-03-12 09:48:28.343325021 +0100
|
||||||
|
+++ b/src/security/sasl/defaultSASLAuthenticator.cpp 2010-03-12 09:50:54.138458453 +0100
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
|
||||||
|
const string defaultSASLAuthenticator::getServiceName() const
|
||||||
|
{
|
||||||
|
- return m_saslSession->getServiceName();
|
||||||
|
+ return m_saslSession.acquire()->getServiceName();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -121,7 +121,7 @@
|
||||||
|
|
||||||
|
ref <SASLSession> defaultSASLAuthenticator::getSASLSession() const
|
||||||
|
{
|
||||||
|
- return m_saslSession;
|
||||||
|
+ return m_saslSession.acquire().constCast <SASLSession>();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
diff -urN a/vmime/security/sasl/defaultSASLAuthenticator.hpp b/vmime/security/sasl/defaultSASLAuthenticator.hpp
|
||||||
|
--- a/vmime/security/sasl/defaultSASLAuthenticator.hpp 2010-03-12 09:48:28.373325002 +0100
|
||||||
|
+++ b/vmime/security/sasl/defaultSASLAuthenticator.hpp 2010-03-12 09:50:54.138458453 +0100
|
||||||
|
@@ -67,10 +67,8 @@
|
||||||
|
|
||||||
|
defaultAuthenticator m_default;
|
||||||
|
|
||||||
|
-
|
||||||
|
weak_ref <net::service> m_service;
|
||||||
|
-
|
||||||
|
- ref <SASLSession> m_saslSession;
|
||||||
|
+ weak_ref <SASLSession> m_saslSession;
|
||||||
|
ref <SASLMechanism> m_saslMech;
|
||||||
|
};
|
||||||
|
|
|
@ -32,7 +32,6 @@ define $(PKG)_BUILD
|
||||||
target='$(TARGET)' \
|
target='$(TARGET)' \
|
||||||
sendmail_path=/sbin/sendmail
|
sendmail_path=/sbin/sendmail
|
||||||
|
|
||||||
$(SED) -i 's,libtoolize ,$(LIBTOOLIZE) ,' '$(1)'/bootstrap
|
|
||||||
cd '$(1)' && ./bootstrap
|
cd '$(1)' && ./bootstrap
|
||||||
cd '$(1)' && ./configure \
|
cd '$(1)' && ./configure \
|
||||||
--prefix='$(PREFIX)/$(TARGET)' \
|
--prefix='$(PREFIX)/$(TARGET)' \
|
||||||
|
|
Loading…
Reference in New Issue