Changeset 100149 for trunk/dports/aqua


Ignore:
Timestamp:
Nov 30, 2012, 8:29:49 PM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac :

  • update to 4.8.4_0.
  • remove temporary 4.8.4 patchfile.
  • update patchfiles for 4.8.4 changes.
  • link each .app's executable into ${prefix}/bin.
  • install non-framework ${prefix}/include/Qt/ headers, linked where possible to the actual header located in a framework.
Location:
trunk/dports/aqua/qt4-mac
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r99526 r100149  
    1212name                qt4-mac
    1313conflicts           qt3 qt3-mac qt4-mac-devel
    14 version             4.8.3
    15 revision            1
     14version             4.8.4
    1615categories          aqua
    1716platforms           macosx
     
    2827distname            qt-everywhere-opensource-src-${version}
    2928
    30 checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
    31                     rmd160  fe56e5da874503a79d6f84a1e15460eba5a6feae
     29checksums           sha1    f5880f11c139d7d8d01ecb8d874535f7d9553198 \
     30                    rmd160  3c09a3b1411385d0917225f01ac2ff3a2ce83fda
    3231
    3332minimum_xcodeversions   {8 2.5}
     
    216215patchfiles-append   \
    217216    patch-tools_macdeployqt_shared_shared.cpp.diff
    218 
    219 # (25) temporary fix for Mac menu state; will be removed with 4.8.4.
    220 
    221 patchfiles-append   \
    222     patch-4.8.4-osx-native-menu-state-fix.diff
    223217
    224218###############################################
     
    509503        configure.args-append -sdk ${SDK}
    510504    }
     505
     506    # set which pkg-config to use
     507
     508    configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
     509
    511510}
    512511
     
    843842    }
    844843
    845     # Move .apps into the applications_dir
    846 
    847     xinstall -m 755 -d ${destroot}${qt_apps_dir}
    848     foreach app [glob ${destroot}/${qt_bins_dir}/*.app] {
    849         move ${app} ${destroot}${qt_apps_dir}
     844    # Move .apps into the applications_dir, and link each .apps'
     845    # executable back into ${qt_bins_dir}
     846
     847    set dr_qt_apps_dir ${destroot}${qt_apps_dir}
     848    set dr_qt_bins_dir ${destroot}${qt_bins_dir}
     849
     850    xinstall -m 755 -d ${dr_qt_apps_dir}
     851    foreach app [glob ${dr_qt_bins_dir}/*.app] {
     852
     853        # remove the leading stuff
     854
     855        set app [lindex [split ${app} /] end]
     856
     857        # move the .app
     858
     859        move ${dr_qt_bins_dir}/${app} ${dr_qt_apps_dir}
     860
     861        # link the app's executable back
     862
     863        set texe [strsed ${app} {g@\.app@@}]
     864        ln -s ${qt_apps_dir}/${app}/Contents/MacOS/${texe} \
     865            ${dr_qt_bins_dir}
     866
    850867    }
    851868
     
    855872    move ${destroot_qt}/tests/qt4 ${destroot}${qt_data_dir}/tests
    856873
     874    # install ${qt_includes_dir}/Qt if not already and it exists in
     875    # the build, for support of legacy projects
     876
     877    if {![file exists ${destroot}${qt_includes_dir}/Qt] &&
     878        [file exists ${worksrcpath}/include/Qt]} {
     879
     880        # copy the Qt headers directory
     881
     882        copy ${worksrcpath}/include/Qt ${destroot}${qt_includes_dir}
     883
     884    }
     885
     886    # if ${qt_includes_dir}/Qt was installed, then replace each header
     887    # with a link to its actual header when possible
     888
     889    if {[file exists ${destroot}${qt_includes_dir}/Qt]} {
     890
     891        foreach QtH [exec find ${destroot}${qt_includes_dir}/Qt | \
     892                         sed -e "1d" -e "s@${destroot}${qt_includes_dir}/Qt/@@g"] {
     893
     894            # find the header
     895
     896            set tH [exec find ${destroot}${qt_frameworks_dir} -name ${QtH} | \
     897                        sed -e "s@${destroot}@@g"]
     898
     899            # if found ...
     900
     901            if {${tH} != ""} {
     902
     903                # remove this header
     904
     905                file delete ${destroot}${qt_includes_dir}/Qt/${QtH}
     906
     907                # link it to the found header
     908
     909                ln -s ${tH} ${destroot}${qt_includes_dir}/Qt/${QtH}
     910
     911            }
     912        }
     913    }
    857914}
    858915
  • trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff

    r96486 r100149  
    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
    3 @@ -68,7 +68,7 @@
    4  # Make sure output from possible previous tests is gone
     1--- config.tests/unix/compile.test.orig 2012-11-23 05:11:21.000000000 -0500
     2+++ config.tests/unix/compile.test      2012-11-29 12:02:46.000000000 -0500
     3@@ -69,7 +69,7 @@
    54 rm -f "$EXE" "${EXE}.exe"
    65 
    7 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
    8 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS*=$CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
     6 echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
     7-"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
     8+"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS*=$CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
    99 
    1010 if [ "$VERBOSE" = "yes" ]; then
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r97950 r100149  
    1 --- configure.orig      2012-09-17 11:00:59.000000000 -0400
    2 +++ configure   2012-09-17 11:01:07.000000000 -0400
    3 @@ -920,6 +920,7 @@
     1--- configure.orig      2012-11-23 05:11:23.000000000 -0500
     2+++ configure   2012-11-29 12:08:53.000000000 -0500
     3@@ -924,6 +924,7 @@
    44 QT_INSTALL_DOCS=
    55 QT_INSTALL_HEADERS=
     
    99 QT_INSTALL_PLUGINS=
    1010 QT_INSTALL_IMPORTS=
    11 @@ -1380,6 +1381,9 @@
     11@@ -1392,6 +1393,9 @@
    1212     libdir)
    1313         QT_INSTALL_LIBS="$VAL"
     
    1919         QT_NAMESPACE="$VAL"
    2020         ;;
    21 @@ -3697,6 +3701,19 @@
     21@@ -3685,6 +3689,19 @@
    2222     fi
    2323     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
     
    105105                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    106106                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    107 @@ -5441,9 +5454,9 @@
     107@@ -5511,9 +5524,9 @@
    108108         psql)
    109109             if [ "$CFG_SQL_psql" != "no" ]; then
     
    118118                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
    119119                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
    120 @@ -7097,16 +7110,8 @@
     120@@ -7161,16 +7174,8 @@
    121121 
    122122 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
     
    137137 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    138138 case "$XPLATFORM" in
    139 @@ -7844,28 +7849,28 @@
     139@@ -7910,28 +7915,28 @@
    140140 # env. variable.
    141141 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     
    182182 fi
    183183 
    184 @@ -8618,6 +8623,7 @@
     184@@ -8689,6 +8694,7 @@
    185185 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    186186 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
Note: See TracChangeset for help on using the changeset viewer.