[152616] trunk/dports/graphics/wxWidgets-3.0

mojca at macports.org mojca at macports.org
Tue Sep 13 01:50:59 PDT 2016


Revision: 152616
          https://trac.macports.org/changeset/152616
Author:   mojca at macports.org
Date:     2016-09-13 01:50:59 -0700 (Tue, 13 Sep 2016)
Log Message:
-----------
wxWidgets-3.0: remove QuickTime loading on Sierra (closes #52069)

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/Portfile

Added Paths:
-----------
    trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-noquicktime.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2016-09-13 07:25:07 UTC (rev 152615)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2016-09-13 08:50:59 UTC (rev 152616)
@@ -128,6 +128,17 @@
     configure.ldflags-append \
                     -stdlib=${configure.cxx_stdlib}
 }
+# https://trac.macports.org/ticket/52069
+if {${os.platform} eq "darwin" && ${os.major} >= 16} {
+    # The patch probably works on all OS X versions,
+    # but I don't want to risk breaking anything
+    patchfiles-append \
+                    patch-upstream-noquicktime.diff
+    # the sources should be patched,
+    # but this should work as a temporary workaround for Sierra users
+    configure.args-append \
+                    --disable-mediactrl
+}
 
 if {${subport} eq "wxPython-3.0"} {
 # drop _1 from the subset name on next update

Added: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-noquicktime.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-noquicktime.diff	                        (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-noquicktime.diff	2016-09-13 08:50:59 UTC (rev 152616)
@@ -0,0 +1,33 @@
+https://trac.macports.org/ticket/52069
+http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
+
+--- src/osx/carbon/dataobj.cpp
++++ src/osx/carbon/dataobj.cpp
+@@ -29,9 +29,9 @@
+ 
+ #include "wx/osx/private.h"
+ 
+-#if wxOSX_USE_COCOA_OR_CARBON
+-    #include <QuickTime/QuickTime.h>
+-#endif
++
++
++
+ 
+ // ----------------------------------------------------------------------------
+ // wxDataFormat
+--- src/osx/core/bitmap.cpp
++++ src/osx/core/bitmap.cpp
+@@ -35,9 +35,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+ #include "wx/osx/private.h"
+ #endif
+ 
+-#ifndef __WXOSX_IPHONE__
+-#include <QuickTime/QuickTime.h>
+-#endif
++
++
++
+ 
+ CGColorSpaceRef wxMacGetGenericRGBColorSpace();
+ CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160913/82ff4bcd/attachment.html>


More information about the macports-changes mailing list