<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5145438cf253764f9f39b29dda2af5821ed6872c">https://github.com/macports/macports-ports/commit/5145438cf253764f9f39b29dda2af5821ed6872c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5145438 wxWidgets-3.0: add upstream patch for strings
</span>5145438 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5145438cf253764f9f39b29dda2af5821ed6872c
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Mar 9 19:08:37 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.0: add upstream patch for strings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.wxwidgets.org/ticket/18355
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/wxWidgets/wxWidgets/pull/1251
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/3804
</span>---
graphics/wxWidgets-3.0/Portfile | 6 ++-
.../files/patch-upstream-strvararg.diff | 52 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/Portfile b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d495a7f..8a17d3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ PortGroup wxWidgets 1.0
</span>
github.setup wxWidgets wxWidgets 3.0.4 v
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
name wxWidgets-3.0
# ugly workaround to allow some C++11-only applications to be built on < 10.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,7 @@ if {${subport} eq ${name}} {
</span> } elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 3.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span> } elseif {${subport} eq "wxgtk-3.0"} {
# with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
# wxgtk-3.0 is here mainly for testing purposes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +84,8 @@ depends_lib port:jpeg \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-upstream-strvararg.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/files/patch-upstream-strvararg.diff b/graphics/wxWidgets-3.0/files/patch-upstream-strvararg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5d19bd3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/files/patch-upstream-strvararg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.wxwidgets.org/ticket/18355
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/wxWidgets/wxWidgets/pull/1252.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b5e3ac742101c20668c8f802f4f32474af2d5e5b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Vadim Zeitlin <vadim@wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 8 Mar 2019 16:13:00 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add support for passing nullptr to wx pseudo-vararg functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Allow passing literal nullptr as an argument corresponding to "%p" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the format string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes #18355.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/wx/strvararg.h | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests/strings/vararg.cpp | 7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 13 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 57429045d4a..7d7afb58a7b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/wx/strvararg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/wx/strvararg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -436,6 +436,12 @@ wxFORMAT_STRING_SPECIFIER(int*, wxFormatString::Arg_IntPtr | wxFormatString::Arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxFORMAT_STRING_SPECIFIER(short int*, wxFormatString::Arg_ShortIntPtr | wxFormatString::Arg_Pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxFORMAT_STRING_SPECIFIER(long int*, wxFormatString::Arg_LongIntPtr | wxFormatString::Arg_Pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Support for nullptr is available since MSVS 2010, even though it doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// define __cplusplus as a C++11 compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __cplusplus >= 201103 || wxCHECK_VISUALC_VERSION(10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++wxFORMAT_STRING_SPECIFIER(nullptr_t, wxFormatString::Arg_Pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef wxFORMAT_STRING_SPECIFIER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 14eaa88333e..413cb2e4c69 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/strings/vararg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/strings/vararg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,6 +213,13 @@ void VarArgTestCase::ArgsValidation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString::Format("a string(%s,%s), ptr %p, int %i",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString(), "foo", "char* as pointer", 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __cplusplus >= 201103 || wxCHECK_VISUALC_VERSION(10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Unfortunately we can't check the result as different standard libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // implementations format it in different ways, so just check that it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // compiles.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxString::Format("null pointer is %p", nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Microsoft has helpfully disabled support for "%n" in their CRT by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // default starting from VC8 and somehow even calling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _set_printf_count_output() doesn't help here, so don't use "%n" at all
</span></pre><pre style='margin:0'>
</pre>