Ticket #40852: Portfile.2.diff

File Portfile.2.diff, 2.1 KB (added by BSeppke (Benjamin Seppke), 7 years ago)

diff between current and proposed Portfile

  • Portfile

    old new  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
     2# $Id: Portfile 111912 2013-10-05 22:01:13Z raimue@macports.org $
    33
    44PortSystem          1.0
    55
     
    171171
    172172patchfiles-append   patch-src_plugins_bearer_corewlan_corewlan.pro.diff
    173173
    174 # (15) fix the corewlan source to work under 10.7
     174# (15) fix the corewlan source to work under 10.9 too
    175175
    176176patchfiles-append   patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
    177177
     
    229229    patchfiles-append patch-src_corelib_corelib.pro.diff
    230230}
    231231
     232# (22a) Under 10.9 too: Patch to fix corelib linking
     233
     234platform darwin 13 {
     235    patchfiles-append patch-src_corelib_corelib.pro.diff
     236}
     237
    232238# (23) fix Framework directory in MacDeployQt tool
    233239
    234240patchfiles-append   \
     
    239245patchfiles-append   \
    240246    patch-libc++.diff
    241247
    242 # TODO: More patches to fix Mavericks build
     248# (25) Fix CLuscene to build under 10.9 CLang
     249# (26) Fix qglobals.h to build under 10.9 CLang
     250
     251platform darwin 13 {
     252    patchfiles-append   \
     253        patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
     254        patch-src_corelib_global_qglobal.h.diff
     255}
     256
     257# Mavericks build should be fixed...
    243258platform darwin {
    244     if {${os.major} >= 13} {
     259    if {${os.major} > 13} {
    245260        # This project needs to be updated to build with clang++ against libc++
    246261        depends_lib
    247262        depends_run
    248263        pre-fetch {
    249             ui_error "$name does not build on OS X 10.9 Mavericks or later."
     264            ui_error "$name does not build on OS's later than X 10.9 Mavericks."
    250265            error "unsupported platform"
    251266        }
    252267    }
     
    509524    -no-pch                                               \
    510525    -framework                                            \
    511526    -no-phonon                                            \
    512     -no-phonon-backend
     527    -no-phonon-backend \
     528    -no-webkit
    513529
    514530# Stop configure script from searching for SQL Drivers
    515531#    not available from MacPorts.