Changeset 94241 for trunk/dports/aqua


Ignore:
Timestamp:
Jun 13, 2012, 2:36:06 AM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac : upgrade to 4.8.2; upgrade and fix certain dependent ports.

Location:
trunk/dports
Files:
14 deleted
5 edited
29 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports

  • trunk/dports/aqua/QMK-Groundstation/Portfile

    r72605 r94241  
    88name                QMK-Groundstation
    99version             1.0.1
    10 revision            1
     10revision            2
    1111maintainers         lilalinux.net:macports
    1212description         Configuration and Debugging Utility for the MikroKopter Project
     
    4747        set appPath ${destroot}${applications_dir}
    4848        xinstall -d -m 755 ${appPath}
    49         file copy ${worksrcpath}/build/Default/${name}.app ${appPath}/${name}.app
     49        file copy ${worksrcpath}/build/Release/${name}.app ${appPath}/${name}.app
    5050}
    5151
  • trunk/dports/aqua/qt4-mac/Portfile

    r87272 r94241  
    1212name                qt4-mac
    1313conflicts           qt3 qt3-mac qt4-mac-devel
    14 version             4.7.4
    15 revision            1
     14version             4.8.2
    1615categories          aqua
    1716platforms           macosx
    18 maintainers         michaelld
     17maintainers         michaelld openmaintainer
    1918license             {LGPL-2.1 GPL-3}
    2019
     
    2827distname            qt-everywhere-opensource-src-${version}
    2928
    30 # 4.7.4 was stealth-updated; see #31252
    31 dist_subdir         ${name}/${version}_1
    32 
    33 checksums           md5     9831cf1dfa8d0689a06c2c54c5c65aaf \
    34                     sha1    af9016aa924a577f7b06ffd28c9773b56d74c939 \
    35                     rmd160  3e47b09663a89973b1c8628506c995dfc2a5387c
     29checksums           sha1    e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
     30                    rmd160  6a15077aee1e84076380787127b80c7bb97ebe86
    3631
    3732minimum_xcodeversions   {8 2.5}
    3833
    39 depends_lib-append  port:zlib port:dbus port:openssl port:sqlite3 \
    40                     port:tiff port:libpng port:libmng port:jpeg
     34depends_lib-append  port:zlib path:bin/dbus-daemon:dbus \
     35                    port:openssl port:sqlite3 port:tiff \
     36                    port:libpng port:libmng port:jpeg
     37
     38###############################################
     39# Patches are used to both fix compiling on various OS versions, and
     40# to enhance the functionality of QMake and its build files.  Some of
     41# these patches are 2-stage: use a file here, and the replace an
     42# @VARIABLE@ in post-patch.  There are LOTS of patches, because Qt is
     43# a large, complicated system.
    4144
    4245# (0) Fix the testing script to properly handle both +universal as
    4346# well as the native arch for both CXX and CC compiling; also make
    4447# sure it does not create a Mac app bundle.
     48
    4549patchfiles-append   patch-config.tests_unix_compile.test.diff
    4650
    47 # (1) Test for Precompiled-headers support requires a C++ compiler,
    48 # but configure calls it, by default, with a C compiler.
    49 patchfiles-append   patch-precomp.test.diff
    50 
    51 # (2) Tweak various scripts to allow easy replacement of
     51# (1) Test for Precompiled-headers support (a) requires a C++
     52# compiler, but configure calls it, by default, with a C compiler;
     53# thus, enable testing using the C compiler. (b) to work with ccache,
     54# if used.
     55
     56patchfiles-append   patch-config.tests_unix_precomp.test.diff
     57
     58# (2) fix 'configure' script: (a) to allow easy replacement of arch
     59# type(s). (b) to find the correct QMAKE CXX compiler by removing
     60# possibilities that include the character "$". (c) to declare, use,
     61# and set QT_INSTALL_FRAMEWORKS and QMAKE_FRAMEWORKDIR_QT, both here
     62# and in the resulting .qmake.cache files. (d) to allow easy
     63# replacement of MACOSX_DEPLOYMENT_TARGET: build for just the user's
     64# current OS.
     65
     66patchfiles-append   patch-configure.diff
     67
     68# (3) Tweak various scripts to allow easy replacement of
    5269# MACOSX_DEPLOYMENT_TARGET: build for just the user's current OS.
    53 patchfiles-append   patch-macosx-deployment-target.diff
    54 
    55 # (3) Tweak the configure script to allow easy replacement of arch
    56 # type(s).  The location of this patch is dependent on patch (2), but
    57 # 'patch' should be able to figure it out.
    58 patchfiles-append   patch-configure-arch.diff
    59 
    60 # (4) Tweak Qt spec files:
    61 # (4a) Place the -I path for local moc-created headers -before-
     70
     71patchfiles-append   patch-mkspecs_common_g++-macx.conf.diff
     72
     73# (4) (a) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build
     74# for just the user's current OS; (b) allow QMake to use 'ccache' via,
     75# e.g., "qmake && make CCACHE=ccache".
     76
     77patchfiles-append   patch-mkspecs_common_mac.conf.diff
     78
     79# (5) Place the -I path for local moc-created headers -before-
    6280# all other -I paths.
    63 patchfiles-append   patch-mkspecs-features-moc.prf.diff
    64 
    65 # (4b) Remove Qt's LIBDIR and INCDIR from various Qmake internal
     81
     82patchfiles-append   patch-mkspecs_features_moc.prf.diff
     83
     84# (6) Remove Qt's LIBDIR and INCDIR from various Qmake internal
    6685# variables, since they are already included in the user-supplied
    6786# LIBS and INCLUDEPATH.
    68 patchfiles-append   patch-mkspecs-features-qt.prf.diff
    69 
    70 # (4c) Change placement of Qt's LIBDIR and INCDIR, to always be after
    71 # those supplied by the user's QMake (.pro) files.  By the time QMake
    72 # gets to the patched function, it is creating the Makefile parts to
    73 # find Qt's headers and libraries, so moving these paths to this
    74 # location should always work.
    75 patchfiles-append   patch-mkspecs-features-qt_functions.prf.diff
    76 
    77 # (4d) Add "absolute_library_soname" to the default CONFIG variables,
     87
     88patchfiles-append   patch-mkspecs_features_qt.prf.diff
     89
     90# (7) (a) Change placement of Qt's LIBDIR and INCDIR, to always be
     91# after those supplied by the user's QMake (.pro) files.  By the time
     92# QMake gets to the patched function, it is creating the Makefile
     93# parts to find Qt's headers and libraries, so moving these paths to
     94# this location should always work. (b) If the library is QtWebKit,
     95# and the build is library (no-framework), universal, and debug, then
     96# the linkage is just -lQtWebKit, not -lQtWebKit_debug because the
     97# debug library for 32-bit system cannot be created (too large).
     98
     99patchfiles-append   patch-mkspecs_features_qt_functions.prf.diff
     100
     101# (8) Add "absolute_library_soname" to the default CONFIG variables,
    78102# so that when a DYLIB is created, if "target.path" is set for it then
    79103# that path is prepended to its "install_name".
    80 patchfiles-append   patch-mkspecs-macx-g++-qmake.prf.diff
    81 
    82 # (4e) allow use of 'ccache' via "qmake && make CCACHE=ccache", in mac
    83 # only; this patch requires that (2) already be in place.
    84 patchfiles-append   patch-mkspecs_common_mac.conf.diff
    85 
    86 # (5) fix the corewlan qmake file to use non-standard Developer SDK
    87 # location under 10.6, e.g., for some developers doing both iOS and
    88 # OSX.  This patch does not change behavior for 10.4 or 10.5.
     104
     105patchfiles-append   patch-mkspecs_macx-g++_qmake.conf.diff
     106
     107# (9) Add QT_INSTALL_FRAMEWORKS and related variables to QMake, to
     108# provide a default variable for the location of QMake installed
     109# frameworks.
     110
     111patchfiles-append   \
     112    patch-qmake_option.h.diff \
     113    patch-qmake_property.cpp.diff \
     114    patch-src_corelib_global_qlibraryinfo.cpp.diff \
     115    patch-src_corelib_global_qlibraryinfo.h.diff
     116
     117# (10) In QMake, disable default MKSPECS and FEATURES path
     118# concatinations if the shell environment variable QMAKE_NO_DEFAULTS
     119# is set (to anything); we use this variable in this portfile to make
     120# sure only internal paths (to the build) are searched by QMake.
     121
     122patchfiles-append   patch-qmake_project.cpp.diff
     123
     124# (11) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build for
     125# just the user's current OS.
     126
     127patchfiles-append   \
     128    patch-qmake_qmake.pri.diff \
     129    patch-src_tools_bootstrap_bootstrap.pro.diff
     130
     131# (12) fix compiling of MediaPlayerPrivateQTKit.mm for 10.5; does not
     132# hurt others
     133
     134patchfiles-append   patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff
     135
     136# (13) fix use of CARBON, found on PPC64; does not hurt others
     137
     138patchfiles-append   \
     139    patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff \
     140    patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
     141
     142# (14) fix MKSPECS install location for WebKit
     143
     144patchfiles-append   \
     145    patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
     146
     147# (15) fix the corewlan qmake file to use non-standard Developer SDK
     148# location under 10.6 and newer, e.g., for some developers doing both
     149# iOS and OSX.  This patch does not change behavior for 10.4 or 10.5.
    89150# Also include fix to use the correct SDK.
    90 patchfiles-append   patch-src-plugins-bearer-corewlan-corewlan.pro.diff
    91 
    92 # (6) fix use of CARBON, found on PPC64, but will work on any system
    93 patchfiles-append   patch-PluginView-no-carbon.diff
    94 
    95 # (7) Allow compiling under OS X 10.7
    96 patchfiles-append   patch-src-corelib-global-qglobal.h.diff
    97 
    98 # (8) fix #includes for OS X 10.7 in Bearer CoreWLAN
    99 patchfiles-append   patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff
    100 
    101 # (9) from Qt, blocklist bad digistor certs
    102 # < http://labs.qt.nokia.com/2011/09/07/ >
    103 patchfiles-append   patch-blacklist-diginotar-certs.diff
    104 
    105 # (10) from Qt bugs (#18346), fix shader effect item code.
    106 patchfiles-append   patch-src-imports-shaders-shadereffectitem.cpp.diff
     151
     152patchfiles-append   patch-src_plugins_bearer_corewlan_corewlan.pro.diff
     153
     154# (16) fix the corewlan source to work under 10.7
     155
     156patchfiles-append   patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
     157
     158# (17) Use the "target.path" for libdir for core libraries instead of
     159# the standard QT_INSTALL_LIBS; allows us to set for library or
     160# framework elsewhere and have the install still work here.
     161
     162patchfiles-append   patch-src_qbase.pri.diff
     163
     164# (18) (a) Disable explicit disabling of framework or static install;
     165# i.e., install as a framework if that mode is selected, and as
     166# library otherwise. (b) If installing as framework, use the new
     167# QT_INSTALL_FRAMEWORKS directory; otherwise, use the old
     168# QT_INSTALL_LIBS; (c) Get PKGCONFIG dependencies correct, hopefully;
     169# (d) create and install .pc, .la, and .prl library description files,
     170# including basic path replacement into DESTDIR; we couple this with a
     171# post-patch to get the correct install location.
     172
     173patchfiles-append   \
     174    patch-src_qt_install.pri.diff \
     175    patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff \
     176    patch-tools_assistant_lib_lib.pro.diff \
     177    patch-tools_designer_src_components_lib_lib.pro.diff \
     178    patch-tools_designer_src_lib_lib.pro.diff \
     179    patch-tools_designer_src_uitools_uitools.pro.diff \
     180    patch-mkspecs_features_uitools.prf.diff
     181
     182# (19) fix 'macdeployqt' to look for the correct plugins location by
     183# default.  This is paired with a "reinplace" in post-patch
     184
     185patchfiles-append patch-tools_macdeployqt_macdeployqt_main.cpp.diff
     186
     187# (20) Under 10.4 only: patch QMake build files using just "-lQtHelp"
     188# to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead.  For
     189# some reason 10.5+ "knows" that how to do this correctly.
     190
     191platform darwin 8 {
     192    patchfiles-append patch-QtHelp_10.4_only.diff
     193}
     194
     195###############################################
    107196
    108197# find a way to specify the OS MINOR version.
     
    116205} else {
    117206    set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
     207}
     208
     209# find a way to specify the SDK to use; Qt will use the 10.4u by
     210# default which won't work on 10.6 since it is not supported.  Allow
     211# the user to specify the SDK if desired.
     212
     213global SDK
     214set SDK ${configure.sdkroot}
     215if {${SDK} == ""} {
     216    # set SDK version depending on OS version
     217    set sdk_version ""
     218    if {${MINOR} == "4"} {
     219        # OSX 10.4 requires an additional 'u'
     220        set sdk_version "10.4u"
     221    } else {
     222        set sdk_version "10.${MINOR}"
     223    }
     224    if {[vercmp ${xcodeversion} 4.3] < 0} {
     225        set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
     226    } else {
     227        set SDK ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdk_version}.sdk
     228    }
    118229}
    119230
     
    132243    reinplace "s|@ARCHES@|${ARCHES}|g" ${worksrcpath}/configure
    133244
    134     global MINOR
    135 
    136245    # set MACOSX_DEPLOYMENT_TARGET version in various places.  These
    137246    # were all patched in (2) above, and can be easily changed or
    138247    # overridden by the user in a project-local qmake .pro script.
    139248    set TARGET "10.${MINOR}"
    140     foreach fixfile {configure mkspecs/common/mac-g++.conf \
     249    foreach fixfile {configure mkspecs/common/g++-macx.conf \
    141250                     mkspecs/common/mac.conf qmake/qmake.pri \
    142251                     src/tools/bootstrap/bootstrap.pro } {
     
    150259
    151260    # Ensure that correct C/C++ compilers are used.
     261
    152262    reinplace "s| g++\$| ${configure.cxx}|" \
    153         ${worksrcpath}/mkspecs/common/g++.conf
     263        ${worksrcpath}/mkspecs/common/g++-base.conf
    154264    reinplace "s| gcc\$| ${configure.cc}|"  \
    155         ${worksrcpath}/mkspecs/common/g++.conf
    156     reinplace "s| g++\$| ${configure.cxx}|" \
    157         ${worksrcpath}/mkspecs/macx-g++/qmake.conf
    158     reinplace "s| gcc\$| ${configure.cc}|"  \
    159         ${worksrcpath}/mkspecs/macx-g++/qmake.conf
    160 
    161     # fix up tests to work with ccache, if used
    162     foreach fixfile [exec find ${worksrcpath}/config.tests \
    163                          -name "*.test"] {
    164         reinplace "s@\\\"\\\$COMPILER\\\"@\$COMPILER@g" ${fixfile}
    165     }
    166 
    167     # fix 'configure' script to find the correct QMAKE CXX compiler by
    168     # removing possibilities that include the character "$".  Yes,
    169     # that's a lot of "\"s: each "\\\\" -> a single "\" in the patched
    170     # file, and need "\\\\$" (with the "s) there.
    171     reinplace "/QMAKE_CONF_COMPILER/ \
    172              s@tail@grep -v \"\\\\\\\\\\\\\\\\\$\" | tail@" \
    173         ${worksrcpath}/configure
    174 
    175     # fix the corewlan .pro file to use the correct developer dir
    176     reinplace "s,@DEVELOPER_DIR@,${developer_dir},g" \
     265        ${worksrcpath}/mkspecs/common/g++-base.conf
     266
     267    # fix the corewlan .pro file to use the correct developer SDK
     268
     269    reinplace "s,@DEVELOPER_SDK@,${SDK},g" \
    177270        ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
     271
     272    # fix 'macdeployqt' to look for the correct plugins location by default.
     273
     274    reinplace "s,@QT_PLUGINS_DIR@,${qt_plugins_dir},g" \
     275        ${worksrcpath}/tools/macdeployqt/macdeployqt/main.cpp
     276
     277    # if no debug, then do not even build debug code
     278
     279    if {![variant_isset debug]} {
     280        foreach fixfile { src/qbase.pri \
     281                          src/3rdparty/webkit/Source/WebKit.pri \
     282                          src/imports/qimportbase.pri \
     283                          src/plugins/qpluginbase.pri \
     284                          tools/designer/src/components/lib/lib.pro \
     285                          tools/designer/src/lib/lib.pro \
     286                          tools/designer/src/plugins/activeqt/activeqt.pro \
     287                          tools/designer/src/plugins/plugins.pri \
     288                          tools/designer/src/uitools/uitools.pro \
     289                          src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro } {
     290            reinplace "/+=/s@debug_and_release@@g" \
     291                ${worksrcpath}/${fixfile}
     292        }
     293    }
    178294}
    179295
     
    287403    compiler.cpath [join ${header_path} :]
    288404    compiler.library_path [join ${library_path} :]
    289 }
    290 
    291 platform darwin 8 {
    292     # build as Carbon only, not cocoa.
    293     configure.args-append -carbon
    294 
    295     # required linking flags?
    296     configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms -lsqlite3 -lssl -lz
    297 
    298     # Under 10.4 only: patch QMake build files using just "-lQtHelp"
    299     # to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead.
    300     # For some reason 10.5+ "knows" that how to do this correctly.
    301     patchfiles-append patch-QtHelp_10.4_only.diff
    302 }
    303 
    304 platform darwin {
    305     pre-configure {
    306         # retrieve the arch type(s) to use, in Qt-speak
    307         configure.args-append -arch \"${qt_arch_types}\"
    308 
    309         # cannot use pre-compiled headers when compiling with more than 1
    310         # arch type (typically +universal) or for X11
    311         #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
    312         if {[llength ${qt_arch_types}] != 1} {
    313             configure.args-append -no-pch
    314         } else {
    315             configure.args-append -pch
    316         }
    317 
    318         # check to see if not compiling for the native machine hardware
    319         # (e.g., compiling for just i386 but CPU is x86_64); optimization
    320         # of QMake does not work in this circumstance.
    321         if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
    322             # not building for native arch: disable optimizing qmake
    323             configure.args-delete -optimized-qmake
    324         } elseif {${MINOR} == "6" &&
    325                   [llength ${qt_arch_types}] == 1 &&
    326                   [lsearch -exact ${qt_arch_types} x86] == 0} {
    327             # disable qmake optimization on 10.6 32-bit
    328             configure.args-delete -optimized-qmake
    329         }
    330 
    331         # find a way to specify the SDK to use; Qt will use the 10.4u
    332         # by default which won't work on 10.6 since it is not
    333         # supported.  Allow the user to specify the SDK if desired.
    334         set SDK ${configure.sdkroot}
    335         if {${SDK} == ""} {
    336             # set SDK version depending on OS version
    337             global MINOR
    338             set sdk_version ""
    339             if {${MINOR} == "4"} {
    340                 # OSX 10.4 requires an additional 'u'
    341                 set sdk_version "10.4u"
    342             } else {
    343                 set sdk_version "10.${MINOR}"
    344             }
    345             set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
    346         }
    347         if {[file exists ${SDK}]} {
    348             configure.args-append -sdk ${SDK}
    349         } else {
    350             ui_msg \
    351 "No SDK found in ${developer_dir}/SDKs for ${sdk_version} ; \
    352 configure will probably fail. \n \
    353 Please install Apple's Developer Tools again."
    354         }
    355     }
    356 }
    357 
    358 # Remove any '-I' and '-L' string from the *FLAGS for SQLITE, DBUS,
    359 # ODBC, and OPENSSL, so that what remains are just non-I/L flags;
    360 # these paths are in compiler.cpath and compiler.library_path.  The
    361 # header and library paths for all the other variants are not used by
    362 # 'configure', and are already included in the compiler.cpath and
    363 # compiler.library_path . during the 'build' stage, 'make' will
    364 # rebuild the Makefiles that depend on any of these changed files.
    365 # These patches are sufficient to make sure local (to this build)
    366 # paths are searched first, and then system paths last (via the
    367 # compiler.X settings).  Ideally, 'qmake' -- either via its mkspecs
    368 # files or the project's build files -- would distinguish between
    369 # "local" and "system" includes & libraries.
     405
     406    # for 10.4 or 10.5 32-bit PPC, build as Carbon only, not Cocoa
     407
     408    if {${MINOR} == "4"} {
     409
     410        configure.args-append -carbon
     411
     412        # required linking flags?
     413
     414        configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \
     415            -lsqlite3 -lssl -lz
     416
     417    } elseif {${MINOR} == "5" &&
     418              [llength ${qt_arch_types}] == 1 &&
     419              [lsearch -exact ${qt_arch_types} ppc] == 0} {
     420
     421        configure.args-append -carbon
     422
     423    }
     424
     425    # set the arch type(s) to use, in Qt-speak
     426
     427    configure.args-append -arch \"${qt_arch_types}\"
     428
     429    # cannot use pre-compiled headers when compiling with more than 1
     430    # arch type (typically +universal) or for X11
     431
     432    #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
     433
     434    if {[llength ${qt_arch_types}] != 1} {
     435        configure.args-append -no-pch
     436    } else {
     437        configure.args-append -pch
     438    }
     439
     440    # check to see if not compiling for the native machine hardware
     441    # (e.g., compiling for just i386 but CPU is x86_64); optimization
     442    # of QMake does not work in this circumstance.
     443
     444    if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
     445
     446        # not building for native arch: disable optimizing qmake
     447        configure.args-delete -optimized-qmake
     448
     449    } elseif {${MINOR} == "6" &&
     450              [llength ${qt_arch_types}] == 1 &&
     451              [lsearch -exact ${qt_arch_types} x86] == 0} {
     452
     453        # disable qmake optimization on 10.6 32-bit
     454        configure.args-delete -optimized-qmake
     455
     456    }
     457
     458    # set the SDK, if it was found and exists
     459
     460    if {[file exists ${SDK}]} {
     461        configure.args-append -sdk ${SDK}
     462    }
     463}
     464
    370465post-configure {
     466
     467    # Remove any '-I' and '-L' string from the *FLAGS for SQLITE,
     468    # DBUS, ODBC, and OPENSSL, so that what remains are just non-I/L
     469    # flags; these paths are in compiler.cpath and
     470    # compiler.library_path.  The header and library paths for all the
     471    # other variants are not used by 'configure', and are already
     472    # included in the compiler.cpath and compiler.library_path
     473    # . during the 'build' stage, 'make' will rebuild the Makefiles
     474    # that depend on any of these changed files.  These patches are
     475    # sufficient to make sure local (to this build) paths are searched
     476    # first, and then system paths last (via the compiler.X settings).
     477    # Ideally, 'qmake' -- either via its mkspecs files or the
     478    # project's build files -- would distinguish between "local" and
     479    # "system" includes & libraries.
     480
    371481    # SQLITE
    372482    reinplace "/SQLITE/s@-I${prefix}/\[^ \]*include\[^ \]*@@g" \
     
    414524    }
    415525
     526    # remove Libs.private from all pc files
     527    foreach fixfile [exec find ${destroot_qt} -name "*.pc"] {
     528        reinplace "/Libs\.private/d" ${fixfile}
     529    }
     530
     531    # Fix .pc files to use ${prefix} correctly
     532    foreach fixfile [exec find ${destroot_qt} -name "*.pc"] {
     533        reinplace "s|${prefix}/|\${prefix}/|g" ${fixfile}
     534    }
     535
     536    if {![variant_isset framework]} {
     537
     538        # if not doing framework install: install qt_menu.nib, used by
     539        # any applications making use of Qt's application class
     540
     541        xinstall -m 755 -d ${destroot_qt}/lib/Resources
     542        copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
     543            ${destroot_qt}/lib/Resources
     544
     545    } else {
     546
     547        # remove -L entries from .prl, and .la files; this is a
     548        # framework install, not a library install
     549
     550        foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
     551            reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
     552        }
     553        foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
     554            reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
     555        }
     556
     557        # remove redundant -F${prefix}/Library/Frameworks entries
     558
     559        foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
     560            reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
     561                ${fixfile}
     562            reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
     563            reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
     564                ${fixfile}
     565        }
     566        foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
     567            reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
     568                ${fixfile}
     569            reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
     570            reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
     571                ${fixfile}
     572        }
     573
     574        # move .pc files from ${qt_frameworks_dir}/pkgconfig to
     575        # ${qt_pkg_config_dir}
     576
     577        file delete -force ${destroot}${qt_pkg_config_dir}
     578        xinstall -m 755 -d ${destroot}${qt_libs_dir}
     579        move ${destroot}${qt_frameworks_dir}/pkgconfig \
     580            ${destroot}${qt_libs_dir}
     581
     582        # link headers into ${qt_includes_dir}, removing directories
     583        # if they are already there first
     584
     585        foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
     586                             -name "*.framework"] {
     587            set tf_full [strsed ${fixfile} {s@\\.framework@@}]
     588            set tf [strsed ${tf_full} {g@.*\/@@}]
     589            set inc_file ${destroot}${qt_includes_dir}/${tf}
     590            if {[file exists ${inc_file}]} {
     591                file delete -force ${inc_file}
     592            }
     593            ln -s ${tf_full}.framework/Headers ${inc_file}
     594        }
     595    }
     596
    416597    # Install documentation.
    417598    xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
     
    427608    }
    428609
    429     # install qt_menu.nib, used by any applications making use of Qt's
    430     # application class.
    431     xinstall -m 755 -d ${destroot_qt}/lib/Resources
    432     copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
    433         ${destroot_qt}/lib/Resources
     610    # remove 'tests' directory
     611
     612    file delete -force ${destroot}${prefix}/tests
    434613}
    435614
     
    520699
    521700if {[variant_isset debug]} {
    522     configure.args-append -debug-and-release
     701    configure.args-append -debug-and-release -declarative-debug
    523702} else {
    524     configure.args-append -release
     703    configure.args-append -release -no-declarative-debug
    525704}
    526705
  • trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff

    r73102 r94241  
    1 --- config.tests/unix/compile.test.orig 2010-11-01 10:05:07.000000000 -0400
    2 +++ config.tests/unix/compile.test      2010-11-01 10:05:41.000000000 -0400
     1--- config.tests/unix/compile.test.orig 2012-04-23 14:49:04.000000000 -0400
     2+++ config.tests/unix/compile.test      2012-04-17 14:38:16.000000000 -0400
    33@@ -68,7 +68,7 @@
    44 # Make sure output from possible previous tests is gone
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r92720 r94241  
    1 --- configure.orig      2012-04-23 14:49:04.000000000 -0400
    2 +++ configure   2012-04-20 23:36:12.000000000 -0400
    3 @@ -841,6 +841,7 @@
     1--- configure.orig      2012-05-28 09:16:17.000000000 -0400
     2+++ configure   2012-05-28 09:16:26.000000000 -0400
     3@@ -901,6 +901,7 @@
    44 QT_INSTALL_DOCS=
    55 QT_INSTALL_HEADERS=
     
    99 QT_INSTALL_PLUGINS=
    1010 QT_INSTALL_IMPORTS=
    11 @@ -1298,6 +1299,9 @@
     11@@ -1358,6 +1359,9 @@
    1212     libdir)
    1313         QT_INSTALL_LIBS="$VAL"
     
    1919         QT_NAMESPACE="$VAL"
    2020         ;;
    21 @@ -3322,7 +3326,7 @@
    22      CFG_FRAMEWORK=no
    23  fi
    24  
    25 -QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
    26 +QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | grep -v "\\\\$" | tail -1`
    27  TEST_COMPILER="$CXX"
    28  
    29  [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
    30 @@ -3589,6 +3593,19 @@
     21@@ -3649,6 +3653,19 @@
    3122     fi
    3223     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
     
    4839     if [ -z "$QT_INSTALL_BINS" ]; then #default
    4940         if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
    50 @@ -4640,6 +4657,7 @@
     41@@ -4700,6 +4717,7 @@
    5142 DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    5243 HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
     
    5647 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    5748 IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
    58 @@ -4665,6 +4683,7 @@
     49@@ -4725,6 +4743,7 @@
    5950     HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    6051     HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
     
    6455     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    6556     HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
    66 @@ -4682,6 +4701,7 @@
     57@@ -4742,6 +4761,7 @@
    6758 static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    6859 static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
     
    7263 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    7364 static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
    74 @@ -4700,6 +4720,7 @@
     65@@ -4760,6 +4780,7 @@
    7566 static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    7667 static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
     
    8071 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    8172 static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
    82 @@ -4725,6 +4746,7 @@
     73@@ -4785,6 +4806,7 @@
    8374 #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    8475 #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
     
    8879 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    8980 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
    90 @@ -4917,20 +4939,11 @@
     81@@ -4944,20 +4966,11 @@
    9182             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    9283             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
     
    114105                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    115106                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    116 @@ -7015,16 +7028,8 @@
     107@@ -7042,16 +7055,8 @@
    117108 
    118109 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
     
    133124 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    134125 case "$XPLATFORM" in
    135 @@ -7755,28 +7760,28 @@
     126@@ -7782,28 +7787,28 @@
    136127 # env. variable.
    137128 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     
    178169 fi
    179170 
    180 @@ -8523,6 +8528,7 @@
     171@@ -8550,6 +8555,7 @@
    181172 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    182173 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff

    r73343 r94241  
    1 --- mkspecs/common/mac.conf.orig        2010-11-02 10:44:30.000000000 -0400
    2 +++ mkspecs/common/mac.conf     2010-11-02 10:48:37.000000000 -0400
    3 @@ -40,5 +40,9 @@
     1--- mkspecs/common/mac.conf.orig        2012-04-23 14:49:04.000000000 -0400
     2+++ mkspecs/common/mac.conf     2012-04-17 14:38:16.000000000 -0400
     3@@ -38,7 +38,11 @@
     4 QMAKE_DEL_DIR          = rmdir
     5 QMAKE_CHK_DIR_EXISTS   = test -d
    46 QMAKE_MKDIR            = mkdir -p
    5  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
     7-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
     8+QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
    69 
    710+# allow CC and CXX to use CCACHE;
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff

    r92720 r94241  
    1 --- mkspecs/features/qt.prf.orig        2012-04-23 14:49:04.000000000 -0400
    2 +++ mkspecs/features/qt.prf     2012-04-21 22:25:38.000000000 -0400
     1--- mkspecs/features/qt.prf.orig        2012-05-11 10:33:42.000000000 -0400
     2+++ mkspecs/features/qt.prf     2012-05-23 15:31:06.000000000 -0400
    33@@ -137,7 +137,15 @@
    44 #specific module settings
     
    88 for(QTLIB, $$list($$lower($$unique(QT)))) {
    99+
    10 +#   message('LIBS' qt before $$QTLIB is '$${LIBS}')
    11 +#   message('INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
    12 +#   message('QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
    13 +#   message('QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
    14 +#   message('QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
     10+#   message(qt: 'LIBS' qt before $$QTLIB is '$${LIBS}')
     11+#   message(qt: 'INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
     12+#   message(qt: 'QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
     13+#   message(qt: 'QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
     14+#   message(qt: 'QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
    1515+
    1616    unset(qlib_style)
     
    2121       }
    2222    }
    23 +#   message('LIBS' qt after $$QTLIB is '$${LIBS}')
    24 +#   message('INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
    25 +#   message('QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
    26 +#   message('QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
    27 +#   message('QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
     23+#   message(qt: 'LIBS' qt after $$QTLIB is '$${LIBS}')
     24+#   message(qt: 'INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
     25+#   message(qt: 'QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
     26+#   message(qt: 'QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
     27+#   message(qt: 'QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
    2828+}
    2929+
     
    5353 }
    5454 
    55 +#message(QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
    56 +#message(QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
    57 +#message(QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
    58 +#message(QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
     55+#message(qt: QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
     56+#message(qt: QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
     57+#message(qt: QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
     58+#message(qt: QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
    5959+
    6060 qt_compat {
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff

    r92720 r94241  
    1 --- mkspecs/features/qt_functions.prf.orig      2012-05-02 11:09:26.000000000 -0400
    2 +++ mkspecs/features/qt_functions.prf   2012-05-02 11:39:42.000000000 -0400
    3 @@ -16,24 +16,29 @@
     1--- mkspecs/features/qt_functions.prf.orig      2012-05-11 10:33:49.000000000 -0400
     2+++ mkspecs/features/qt_functions.prf   2012-05-25 13:15:09.000000000 -0400
     3@@ -16,24 +16,54 @@
    44 }
    55 
    66 defineTest(qtAddLibrary) {
    7 +#    message('LIBS' before $$1 is '$${LIBS}')
    8 +#    message('INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
    9 +#    message('QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
     7+#    message(qtAddLibrary: 'LIBS' before $$1 is '$${LIBS}')
     8+#    message(qtAddLibrary: 'INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
     9+#    message(qtAddLibrary: 'QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
    1010+
    1111+    # reorder the includes path: user, this library, Qt headers
     
    1717+    # first time through, append the path for Qt's installed libraries:
    1818+    # -after- all of the other necessary libraries and paths
     19+
    1920+    mac:!static:contains(QT_CONFIG, qt_framework) {
    20 +      !contains(LIBS,-F$$QMAKE_FRAMEWORKDIR_QT):LIBS = $$LIBS -F$$QMAKE_FRAMEWORKDIR_QT
    21 +      !contains(LIBS,-F$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -F$$QMAKE_LIBDIR_QT
     21+      isEmpty(QMAKE_FRAMEWORKDIR_QT) {
     22+         !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/Library/Frameworks) {
     23+          LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/Library/Frameworks
     24+        }
     25+      } else {
     26+        !contains(LIBS,-F$$QMAKE_FRAMEWORKDIR_QT) {
     27+         LIBS = $$LIBS -F$$QMAKE_FRAMEWORKDIR_QT
     28+       }
     29+      }
     30+      isEmpty(QMAKE_LIBDIR_QT) {
     31+         !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/lib) {
     32+          LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/lib
     33+        }
     34+      } else {
     35+        !contains(LIBS,-F$$QMAKE_LIBDIR_QT) {
     36+         LIBS = $$LIBS -F$$QMAKE_LIBDIR_QT
     37+       }
     38+      }
    2239+    }
    23 +    !contains(LIBS,-L$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
     40+    isEmpty(QMAKE_LIBDIR_QT) {
     41+       !contains(LIBS,-L$$[QT_INSTALL_PREFIX]/lib) {
     42+         LIBS = $$LIBS -L$$[QT_INSTALL_PREFIX]/lib
     43+       }
     44+    } else {
     45+      !contains(LIBS,-L$$QMAKE_LIBDIR_QT) {
     46+        LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
     47+      }
     48+    }
    2449 
    2550     LIB_NAME = $$1
     
    4570                !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
    4671                  INCLUDEPATH -= $$FRAMEWORK_INCLUDE
    47 @@ -42,8 +47,7 @@
     72@@ -42,8 +72,7 @@
    4873                LINKAGE = -framework $${LIB_NAME}
    4974                        break()
     
    5580     symbian {
    5681         isEqual(LIB_NAME, QtCore) {
    57 @@ -73,7 +77,16 @@
     82@@ -73,7 +102,16 @@
    5883     isEmpty(LINKAGE) {
    5984        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
     
    7398        isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
    7499     }
    75 @@ -83,6 +96,9 @@
     100@@ -83,6 +121,9 @@
    76101         QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
    77102     }
    78103     LIBS += $$LINKAGE
    79 +#    message('LIBS' after $$1 is now '$${LIBS}')
    80 +#    message('INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
    81 +#    message('QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
     104+#    message(qtAddLibrary: 'LIBS' after $$1 is now '$${LIBS}')
     105+#    message(qtAddLibrary: 'INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
     106+#    message(qtAddLibrary: 'QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
    82107     export(LIBS)
    83108     export(INCLUDEPATH)
    84109     export(QMAKE_FRAMEWORKPATH)
    85 @@ -119,4 +135,3 @@
     110@@ -119,4 +160,3 @@
    86111 
    87112     return(true)
Note: See TracChangeset for help on using the changeset viewer.