[113365] trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff

mojca at macports.org mojca at macports.org
Thu Nov 14 08:00:55 PST 2013


Revision: 113365
          https://trac.macports.org/changeset/113365
Author:   mojca at macports.org
Date:     2013-11-14 08:00:54 -0800 (Thu, 14 Nov 2013)
Log Message:
-----------
FileZilla: skip the check for maximum version number of wxWidgets (#41354)

Modified Paths:
--------------
    trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff

Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff	2013-11-14 15:20:20 UTC (rev 113364)
+++ trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff	2013-11-14 16:00:54 UTC (rev 113365)
@@ -106,17 +106,16 @@
    if test "$wxWin" != 1; then
      as_fn_error $? "
          wxWidgets must be installed on your system
-@@ -16150,8 +16184,8 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
+@@ -16150,9 +16184,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
          equivalent variable and wxWidgets version is $MIN_WX_VERSION or above.
      " "$LINENO" 5
    fi
 -  if test "$wx_config_major_version" -gt "2" || test "$wx_config_minor_version" -gt "8"; then
 -    as_fn_error $? "You need to use wxWidgets 2.8.x to compile this program." "$LINENO" 5
-+  if test "$wx_config_major_version" -gt "3" || test "$wx_config_minor_version" -gt "0"; then
-+    as_fn_error $? "You need to use wxWidgets 3.0.x to compile this program." "$LINENO" 5
-   fi
- 
+-  fi
+
    # --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here.
+   if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then
 --- src/engine/local_path.cpp.orig
 +++ src/engine/local_path.cpp
 @@ -48,6 +48,7 @@ bool CLocalPath::SetPath(const wxString& path, wxString* file /*=0*/)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131114/6df399c4/attachment.html>


More information about the macports-changes mailing list