<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[116916] trunk/dports/www/FileZilla</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/116916">116916</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-02-10 04:22:53 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FileZilla: upgrade to 3.7.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillaPortfile">trunk/dports/www/FileZilla/Portfile</a></li>
<li><a href="#trunkdportswwwFileZillafilespatchwxWidgets30diff">trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillafilespatchsrcputtyMakefileindiff">trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwFileZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/Portfile (116915 => 116916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/Portfile 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/Portfile 2014-02-10 12:22:53 UTC (rev 116916)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name FileZilla
</span><del>-version 3.7.3
-revision 2
</del><ins>+version 3.7.4
</ins><span class="cx"> categories www aqua
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers strasweb.fr:rudloff openmaintainer
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx"> homepage https://filezilla-project.org/
</span><span class="cx"> master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
</span><span class="cx">
</span><del>-checksums sha1 34c3dd1943816a916c54e49cbbea51c97ef3f583 \
- rmd160 8fefebae9f2024dedab9841dc6fe3876305f8d2f
</del><ins>+checksums rmd160 8ea764d7d02fbc76b06d378bc26f6c2d8f44083d \
+ sha256 20a6d5ce737a8cbb38786b53365547e5e71dd9086259bf0b4eb264e8dbbc11ce
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -42,8 +41,7 @@
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> worksrcdir filezilla-${version}
</span><span class="cx">
</span><del>-patchfiles patch-wxWidgets-3.0.diff \
- patch-src-putty-Makefile.in.diff
</del><ins>+patchfiles patch-wxWidgets-3.0.diff
</ins><span class="cx">
</span><span class="cx"> # http://trac.filezilla-project.org/ticket/5473
</span><span class="cx"> # http://sourceforge.net/p/tinyxml/patches/51/
</span></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchsrcputtyMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff (116915 => 116916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff 2014-02-10 12:22:53 UTC (rev 116916)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-http://trac.filezilla-project.org/ticket/8852
-avoids 'cp: fzputtygen: No such file or directory'
---- src/putty/Makefile.in.orig
-+++ src/putty/Makefile.in
-@@ -1526,7 +1526,7 @@ uninstall-am: uninstall-binPROGRAMS
- uninstall-binPROGRAMS
-
-
--$(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp
-+$(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp fzputtygen
- mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS
- cp -f fzsftp $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp
- cp -f fzputtygen $(top_builddir)/FileZilla.app/Contents/MacOS/fzputtygen
</del></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchwxWidgets30diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff (116915 => 116916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-02-10 12:22:53 UTC (rev 116916)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-http://trac.filezilla-project.org/ticket/8272
</del><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><span class="cx"> @@ -692,6 +692,9 @@ PACKAGE_VERSION_MAJOR
</span><span class="lines">@@ -16,7 +15,7 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no aui,xrc,adv,core,xml,net,base"
</span><del>-+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no"
</del><ins>++ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no"
</ins><span class="cx">
</span><span class="cx"> WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
</span><span class="cx"> wx_config_major_version=`echo $WX_VERSION | \
</span><span class="lines">@@ -113,7 +112,7 @@
</span><span class="cx"> - if test "$wx_config_major_version" -gt "2" || test "$wx_config_minor_version" -gt "8"; then
</span><span class="cx"> - as_fn_error $? "You need to use wxWidgets 2.8.x to compile this program." "$LINENO" 5
</span><span class="cx"> - fi
</span><del>-
</del><ins>+
</ins><span class="cx"> # --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here.
</span><span class="cx"> if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then
</span><span class="cx"> --- src/engine/local_path.cpp.orig
</span><span class="lines">@@ -208,61 +207,61 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> +#if wxCHECK_VERSION(2, 9, 0)
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str());
-+}
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str());
++}
</ins><span class="cx"> +
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar());
-+}
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar());
++}
</ins><span class="cx"> +
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar(), value3.AsWChar());
-+}
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar(), value3.AsWChar());
++}
</ins><span class="cx"> +
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar());
-+}
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar());
++}
</ins><span class="cx"> +
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar());
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar());
</ins><span class="cx"> +}
</span><span class="cx"> +
</span><del>-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
</del><ins>++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
</ins><span class="cx"> +}
</span><del>-+#endif
</del><ins>++#endif
</ins><span class="cx"> +
</span><span class="cx"> void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const
</span><span class="cx"> {
</span><span class="cx"> InitLogFile();
</span><span class="cx"> --- src/engine/logging_private.h.orig
</span><span class="cx"> +++ src/engine/logging_private.h
</span><del>-@@ -6,6 +6,15 @@ class CLogging
- public:
</del><ins>+@@ -7,6 +7,15 @@ public:
</ins><span class="cx"> CLogging(CFileZillaEnginePrivate *pEngine);
</span><span class="cx"> virtual ~CLogging();
</span><del>-+
-+#if wxCHECK_VERSION(2, 9, 0)
-+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const;
</del><ins>+
++#if wxCHECK_VERSION(2, 9, 0)
++ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const;
</ins><span class="cx"> + void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const;
</span><span class="cx"> + void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const;
</span><del>-+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
-+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const;
-+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const;
-+#endif
-
</del><ins>++ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
++ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const;
++ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const;
++#endif
++
</ins><span class="cx"> void LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const;
</span><span class="cx"> void LogMessageRaw(MessageType nMessageType, const wxChar *msg) const;
</span><ins>+ void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, ...) const;
</ins><span class="cx"> --- src/engine/misc.cpp.orig
</span><span class="cx"> +++ src/engine/misc.cpp
</span><del>-@@ -365,9 +365,19 @@ void MakeLowerAscii(wxString& str)
</del><ins>+@@ -365,11 +365,24 @@ void MakeLowerAscii(wxString& str)
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < str.Len(); i++)
</span><span class="cx"> {
</span><span class="lines">@@ -273,11 +272,16 @@
</span><span class="cx"> + {
</span><span class="cx"> + c += 32;
</span><span class="cx"> + str.SetChar(i, wxUniChar(c));
</span><ins>++ } else if (c == 0x130 || c == 0x131) {
++ c = 'i';
++ str.SetChar(i, wxUniChar(c));
</ins><span class="cx"> + }
</span><span class="cx"> +#else
</span><span class="cx"> wxChar& c = str[i];
</span><span class="cx"> if (c >= 'A' && c <= 'Z')
</span><span class="cx"> c += 32;
</span><ins>+ else if (c == 0x130 || c == 0x131)
+ c = 'i';
</ins><span class="cx"> +#endif
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -305,7 +309,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/engine/serverpath.cpp.orig
</span><span class="cx"> +++ src/engine/serverpath.cpp
</span><del>-@@ -276,8 +276,13 @@ wxString CServerPath::GetSafePath() const
</del><ins>+@@ -272,8 +272,13 @@ wxString CServerPath::GetSafePath() const
</ins><span class="cx"> len += iter->Length() + 2 + INTLENGTH;
</span><span class="cx">
</span><span class="cx"> wxString safepath;
</span><span class="lines">@@ -319,7 +323,7 @@
</span><span class="cx">
</span><span class="cx"> t = fast_sprint_number(t, m_type);
</span><span class="cx"> *(t++) = ' ';
</span><del>-@@ -299,8 +304,11 @@ wxString CServerPath::GetSafePath() const
</del><ins>+@@ -295,8 +300,11 @@ wxString CServerPath::GetSafePath() const
</ins><span class="cx"> t += iter->size();
</span><span class="cx"> }
</span><span class="cx"> *t = 0;
</span><span class="lines">@@ -372,7 +376,7 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> --- src/interface/FileZilla.cpp.orig
</span><span class="cx"> +++ src/interface/FileZilla.cpp
</span><del>-@@ -267,7 +267,7 @@
</del><ins>+@@ -267,7 +267,7 @@ bool CFileZillaApp::OnInit()
</ins><span class="cx"> #else
</span><span class="cx"> if (!pInfo || !SetLocale(pInfo->Language))
</span><span class="cx"> {
</span><span class="lines">@@ -439,7 +443,7 @@
</span><span class="cx"> }
</span><span class="cx"> --- src/interface/QueueView.cpp.orig
</span><span class="cx"> +++ src/interface/QueueView.cpp
</span><del>-@@ -3419,9 +3419,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3423,9 +3423,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</ins><span class="cx"> const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
</span><span class="cx">
</span><span class="cx"> wxString result;
</span><span class="lines">@@ -454,7 +458,7 @@
</span><span class="cx">
</span><span class="cx"> const wxChar* p = filename.c_str();
</span><span class="cx"> while (*p)
</span><del>-@@ -3456,9 +3460,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3460,9 +3464,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</ins><span class="cx"> p++;
</span><span class="cx"> }
</span><span class="cx"> *buf = 0;
</span><span class="lines">@@ -481,7 +485,7 @@
</span><span class="cx"> SafeSelectItem(parent);
</span><span class="cx"> --- src/interface/StatusView.cpp.orig
</span><span class="cx"> +++ src/interface/StatusView.cpp
</span><del>-@@ -58,7 +58,7 @@ public:
</del><ins>+@@ -71,7 +71,7 @@ public:
</ins><span class="cx"> {
</span><span class="cx"> wxWindow* parent = GetParent();
</span><span class="cx"> event.SetEventObject(parent);
</span><span class="lines">@@ -490,7 +494,7 @@
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> void OnKeyDown(wxKeyEvent& event)
</span><del>-@@ -76,7 +76,7 @@ public:
</del><ins>+@@ -89,7 +89,7 @@ public:
</ins><span class="cx"> navEvent.SetDirection(!event.ShiftDown());
</span><span class="cx"> navEvent.SetFromTab(true);
</span><span class="cx"> navEvent.ResumePropagation(1);
</span><span class="lines">@@ -507,7 +511,7 @@
</span><span class="cx">
</span><span class="cx"> +#if wxCHECK_VERSION(2, 9, 0)
</span><span class="cx"> +wxColor wxAuiStepColour(const wxColor& c, int ialpha)
</span><del>-+{
</del><ins>++{
</ins><span class="cx"> + wxColor* result = new wxColor(c);
</span><span class="cx"> + result->ChangeLightness(ialpha);
</span><span class="cx"> + return *result;
</span><span class="lines">@@ -657,9 +661,9 @@
</span><span class="cx"> {
</span><span class="cx"> -#ifdef __WXMAC__
</span><span class="cx"> +#if defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
</span><del>- return (wxScrolledWindow*)m_genericImpl->m_mainWin;
</del><ins>+ return (wxScrolledWindow*)m_genericImpl->m_mainWin;
</ins><span class="cx"> #else
</span><del>- return (wxScrolledWindow*)m_mainWin;
</del><ins>+ return (wxScrolledWindow*)m_mainWin;
</ins><span class="cx"> --- src/interface/netconfwizard.cpp.orig
</span><span class="cx"> +++ src/interface/netconfwizard.cpp
</span><span class="cx"> @@ -777,7 +777,12 @@ void CNetConfWizard::SendNextCommand()
</span><span class="lines">@@ -712,7 +716,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-@@ -544,9 +548,11 @@ bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, wxLongLong_t
</del><ins>+@@ -561,9 +565,11 @@ bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, wxLongLong_t
</ins><span class="cx"> extern "C" {
</span><span class="cx"> static void custom_free(void* v)
</span><span class="cx"> {
</span><span class="lines">@@ -725,7 +729,7 @@
</span><span class="cx"> #else
</span><span class="cx"> char* s = reinterpret_cast<char*>(v);
</span><span class="cx"> delete [] s;
</span><del>-@@ -557,11 +563,16 @@ static void custom_free(void* v)
</del><ins>+@@ -574,11 +580,16 @@ static void custom_free(void* v)
</ins><span class="cx"> bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, const wxString& value)
</span><span class="cx"> {
</span><span class="cx"> #ifdef __WXMSW__
</span><span class="lines">@@ -742,7 +746,7 @@
</span><span class="cx"> #else
</span><span class="cx"> char* out = new char[value.size() * 2];
</span><span class="cx"> size_t outlen = utf16_.FromWChar(out, value.size() * 2, value.c_str(), value.size());
</span><del>-@@ -814,9 +825,18 @@ wxString CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index,
</del><ins>+@@ -831,9 +842,18 @@ wxString CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index,
</ins><span class="cx"> int len = sqlite3_column_bytes16(statement, index);
</span><span class="cx"> if (text)
</span><span class="cx"> {
</span><span class="lines">@@ -793,7 +797,7 @@
</span><span class="cx"> <object class="sizeritem">
</span><span class="cx"> <object class="wxListCtrl" name="ID_KEYS">
</span><span class="cx"> <style>wxLC_REPORT|wxSUNKEN_BORDER</style>
</span><del>-+ <size>400,-1</size>
</del><ins>++ <size>400,-1</size>
</ins><span class="cx"> </object>
</span><span class="cx"> - <option>1</option>
</span><span class="cx"> - <flag>wxGROW</flag>
</span><span class="lines">@@ -801,7 +805,7 @@
</span><span class="cx"> </object>
</span><span class="cx"> <vgap>5</vgap>
</span><span class="cx"> <growablecols>0</growablecols>
</span><del>-@@ -1363,7 +1363,7 @@
</del><ins>+@@ -1368,7 +1368,7 @@
</ins><span class="cx"> <object class="sizeritem">
</span><span class="cx"> <object class="wxFlexGridSizer">
</span><span class="cx"> <cols>2</cols>
</span><span class="lines">@@ -810,7 +814,7 @@
</span><span class="cx"> <object class="sizeritem">
</span><span class="cx"> <object class="wxStaticText">
</span><span class="cx"> <label>&amp;Theme:</label>
</span><del>-@@ -2076,7 +2076,6 @@
</del><ins>+@@ -2081,7 +2081,6 @@
</ins><span class="cx"> </object>
</span><span class="cx"> <growablecols>1</growablecols>
</span><span class="cx"> </object>
</span><span class="lines">@@ -840,7 +844,7 @@
</span><span class="cx"> SetText(XRCID("ID_CUSTOM_TIMEFORMAT"), timeFormat.Mid(1), failure);
</span><span class="cx"> --- src/interface/sitemanager.cpp.orig
</span><span class="cx"> +++ src/interface/sitemanager.cpp
</span><del>-@@ -516,6 +516,8 @@ CSiteManagerItemData_Site* CSiteManager::GetSiteByPath(wxString sitePath)
</del><ins>+@@ -515,6 +515,8 @@ CSiteManagerItemData_Site* CSiteManager::GetSiteByPath(wxString sitePath)
</ins><span class="cx">
</span><span class="cx"> bool CSiteManager::GetBookmarks(wxString sitePath, std::list<wxString> &bookmarks)
</span><span class="cx"> {
</span><span class="lines">@@ -886,7 +890,7 @@
</span><span class="cx"> m_dateTimeFormat += _T("%X");
</span><span class="cx"> --- src/interface/viewheader.cpp.orig
</span><span class="cx"> +++ src/interface/viewheader.cpp
</span><del>-@@ -24,7 +24,11 @@
</del><ins>+@@ -24,7 +24,11 @@ class CComboBoxEx : public wxComboBox
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> CComboBoxEx(CViewHeader* parent)
</span><span class="lines">@@ -899,7 +903,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_parent = parent;
</span><span class="cx"> }
</span><del>-@@ -67,7 +71,7 @@
</del><ins>+@@ -67,7 +71,7 @@ protected:
</ins><span class="cx"> navEvent.SetDirection(!event.ShiftDown());
</span><span class="cx"> navEvent.SetFromTab(true);
</span><span class="cx"> navEvent.ResumePropagation(1);
</span><span class="lines">@@ -910,7 +914,7 @@
</span><span class="cx"> void OnChar(wxKeyEvent& event)
</span><span class="cx"> --- src/interface/wrapengine.cpp.orig
</span><span class="cx"> +++ src/interface/wrapengine.cpp
</span><del>-@@ -234,24 +234,24 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</del><ins>+@@ -232,24 +232,24 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</ins><span class="cx"> bool containsURL = false;
</span><span class="cx"> for (int i = 0; i <= strLen; i++)
</span><span class="cx"> {
</span><span class="lines">@@ -940,7 +944,7 @@
</span><span class="cx"> segment = text.Mid(start, i - start + 1);
</span><span class="cx"> else
</span><span class="cx"> segment = text.Mid(start, i - start);
</span><del>-@@ -259,7 +259,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</del><ins>+@@ -257,7 +257,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="lines">@@ -949,7 +953,7 @@
</span><span class="cx"> segment = text.Mid(wrapAfter + 1, i - wrapAfter);
</span><span class="cx"> else
</span><span class="cx"> segment = text.Mid(wrapAfter + 1, i - wrapAfter - 1);
</span><del>-@@ -274,7 +274,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</del><ins>+@@ -272,7 +272,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</ins><span class="cx"> if (wrappedText != _T(""))
</span><span class="cx"> wrappedText += _T("\n");
</span><span class="cx"> wrappedText += text.Mid(start, wrapAfter - start);
</span><span class="lines">@@ -958,7 +962,7 @@
</span><span class="cx"> wrappedText += text[wrapAfter];
</span><span class="cx">
</span><span class="cx"> if (width + spaceWidth >= (int)maxLength)
</span><del>-@@ -304,7 +304,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</del><ins>+@@ -302,7 +302,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</ins><span class="cx"> if (wrappedText != _T(""))
</span><span class="cx"> wrappedText += _T("\n");
</span><span class="cx"> wrappedText += text.Mid(start, i - start);
</span><span class="lines">@@ -967,7 +971,7 @@
</span><span class="cx"> wrappedText += text[i];
</span><span class="cx"> start = i + 1;
</span><span class="cx"> wrapAfter = -1;
</span><del>-@@ -318,7 +318,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</del><ins>+@@ -316,7 +316,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
</ins><span class="cx"> wrapAfter = i;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>