Ticket #52069: wxWidgets-3.0-for-Sierra.diff

File wxWidgets-3.0-for-Sierra.diff, 1.8 KB (added by mojca (Mojca Miklavec), 8 years ago)

Temporary workaround to allow building wxWidgets on Sierra

  • Portfile

     
    128128    configure.ldflags-append \
    129129                    -stdlib=${configure.cxx_stdlib}
    130130}
     131# https://trac.macports.org/ticket/52069
     132if {${os.platform} eq "darwin" && ${os.major} >= 16} {
     133    # The patch probably works on all OS X versions,
     134    # but I don't want to risk breaking anything
     135    patchfiles-append \
     136                    patch-upstream-noquicktime.diff
     137    # the sources should be patched,
     138    # but this should work as a temporary workaround for Sierra users
     139    configure.args-append \
     140                    --disable-mediactrl
     141}
    131142
    132143if {${subport} eq "wxPython-3.0"} {
    133144# drop _1 from the subset name on next update
  • files/patch-upstream-noquicktime.diff

     
     1https://trac.macports.org/ticket/52069
     2http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
     3
     4--- src/osx/carbon/dataobj.cpp
     5+++ src/osx/carbon/dataobj.cpp
     6@@ -29,9 +29,9 @@
     7 
     8 #include "wx/osx/private.h"
     9 
     10-#if wxOSX_USE_COCOA_OR_CARBON
     11-    #include <QuickTime/QuickTime.h>
     12-#endif
     13+
     14+
     15+
     16 
     17 // ----------------------------------------------------------------------------
     18 // wxDataFormat
     19--- src/osx/core/bitmap.cpp
     20+++ src/osx/core/bitmap.cpp
     21@@ -35,9 +35,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
     22 #include "wx/osx/private.h"
     23 #endif
     24 
     25-#ifndef __WXOSX_IPHONE__
     26-#include <QuickTime/QuickTime.h>
     27-#endif
     28+
     29+
     30+
     31 
     32 CGColorSpaceRef wxMacGetGenericRGBColorSpace();
     33 CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );