Ticket #44397: qt5-mac.diff

File qt5-mac.diff, 1.0 KB (added by ryandesign (Ryan Carsten Schmidt), 10 years ago)

proposed patch

  • Portfile

     
    7979    # use the qt5 group; set 'building_qt5' so that the portgroup
    8080    # does not include certain parts
    8181    set building_qt5    1
     82    PortGroup           conflicts_build 1.0
    8283    PortGroup           qt5 1.0
    8384    PortGroup           xcodeversion 1.0
    8485
     
    8687
    8788    minimum_xcodeversions   {10 3.2}
    8889
    89     pre-configure {
    90         # See https://bugreports.qt-project.org/browse/QTBUG-34902
    91         if {![catch {set installed [lindex [registry_active qt4-mac] 0]}]} {
    92             ui_error "${name} fails if qt4-mac is active during configuration phase."
    93             ui_error "Please deactivate qt4-mac to continue"
    94             return -code error "conflicting port (qt4-mac)"
    95         }
    96     }
     90    # See https://bugreports.qt-project.org/browse/QTBUG-34902
     91    conflicts_build-append  qt4-mac
    9792
    9893    # More testing is required to see if this is necessary.
    9994    use_parallel_build no