[94241] trunk/dports
michaelld at macports.org
michaelld at macports.org
Tue Jun 12 19:36:10 PDT 2012
Revision: 94241
https://trac.macports.org/changeset/94241
Author: michaelld at macports.org
Date: 2012-06-12 19:36:06 -0700 (Tue, 12 Jun 2012)
Log Message:
-----------
qt4-mac : upgrade to 4.8.2; upgrade and fix certain dependent ports.
Modified Paths:
--------------
trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl
trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
trunk/dports/aqua/QMK-Groundstation/Portfile
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
trunk/dports/audio/phonon/Portfile
trunk/dports/devel/qtscriptgenerator/Portfile
trunk/dports/graphics/qwtplot3d/Portfile
trunk/dports/net/avahi/Portfile
trunk/dports/science/stellarium/Portfile
trunk/dports/www/fcgi/files/patch-configure.in.diff
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
trunk/dports/aqua/qt4-mac/files/patch-configure.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff
trunk/dports/aqua/qt4-mac/files/patch-qmake_option.h.diff
trunk/dports/aqua/qt4-mac/files/patch-qmake_project.cpp.diff
trunk/dports/aqua/qt4-mac/files/patch-qmake_property.cpp.diff
trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff
trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff
trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff
trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff
trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_corewlan.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
trunk/dports/aqua/qt4-mac/files/patch-src_qbase.pri.diff
trunk/dports/aqua/qt4-mac/files/patch-src_qt_install.pri.diff
trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff
trunk/dports/audio/phonon/files/
trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff
trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon-qtscript.xml.diff
trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon.xml.diff
trunk/dports/graphics/qwtplot3d/files/patch-include_qwt3d_openglhelper.h.diff
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff
trunk/dports/aqua/qt4-mac/files/patch-PluginView-no-carbon.diff
trunk/dports/aqua/qt4-mac/files/patch-blacklist-diginotar-certs.diff
trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff
trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-moc.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt_functions.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs-macx-g++-qmake.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-precomp.test.diff
trunk/dports/aqua/qt4-mac/files/patch-src-corelib-global-qglobal.h.diff
trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff
trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff
trunk/dports/audio/phonon/files/
trunk/dports/science/stellarium/files/
Property Changed:
----------------
trunk/dports/
trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff
Property changes on: trunk/dports
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
Modified: trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl
===================================================================
--- trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl 2012-06-13 02:36:06 UTC (rev 94241)
@@ -495,6 +495,7 @@
}
set portfetch::mirror_sites::sites(trolltech) {
+ http://releases.qt-project.org/qt4/source/:nosubdir
http://ftp.heanet.ie/mirrors/ftp.trolltech.com/pub/qt/source/:nosubdir
ftp://ftp.informatik.hu-berlin.de/pub1/Mirrors/ftp.troll.no/QT/qt/source/:nosubdir
http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/:nosubdir
Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2012-06-13 02:36:06 UTC (rev 94241)
@@ -142,7 +142,7 @@
# standard PKGCONFIG path
global qt_pkg_config_dir
-set qt_pkg_config_dir ${qt_dir}/lib/pkgconfig
+set qt_pkg_config_dir ${qt_libs_dir}/pkgconfig
# standard cmake info for Qt4
global qt_cmake_defines
@@ -156,47 +156,89 @@
options qt_arch_types
default qt_arch_types {[string map {i386 x86} [get_canonical_archs]]}
-# allow for both qt4 and qt4 devel
+# allow for depending on either qt4-mac and qt4-mac-devel, simultaneously
+
if {![info exists building_qt4]} {
if {${os.platform} == "darwin"} {
- depends_lib-append path:lib/libQtCore.4.dylib:qt4-mac
+
+ # see if the framework install exists, and if so depend on it;
+ # if not, depend on the library version
+
+ if {[file exists ${qt_frameworks_dir}/QtCore/QtCore]} {
+ depends_lib-append path:Library/Frameworks/QtCore/QtCore:qt4-mac
+ } else {
+ depends_lib-append path:lib/libQtCore.4.dylib:qt4-mac
+ }
+
} else {
depends_lib-append path:lib/libQtCore.so.4:qt4-x11
}
}
-# standard configure environment
-configure.env-append QTDIR=${qt_dir} \
- QMAKE=${qt_qmake_cmd} \
- QMAKESPEC=${qt_qmake_spec} \
- MOC=${qt_moc_cmd}
+# standard configure environment, when not building qt4
-if {${qt_dir} != ${prefix}} {
- configure.env-append PATH=${qt_dir}/bin:$env(PATH)
+if {![info exists building_qt4]} {
+ configure.env-append \
+ QTDIR=${qt_dir} \
+ QMAKE=${qt_qmake_cmd} \
+ QMAKESPEC=${qt_qmake_spec} \
+ MOC=${qt_moc_cmd}
+
+ # make sure the Qt binaries' directory is in the path, if it is
+ # not the current prefix
+
+ if {${qt_dir} != ${prefix}} {
+ configure.env-append PATH=${qt_dir}/bin:$env(PATH)
+ }
+} else {
+ configure.env-append QMAKE_NO_DEFAULTS=""
}
-# standard build environment
-build.env-append QTDIR=${qt_dir} \
- QMAKE=${qt_qmake_cmd} \
- QMAKESPEC=${qt_qmake_spec} \
- MOC=${qt_moc_cmd}
+# standard build environment, when not building qt4
-if {${qt_dir} != ${prefix}} {
- build.env-append PATH=${qt_dir}/bin:$env(PATH)
+if {![info exists building_qt4]} {
+ build.env-append \
+ QTDIR=${qt_dir} \
+ QMAKE=${qt_qmake_cmd} \
+ QMAKESPEC=${qt_qmake_spec} \
+ MOC=${qt_moc_cmd}
+
+ # make sure the Qt binaries' directory is in the path, if it is
+ # not the current prefix
+
+ if {${qt_dir} != ${prefix}} {
+ build.env-append PATH=${qt_dir}/bin:$env(PATH)
+ }
+} else {
+ build.env-append QMAKE_NO_DEFAULTS=""
}
# use PKGCONFIG for Qt discovery in configure scripts
depends_build-append port:pkgconfig
# standard destroot environment
-destroot.env-append QTDIR=${qt_dir} \
- QMAKE=${qt_qmake_cmd} \
- QMAKESPEC=${qt_qmake_spec} \
- MOC=${qt_moc_cmd} \
- INSTALL_ROOT=${destroot} \
- DESTDIR=${destroot}
-if {${qt_dir} != ${prefix}} {
- destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
+
+destroot.env-append \
+ INSTALL_ROOT=${destroot} \
+ DESTDIR=${destroot}
+
+# standard destroot environment, when not building qt4
+
+if {![info exists building_qt4]} {
+ destroot.env-append \
+ QTDIR=${qt_dir} \
+ QMAKE=${qt_qmake_cmd} \
+ QMAKESPEC=${qt_qmake_spec} \
+ MOC=${qt_moc_cmd}
+
+ # make sure the Qt binaries' directory is in the path, if it is
+ # not the current prefix
+
+ if {${qt_dir} != ${prefix}} {
+ destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
+ }
+} else {
+ destroot.env-append QMAKE_NO_DEFAULTS=""
}
# append Qt's PKGCONFIG path to whatever is there now.
Modified: trunk/dports/aqua/QMK-Groundstation/Portfile
===================================================================
--- trunk/dports/aqua/QMK-Groundstation/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/QMK-Groundstation/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -7,7 +7,7 @@
name QMK-Groundstation
version 1.0.1
-revision 1
+revision 2
maintainers lilalinux.net:macports
description Configuration and Debugging Utility for the MikroKopter Project
long_description Configuration and Debugging Utility for the MikroKopter Project.
@@ -46,7 +46,7 @@
destroot {
set appPath ${destroot}${applications_dir}
xinstall -d -m 755 ${appPath}
- file copy ${worksrcpath}/build/Default/${name}.app ${appPath}/${name}.app
+ file copy ${worksrcpath}/build/Release/${name}.app ${appPath}/${name}.app
}
variant qwt conflicts qwt52 description {Use qwt} {
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -11,11 +11,10 @@
name qt4-mac
conflicts qt3 qt3-mac qt4-mac-devel
-version 4.7.4
-revision 1
+version 4.8.2
categories aqua
platforms macosx
-maintainers michaelld
+maintainers michaelld openmaintainer
license {LGPL-2.1 GPL-3}
homepage http://qt.nokia.com/
@@ -27,84 +26,174 @@
master_sites trolltech
distname qt-everywhere-opensource-src-${version}
-# 4.7.4 was stealth-updated; see #31252
-dist_subdir ${name}/${version}_1
+checksums sha1 e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
+ rmd160 6a15077aee1e84076380787127b80c7bb97ebe86
-checksums md5 9831cf1dfa8d0689a06c2c54c5c65aaf \
- sha1 af9016aa924a577f7b06ffd28c9773b56d74c939 \
- rmd160 3e47b09663a89973b1c8628506c995dfc2a5387c
-
minimum_xcodeversions {8 2.5}
-depends_lib-append port:zlib port:dbus port:openssl port:sqlite3 \
- port:tiff port:libpng port:libmng port:jpeg
+depends_lib-append port:zlib path:bin/dbus-daemon:dbus \
+ port:openssl port:sqlite3 port:tiff \
+ port:libpng port:libmng port:jpeg
+###############################################
+# Patches are used to both fix compiling on various OS versions, and
+# to enhance the functionality of QMake and its build files. Some of
+# these patches are 2-stage: use a file here, and the replace an
+# @VARIABLE@ in post-patch. There are LOTS of patches, because Qt is
+# a large, complicated system.
+
# (0) Fix the testing script to properly handle both +universal as
# well as the native arch for both CXX and CC compiling; also make
# sure it does not create a Mac app bundle.
+
patchfiles-append patch-config.tests_unix_compile.test.diff
-# (1) Test for Precompiled-headers support requires a C++ compiler,
-# but configure calls it, by default, with a C compiler.
-patchfiles-append patch-precomp.test.diff
+# (1) Test for Precompiled-headers support (a) requires a C++
+# compiler, but configure calls it, by default, with a C compiler;
+# thus, enable testing using the C compiler. (b) to work with ccache,
+# if used.
-# (2) Tweak various scripts to allow easy replacement of
+patchfiles-append patch-config.tests_unix_precomp.test.diff
+
+# (2) fix 'configure' script: (a) to allow easy replacement of arch
+# type(s). (b) to find the correct QMAKE CXX compiler by removing
+# possibilities that include the character "$". (c) to declare, use,
+# and set QT_INSTALL_FRAMEWORKS and QMAKE_FRAMEWORKDIR_QT, both here
+# and in the resulting .qmake.cache files. (d) to allow easy
+# replacement of MACOSX_DEPLOYMENT_TARGET: build for just the user's
+# current OS.
+
+patchfiles-append patch-configure.diff
+
+# (3) Tweak various scripts to allow easy replacement of
# MACOSX_DEPLOYMENT_TARGET: build for just the user's current OS.
-patchfiles-append patch-macosx-deployment-target.diff
-# (3) Tweak the configure script to allow easy replacement of arch
-# type(s). The location of this patch is dependent on patch (2), but
-# 'patch' should be able to figure it out.
-patchfiles-append patch-configure-arch.diff
+patchfiles-append patch-mkspecs_common_g++-macx.conf.diff
-# (4) Tweak Qt spec files:
-# (4a) Place the -I path for local moc-created headers -before-
+# (4) (a) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build
+# for just the user's current OS; (b) allow QMake to use 'ccache' via,
+# e.g., "qmake && make CCACHE=ccache".
+
+patchfiles-append patch-mkspecs_common_mac.conf.diff
+
+# (5) Place the -I path for local moc-created headers -before-
# all other -I paths.
-patchfiles-append patch-mkspecs-features-moc.prf.diff
-# (4b) Remove Qt's LIBDIR and INCDIR from various Qmake internal
+patchfiles-append patch-mkspecs_features_moc.prf.diff
+
+# (6) Remove Qt's LIBDIR and INCDIR from various Qmake internal
# variables, since they are already included in the user-supplied
# LIBS and INCLUDEPATH.
-patchfiles-append patch-mkspecs-features-qt.prf.diff
-# (4c) Change placement of Qt's LIBDIR and INCDIR, to always be after
-# those supplied by the user's QMake (.pro) files. By the time QMake
-# gets to the patched function, it is creating the Makefile parts to
-# find Qt's headers and libraries, so moving these paths to this
-# location should always work.
-patchfiles-append patch-mkspecs-features-qt_functions.prf.diff
+patchfiles-append patch-mkspecs_features_qt.prf.diff
-# (4d) Add "absolute_library_soname" to the default CONFIG variables,
+# (7) (a) Change placement of Qt's LIBDIR and INCDIR, to always be
+# after those supplied by the user's QMake (.pro) files. By the time
+# QMake gets to the patched function, it is creating the Makefile
+# parts to find Qt's headers and libraries, so moving these paths to
+# this location should always work. (b) If the library is QtWebKit,
+# and the build is library (no-framework), universal, and debug, then
+# the linkage is just -lQtWebKit, not -lQtWebKit_debug because the
+# debug library for 32-bit system cannot be created (too large).
+
+patchfiles-append patch-mkspecs_features_qt_functions.prf.diff
+
+# (8) Add "absolute_library_soname" to the default CONFIG variables,
# so that when a DYLIB is created, if "target.path" is set for it then
# that path is prepended to its "install_name".
-patchfiles-append patch-mkspecs-macx-g++-qmake.prf.diff
-# (4e) allow use of 'ccache' via "qmake && make CCACHE=ccache", in mac
-# only; this patch requires that (2) already be in place.
-patchfiles-append patch-mkspecs_common_mac.conf.diff
+patchfiles-append patch-mkspecs_macx-g++_qmake.conf.diff
-# (5) fix the corewlan qmake file to use non-standard Developer SDK
-# location under 10.6, e.g., for some developers doing both iOS and
-# OSX. This patch does not change behavior for 10.4 or 10.5.
+# (9) Add QT_INSTALL_FRAMEWORKS and related variables to QMake, to
+# provide a default variable for the location of QMake installed
+# frameworks.
+
+patchfiles-append \
+ patch-qmake_option.h.diff \
+ patch-qmake_property.cpp.diff \
+ patch-src_corelib_global_qlibraryinfo.cpp.diff \
+ patch-src_corelib_global_qlibraryinfo.h.diff
+
+# (10) In QMake, disable default MKSPECS and FEATURES path
+# concatinations if the shell environment variable QMAKE_NO_DEFAULTS
+# is set (to anything); we use this variable in this portfile to make
+# sure only internal paths (to the build) are searched by QMake.
+
+patchfiles-append patch-qmake_project.cpp.diff
+
+# (11) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build for
+# just the user's current OS.
+
+patchfiles-append \
+ patch-qmake_qmake.pri.diff \
+ patch-src_tools_bootstrap_bootstrap.pro.diff
+
+# (12) fix compiling of MediaPlayerPrivateQTKit.mm for 10.5; does not
+# hurt others
+
+patchfiles-append patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff
+
+# (13) fix use of CARBON, found on PPC64; does not hurt others
+
+patchfiles-append \
+ patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff \
+ patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
+
+# (14) fix MKSPECS install location for WebKit
+
+patchfiles-append \
+ patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
+
+# (15) fix the corewlan qmake file to use non-standard Developer SDK
+# location under 10.6 and newer, e.g., for some developers doing both
+# iOS and OSX. This patch does not change behavior for 10.4 or 10.5.
# Also include fix to use the correct SDK.
-patchfiles-append patch-src-plugins-bearer-corewlan-corewlan.pro.diff
-# (6) fix use of CARBON, found on PPC64, but will work on any system
-patchfiles-append patch-PluginView-no-carbon.diff
+patchfiles-append patch-src_plugins_bearer_corewlan_corewlan.pro.diff
-# (7) Allow compiling under OS X 10.7
-patchfiles-append patch-src-corelib-global-qglobal.h.diff
+# (16) fix the corewlan source to work under 10.7
-# (8) fix #includes for OS X 10.7 in Bearer CoreWLAN
-patchfiles-append patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff
+patchfiles-append patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
-# (9) from Qt, blocklist bad digistor certs
-# < http://labs.qt.nokia.com/2011/09/07/ >
-patchfiles-append patch-blacklist-diginotar-certs.diff
+# (17) Use the "target.path" for libdir for core libraries instead of
+# the standard QT_INSTALL_LIBS; allows us to set for library or
+# framework elsewhere and have the install still work here.
-# (10) from Qt bugs (#18346), fix shader effect item code.
-patchfiles-append patch-src-imports-shaders-shadereffectitem.cpp.diff
+patchfiles-append patch-src_qbase.pri.diff
+# (18) (a) Disable explicit disabling of framework or static install;
+# i.e., install as a framework if that mode is selected, and as
+# library otherwise. (b) If installing as framework, use the new
+# QT_INSTALL_FRAMEWORKS directory; otherwise, use the old
+# QT_INSTALL_LIBS; (c) Get PKGCONFIG dependencies correct, hopefully;
+# (d) create and install .pc, .la, and .prl library description files,
+# including basic path replacement into DESTDIR; we couple this with a
+# post-patch to get the correct install location.
+
+patchfiles-append \
+ patch-src_qt_install.pri.diff \
+ patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff \
+ patch-tools_assistant_lib_lib.pro.diff \
+ patch-tools_designer_src_components_lib_lib.pro.diff \
+ patch-tools_designer_src_lib_lib.pro.diff \
+ patch-tools_designer_src_uitools_uitools.pro.diff \
+ patch-mkspecs_features_uitools.prf.diff
+
+# (19) fix 'macdeployqt' to look for the correct plugins location by
+# default. This is paired with a "reinplace" in post-patch
+
+patchfiles-append patch-tools_macdeployqt_macdeployqt_main.cpp.diff
+
+# (20) Under 10.4 only: patch QMake build files using just "-lQtHelp"
+# to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead. For
+# some reason 10.5+ "knows" that how to do this correctly.
+
+platform darwin 8 {
+ patchfiles-append patch-QtHelp_10.4_only.diff
+}
+
+###############################################
+
# find a way to specify the OS MINOR version.
global MINOR
set MINOR ""
@@ -117,6 +206,28 @@
set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
}
+# find a way to specify the SDK to use; Qt will use the 10.4u by
+# default which won't work on 10.6 since it is not supported. Allow
+# the user to specify the SDK if desired.
+
+global SDK
+set SDK ${configure.sdkroot}
+if {${SDK} == ""} {
+ # set SDK version depending on OS version
+ set sdk_version ""
+ if {${MINOR} == "4"} {
+ # OSX 10.4 requires an additional 'u'
+ set sdk_version "10.4u"
+ } else {
+ set sdk_version "10.${MINOR}"
+ }
+ if {[vercmp ${xcodeversion} 4.3] < 0} {
+ set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
+ } else {
+ set SDK ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdk_version}.sdk
+ }
+}
+
post-patch {
# set ARCHES in configure (per the third patchfile above), for
# building QMake. join any 2 or more arch entries with the GCC
@@ -131,13 +242,11 @@
}
reinplace "s|@ARCHES@|${ARCHES}|g" ${worksrcpath}/configure
- global MINOR
-
# set MACOSX_DEPLOYMENT_TARGET version in various places. These
# were all patched in (2) above, and can be easily changed or
# overridden by the user in a project-local qmake .pro script.
set TARGET "10.${MINOR}"
- foreach fixfile {configure mkspecs/common/mac-g++.conf \
+ foreach fixfile {configure mkspecs/common/g++-macx.conf \
mkspecs/common/mac.conf qmake/qmake.pri \
src/tools/bootstrap/bootstrap.pro } {
reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${TARGET}|g" \
@@ -149,32 +258,39 @@
${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
# Ensure that correct C/C++ compilers are used.
+
reinplace "s| g++\$| ${configure.cxx}|" \
- ${worksrcpath}/mkspecs/common/g++.conf
+ ${worksrcpath}/mkspecs/common/g++-base.conf
reinplace "s| gcc\$| ${configure.cc}|" \
- ${worksrcpath}/mkspecs/common/g++.conf
- reinplace "s| g++\$| ${configure.cxx}|" \
- ${worksrcpath}/mkspecs/macx-g++/qmake.conf
- reinplace "s| gcc\$| ${configure.cc}|" \
- ${worksrcpath}/mkspecs/macx-g++/qmake.conf
+ ${worksrcpath}/mkspecs/common/g++-base.conf
- # fix up tests to work with ccache, if used
- foreach fixfile [exec find ${worksrcpath}/config.tests \
- -name "*.test"] {
- reinplace "s@\\\"\\\$COMPILER\\\"@\$COMPILER at g" ${fixfile}
- }
+ # fix the corewlan .pro file to use the correct developer SDK
- # fix 'configure' script to find the correct QMAKE CXX compiler by
- # removing possibilities that include the character "$". Yes,
- # that's a lot of "\"s: each "\\\\" -> a single "\" in the patched
- # file, and need "\\\\$" (with the "s) there.
- reinplace "/QMAKE_CONF_COMPILER/ \
- s at tail@grep -v \"\\\\\\\\\\\\\\\\\$\" | tail@" \
- ${worksrcpath}/configure
+ reinplace "s, at DEVELOPER_SDK@,${SDK},g" \
+ ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
- # fix the corewlan .pro file to use the correct developer dir
- reinplace "s, at DEVELOPER_DIR@,${developer_dir},g" \
- ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
+ # fix 'macdeployqt' to look for the correct plugins location by default.
+
+ reinplace "s, at QT_PLUGINS_DIR@,${qt_plugins_dir},g" \
+ ${worksrcpath}/tools/macdeployqt/macdeployqt/main.cpp
+
+ # if no debug, then do not even build debug code
+
+ if {![variant_isset debug]} {
+ foreach fixfile { src/qbase.pri \
+ src/3rdparty/webkit/Source/WebKit.pri \
+ src/imports/qimportbase.pri \
+ src/plugins/qpluginbase.pri \
+ tools/designer/src/components/lib/lib.pro \
+ tools/designer/src/lib/lib.pro \
+ tools/designer/src/plugins/activeqt/activeqt.pro \
+ tools/designer/src/plugins/plugins.pri \
+ tools/designer/src/uitools/uitools.pro \
+ src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro } {
+ reinplace "/+=/s at debug_and_release@@g" \
+ ${worksrcpath}/${fixfile}
+ }
+ }
}
# The build process uses -fconstant-cfstrings.
@@ -286,88 +402,82 @@
# use the corrected CPATH and LIBRARY_PATH for build
compiler.cpath [join ${header_path} :]
compiler.library_path [join ${library_path} :]
-}
-platform darwin 8 {
- # build as Carbon only, not cocoa.
- configure.args-append -carbon
+ # for 10.4 or 10.5 32-bit PPC, build as Carbon only, not Cocoa
- # required linking flags?
- configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms -lsqlite3 -lssl -lz
+ if {${MINOR} == "4"} {
- # Under 10.4 only: patch QMake build files using just "-lQtHelp"
- # to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead.
- # For some reason 10.5+ "knows" that how to do this correctly.
- patchfiles-append patch-QtHelp_10.4_only.diff
-}
+ configure.args-append -carbon
-platform darwin {
- pre-configure {
- # retrieve the arch type(s) to use, in Qt-speak
- configure.args-append -arch \"${qt_arch_types}\"
+ # required linking flags?
- # cannot use pre-compiled headers when compiling with more than 1
- # arch type (typically +universal) or for X11
- #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
- if {[llength ${qt_arch_types}] != 1} {
- configure.args-append -no-pch
- } else {
- configure.args-append -pch
- }
+ configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \
+ -lsqlite3 -lssl -lz
- # check to see if not compiling for the native machine hardware
- # (e.g., compiling for just i386 but CPU is x86_64); optimization
- # of QMake does not work in this circumstance.
- if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
- # not building for native arch: disable optimizing qmake
- configure.args-delete -optimized-qmake
- } elseif {${MINOR} == "6" &&
- [llength ${qt_arch_types}] == 1 &&
- [lsearch -exact ${qt_arch_types} x86] == 0} {
- # disable qmake optimization on 10.6 32-bit
- configure.args-delete -optimized-qmake
- }
+ } elseif {${MINOR} == "5" &&
+ [llength ${qt_arch_types}] == 1 &&
+ [lsearch -exact ${qt_arch_types} ppc] == 0} {
- # find a way to specify the SDK to use; Qt will use the 10.4u
- # by default which won't work on 10.6 since it is not
- # supported. Allow the user to specify the SDK if desired.
- set SDK ${configure.sdkroot}
- if {${SDK} == ""} {
- # set SDK version depending on OS version
- global MINOR
- set sdk_version ""
- if {${MINOR} == "4"} {
- # OSX 10.4 requires an additional 'u'
- set sdk_version "10.4u"
- } else {
- set sdk_version "10.${MINOR}"
- }
- set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
- }
- if {[file exists ${SDK}]} {
- configure.args-append -sdk ${SDK}
- } else {
- ui_msg \
-"No SDK found in ${developer_dir}/SDKs for ${sdk_version} ; \
-configure will probably fail. \n \
-Please install Apple's Developer Tools again."
- }
+ configure.args-append -carbon
+
}
+
+ # set the arch type(s) to use, in Qt-speak
+
+ configure.args-append -arch \"${qt_arch_types}\"
+
+ # cannot use pre-compiled headers when compiling with more than 1
+ # arch type (typically +universal) or for X11
+
+ #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
+
+ if {[llength ${qt_arch_types}] != 1} {
+ configure.args-append -no-pch
+ } else {
+ configure.args-append -pch
+ }
+
+ # check to see if not compiling for the native machine hardware
+ # (e.g., compiling for just i386 but CPU is x86_64); optimization
+ # of QMake does not work in this circumstance.
+
+ if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
+
+ # not building for native arch: disable optimizing qmake
+ configure.args-delete -optimized-qmake
+
+ } elseif {${MINOR} == "6" &&
+ [llength ${qt_arch_types}] == 1 &&
+ [lsearch -exact ${qt_arch_types} x86] == 0} {
+
+ # disable qmake optimization on 10.6 32-bit
+ configure.args-delete -optimized-qmake
+
+ }
+
+ # set the SDK, if it was found and exists
+
+ if {[file exists ${SDK}]} {
+ configure.args-append -sdk ${SDK}
+ }
}
-# Remove any '-I' and '-L' string from the *FLAGS for SQLITE, DBUS,
-# ODBC, and OPENSSL, so that what remains are just non-I/L flags;
-# these paths are in compiler.cpath and compiler.library_path. The
-# header and library paths for all the other variants are not used by
-# 'configure', and are already included in the compiler.cpath and
-# compiler.library_path . during the 'build' stage, 'make' will
-# rebuild the Makefiles that depend on any of these changed files.
-# These patches are sufficient to make sure local (to this build)
-# paths are searched first, and then system paths last (via the
-# compiler.X settings). Ideally, 'qmake' -- either via its mkspecs
-# files or the project's build files -- would distinguish between
-# "local" and "system" includes & libraries.
post-configure {
+
+ # Remove any '-I' and '-L' string from the *FLAGS for SQLITE,
+ # DBUS, ODBC, and OPENSSL, so that what remains are just non-I/L
+ # flags; these paths are in compiler.cpath and
+ # compiler.library_path. The header and library paths for all the
+ # other variants are not used by 'configure', and are already
+ # included in the compiler.cpath and compiler.library_path
+ # . during the 'build' stage, 'make' will rebuild the Makefiles
+ # that depend on any of these changed files. These patches are
+ # sufficient to make sure local (to this build) paths are searched
+ # first, and then system paths last (via the compiler.X settings).
+ # Ideally, 'qmake' -- either via its mkspecs files or the
+ # project's build files -- would distinguish between "local" and
+ # "system" includes & libraries.
+
# SQLITE
reinplace "/SQLITE/s at -I${prefix}/\[^ \]*include\[^ \]*@@g" \
${worksrcpath}/.qmake.cache
@@ -413,6 +523,77 @@
reinplace "s|${from_dir}|${to_dir}|g" ${fixfile}
}
+ # remove Libs.private from all pc files
+ foreach fixfile [exec find ${destroot_qt} -name "*.pc"] {
+ reinplace "/Libs\.private/d" ${fixfile}
+ }
+
+ # Fix .pc files to use ${prefix} correctly
+ foreach fixfile [exec find ${destroot_qt} -name "*.pc"] {
+ reinplace "s|${prefix}/|\${prefix}/|g" ${fixfile}
+ }
+
+ if {![variant_isset framework]} {
+
+ # if not doing framework install: install qt_menu.nib, used by
+ # any applications making use of Qt's application class
+
+ xinstall -m 755 -d ${destroot_qt}/lib/Resources
+ copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
+ ${destroot_qt}/lib/Resources
+
+ } else {
+
+ # remove -L entries from .prl, and .la files; this is a
+ # framework install, not a library install
+
+ foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+ reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
+ }
+ foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+ reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
+ }
+
+ # remove redundant -F${prefix}/Library/Frameworks entries
+
+ foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+ reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
+ ${fixfile}
+ reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
+ reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+ ${fixfile}
+ }
+ foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+ reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
+ ${fixfile}
+ reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
+ reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+ ${fixfile}
+ }
+
+ # move .pc files from ${qt_frameworks_dir}/pkgconfig to
+ # ${qt_pkg_config_dir}
+
+ file delete -force ${destroot}${qt_pkg_config_dir}
+ xinstall -m 755 -d ${destroot}${qt_libs_dir}
+ move ${destroot}${qt_frameworks_dir}/pkgconfig \
+ ${destroot}${qt_libs_dir}
+
+ # link headers into ${qt_includes_dir}, removing directories
+ # if they are already there first
+
+ foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
+ -name "*.framework"] {
+ set tf_full [strsed ${fixfile} {s@\\.framework@@}]
+ set tf [strsed ${tf_full} {g at .*\/@@}]
+ set inc_file ${destroot}${qt_includes_dir}/${tf}
+ if {[file exists ${inc_file}]} {
+ file delete -force ${inc_file}
+ }
+ ln -s ${tf_full}.framework/Headers ${inc_file}
+ }
+ }
+
# Install documentation.
xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
xinstall -m 644 -W ${worksrcpath} \
@@ -426,11 +607,9 @@
move ${app} ${destroot}${qt_apps_dir}
}
- # install qt_menu.nib, used by any applications making use of Qt's
- # application class.
- xinstall -m 755 -d ${destroot_qt}/lib/Resources
- copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
- ${destroot_qt}/lib/Resources
+ # remove 'tests' directory
+
+ file delete -force ${destroot}${prefix}/tests
}
pre-activate {
@@ -519,9 +698,9 @@
variant debug description {Build both release and debug library} {}
if {[variant_isset debug]} {
- configure.args-append -debug-and-release
+ configure.args-append -debug-and-release -declarative-debug
} else {
- configure.args-append -release
+ configure.args-append -release -no-declarative-debug
}
#variant quartz conflicts x11
Deleted: trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,54 +0,0 @@
-From 1537d131e59e4fb43001299cfbd747c521fa1888 Mon Sep 17 00:00:00 2001
-From: Mike McQuaid <mike.mcquaid at kdab.com>
-Date: Thu, 21 Jul 2011 10:35:01 -0400
-Subject: [PATCH] Fix compilation under OSX 10.7 or using llvm-gcc.
-
-Use correct error codes instead of type errors.
-Thanks to Dylan Luke <lukes.dylan at gmail.com> for this patch.
----
- src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
-index 9c110fd..94974fc 100644
---- src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
-+++ src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
-@@ -309,7 +309,7 @@ QT_END_NAMESPACE
-
- QWidget *target = [self dragTargetHitTest:sender];
- if (!target)
-- return [super draggingEntered:sender];
-+ return NSDragOperationNone;
- if (target->testAttribute(Qt::WA_DropSiteRegistered) == false)
- return NSDragOperationNone;
-
-@@ -321,7 +321,7 @@ QT_END_NAMESPACE
- {
- QWidget *target = [self dragTargetHitTest:sender];
- if (!target)
-- return [super draggingUpdated:sender];
-+ return NSDragOperationNone;
-
- if (target == *currentDragTarget()) {
- // The drag continues to move over the widget that we have sendt
-@@ -345,7 +345,7 @@ QT_END_NAMESPACE
- {
- QWidget *target = [self dragTargetHitTest:sender];
- if (!target)
-- return [super draggingExited:sender];
-+ return;
-
- if (*currentDragTarget()) {
- [reinterpret_cast<NSView *>((*currentDragTarget())->winId()) draggingExited:sender];
-@@ -357,7 +357,7 @@ QT_END_NAMESPACE
- {
- QWidget *target = [self dragTargetHitTest:sender];
- if (!target)
-- return [super performDragOperation:sender];
-+ return NO;
-
- BOOL dropResult = NO;
- if (*currentDragTarget()) {
---
-1.6.1
-
Deleted: trunk/dports/aqua/qt4-mac/files/patch-PluginView-no-carbon.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-PluginView-no-carbon.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-PluginView-no-carbon.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,24 +0,0 @@
---- src/3rdparty/webkit/WebCore/plugins/PluginView.h.orig 2011-04-02 12:26:20.000000000 -0400
-+++ src/3rdparty/webkit/WebCore/plugins/PluginView.h 2011-04-02 12:26:42.000000000 -0400
-@@ -360,7 +360,9 @@
-
- Point m_lastMousePos;
- void setNPWindowIfNeeded();
-+#ifndef NP_NO_CARBON
- void nullEventTimerFired(Timer<PluginView>*);
-+#endif
- Point globalMousePosForPlugin() const;
- Point mousePosForPlugin(MouseEvent* event = 0) const;
- #endif
---- src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm.orig 2011-04-02 12:26:06.000000000 -0400
-+++ src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm 2011-04-02 12:30:07.000000000 -0400
-@@ -233,7 +233,9 @@
- setNPWindowIfNeeded();
-
- // TODO: Implement null timer throttling depending on plugin activation
-+#ifndef NP_NO_CARBON
- m_nullEventTimer.set(new Timer<PluginView>(this, &PluginView::nullEventTimerFired));
-+#endif
- m_nullEventTimer->startRepeating(0.02);
-
- m_lastMousePos.h = m_lastMousePos.v = 0;
Deleted: trunk/dports/aqua/qt4-mac/files/patch-blacklist-diginotar-certs.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-blacklist-diginotar-certs.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-blacklist-diginotar-certs.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
---- src/network/ssl/qsslcertificate.cpp
-+++ src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
-- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+ "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+ "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+ "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+ "1184640176", "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+ "120000525", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "120000505", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "120000515", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "20015536", "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+ "20001983", "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+ "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+ "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+// "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+// "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+// "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+ "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+ "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
- 0
- };
-
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
- for (int a = 0; certificate_blacklist[a] != 0; a++) {
-- if (certificate.serialNumber() == certificate_blacklist[a])
-+ QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+ if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+ (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+ certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
- return true;
- }
- return false;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 141d80a..b8e6c4c 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
- X509 *x509 = q_SSL_get_peer_certificate(ssl);
- configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
- q_X509_free(x509);
-- if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-- q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-- q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-- emit q->error(QAbstractSocket::SslHandshakeFailedError);
-- plainSocket->disconnectFromHost();
-- return false;
-+
-+ // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+ foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+ if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+ plainSocket->disconnectFromHost();
-+ return false;
-+ }
- }
-
- // Start translating errors.
Modified: trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,5 +1,5 @@
---- config.tests/unix/compile.test.orig 2010-11-01 10:05:07.000000000 -0400
-+++ config.tests/unix/compile.test 2010-11-01 10:05:41.000000000 -0400
+--- config.tests/unix/compile.test.orig 2012-04-23 14:49:04.000000000 -0400
++++ config.tests/unix/compile.test 2012-04-17 14:38:16.000000000 -0400
@@ -68,7 +68,7 @@
# Make sure output from possible previous tests is gone
rm -f "$EXE" "${EXE}.exe"
Copied: trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,22 @@
+--- config.tests/unix/precomp.test.orig 2012-04-23 14:49:04.000000000 -0400
++++ config.tests/unix/precomp.test 2012-04-17 14:38:16.000000000 -0400
+@@ -4,7 +4,7 @@
+ COMPILER=$1
+ VERBOSE=$2
+
+-case "$COMPILER" in
++case $COMPILER in
+ icpc)
+ cat >header.h <<EOF
+ #define HEADER_H
+@@ -27,8 +27,8 @@
+ rm -f header.pchi header.o source.o
+ ;;
+
+-*g++*|c++)
+- case `"$COMPILER" -dumpversion 2>/dev/null` in
++*g++*|c++|*gcc*|cc)
++ case `$COMPILER -dumpversion 2>/dev/null` in
+ 3.*)
+ ;;
+ *)
Deleted: trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,28 +0,0 @@
---- configure_orig 2010-10-13 21:13:01.000000000 -0400
-+++ configure 2010-10-13 21:15:36.000000000 -0400
-@@ -4567,20 +4567,11 @@
- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
- EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
- EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
-- if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
-- X86_CFLAGS="-arch i386"
-- X86_LFLAGS="-arch i386"
-- EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
-- EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
-- EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
-- fi
-- if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
-- PPC_CFLAGS="-arch ppc"
-- PPC_LFLAGS="-arch ppc"
-- EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
-- EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
-- EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
-- fi
-+ ARCH_CFLAGS="-arch @ARCHES@"
-+ ARCH_LFLAGS="-arch @ARCHES@"
-+ EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
-+ EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
-+ EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
- if [ '!' -z "$CFG_SDK" ]; then
- echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
- echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
Copied: trunk/dports/aqua/qt4-mac/files/patch-configure.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-configure.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,178 @@
+--- configure.orig 2012-05-28 09:16:17.000000000 -0400
++++ configure 2012-05-28 09:16:26.000000000 -0400
+@@ -901,6 +901,7 @@
+ QT_INSTALL_DOCS=
+ QT_INSTALL_HEADERS=
+ QT_INSTALL_LIBS=
++QT_INSTALL_FRAMEWORKS=
+ QT_INSTALL_BINS=
+ QT_INSTALL_PLUGINS=
+ QT_INSTALL_IMPORTS=
+@@ -1358,6 +1359,9 @@
+ libdir)
+ QT_INSTALL_LIBS="$VAL"
+ ;;
++ frameworkdir)
++ QT_INSTALL_FRAMEWORKS="$VAL"
++ ;;
+ qtnamespace)
+ QT_NAMESPACE="$VAL"
+ ;;
+@@ -3649,6 +3653,19 @@
+ fi
+ QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
+
++ #frameworks
++ if [ -z "$QT_INSTALL_FRAMEWORKS" ]; then #default
++ if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
++ if [ "$PLATFORM_MAC" = "yes" ]; then
++ if [ "$CFG_FRAMEWORK" = "yes" ]; then
++ QT_INSTALL_FRAMEWORKS="/Libraries/Frameworks"
++ fi
++ fi
++ fi
++ [ -z "$QT_INSTALL_FRAMEWORKS" ] && QT_INSTALL_FRAMEWORKS="$QT_INSTALL_PREFIX/Library/Frameworks" #fallback
++ fi
++ QT_INSTALL_FRAMEWORKS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_FRAMEWORKS"`
++
+ #bins
+ if [ -z "$QT_INSTALL_BINS" ]; then #default
+ if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+@@ -4700,6 +4717,7 @@
+ DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
+ HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
+ LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
++FRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_INSTALL_FRAMEWORKS"`
+ BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
+ PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
+ IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
+@@ -4725,6 +4743,7 @@
+ HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
+ HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
+ HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
++ HOSTFRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_HOST_PREFIX/Library/Frameworks"`
+ HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
+ HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+ HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
+@@ -4742,6 +4761,7 @@
+ static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
+ static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
+ static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
++static const char qt_configure_frameworks_path_str [256 + 12] = "$HOSTFRAMEWORKS_PATH_STR";
+ static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
+ static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
+ static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
+@@ -4760,6 +4780,7 @@
+ static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
+ static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
+ static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
++static const char qt_configure_frameworks_path_str [256 + 18] = "$FRAMEWORKS_PATH_STR";
+ static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
+ static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
+ static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
+@@ -4785,6 +4806,7 @@
+ #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
+ #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
+ #define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
++#define QT_CONFIGURE_FRAMEWORKS_PATH qt_configure_frameworks_path_str + 18;
+ #define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
+ #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
+ #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
+@@ -4944,20 +4966,11 @@
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
+ EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
+ EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
+- if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
+- X86_CFLAGS="-arch i386"
+- X86_LFLAGS="-arch i386"
+- EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+- fi
+- if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
+- PPC_CFLAGS="-arch ppc"
+- PPC_LFLAGS="-arch ppc"
+- EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
+- fi
++ ARCH_CFLAGS="-arch @ARCHES@"
++ ARCH_LFLAGS="-arch @ARCHES@"
++ EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
++ EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
++ EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
+ if [ '!' -z "$CFG_SDK" ]; then
+ echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
+ echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
+@@ -7042,16 +7055,8 @@
+
+ # set the global Mac deployment target. This is overridden on an arch-by-arch basis
+ # in some cases, see code further down
+-case "$PLATFORM,$CFG_MAC_COCOA" in
+- macx*,yes)
+- # Cocoa
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
+- ;;
+- macx*,no)
+- # gcc, Carbon
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
+- ;;
+-esac
++
++QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
+
+ # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
+ case "$XPLATFORM" in
+@@ -7782,28 +7787,28 @@
+ # env. variable.
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.6"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.6"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.6"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.6"
+ fi
+ fi
+
+@@ -8550,6 +8555,7 @@
+ QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
+ QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
+ QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
++QMAKE_FRAMEWORKDIR_QT = \$\$QT_BUILD_TREE/Library/Frameworks
+ QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
+
+ EOF
Deleted: trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,146 +0,0 @@
---- configure_orig 2010-10-13 09:42:43.000000000 -0400
-+++ configure 2010-10-12 09:44:40.000000000 -0400
-@@ -4559,7 +4559,7 @@
- done
- fi
- if [ "$PLATFORM_MAC" = "yes" ]; then
-- echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
-+ echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
- echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
- echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
- EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
-@@ -6402,16 +6402,7 @@
-
- # set the global Mac deployment target. This is overridden on an arch-by-arch basis
- # in some cases, see code further down
--case "$PLATFORM,$CFG_MAC_COCOA" in
-- macx*,yes)
-- # Cocoa
-- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
-- ;;
-- macx*,no)
-- # gcc, Carbon
-- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
-- ;;
--esac
-+QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
-
- # disable Qt 3 support on VxWorks and Symbian
- case "$XPLATFORM" in
-@@ -7084,28 +7075,28 @@
- # env. variable.
- if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
- if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
-- QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
-+ QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
- fi
- if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
-- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
-- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
-+ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
- fi
- if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
-- QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
-+ QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
- fi
- if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
-- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
-- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
-+ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
-+ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
- fi
- fi
-
---- mkspecs/common/mac-g++.conf_orig 2010-10-13 09:42:49.000000000 -0400
-+++ mkspecs/common/mac-g++.conf 2010-10-12 09:39:33.000000000 -0400
-@@ -18,10 +18,10 @@
- QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
-
--QMAKE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
--QMAKE_OBJECTIVE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
--QMAKE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
--QMAKE_OBJECTIVE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
-+QMAKE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
-+QMAKE_OBJECTIVE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
-+QMAKE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
-+QMAKE_OBJECTIVE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
- QMAKE_CFLAGS_PPC += -arch ppc
- QMAKE_OBJECTIVE_CFLAGS_PPC += -arch ppc
- QMAKE_CFLAGS_X86 += -arch i386
-@@ -38,8 +38,8 @@
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
- QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
--QMAKE_CXXFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
--QMAKE_CXXFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
-+QMAKE_CXXFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
-+QMAKE_CXXFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
- QMAKE_CXXFLAGS_PPC += -arch ppc
- QMAKE_CXXFLAGS_X86 += -arch i386
- QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
-@@ -59,8 +59,8 @@
- QMAKE_LFLAGS_THREAD +=
- QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
- QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
--QMAKE_LFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
--QMAKE_LFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
-+QMAKE_LFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
-+QMAKE_LFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
- QMAKE_LFLAGS_PPC += -arch ppc
- QMAKE_LFLAGS_X86 += -arch i386
- QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
---- mkspecs/common/mac.conf_orig 2010-10-13 09:42:49.000000000 -0400
-+++ mkspecs/common/mac.conf 2010-10-12 09:38:52.000000000 -0400
-@@ -38,7 +38,7 @@
- QMAKE_DEL_DIR = rmdir
- QMAKE_CHK_DIR_EXISTS = test -d
- QMAKE_MKDIR = mkdir -p
--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
-+QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
-
-
- include(unix.conf)
---- qmake/qmake.pri_orig 2010-10-13 09:42:50.000000000 -0400
-+++ qmake/qmake.pri 2010-10-13 10:04:18.000000000 -0400
-@@ -128,7 +128,7 @@
- SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
- mac {
- SOURCES += qcore_mac.cpp qsettings_mac.cpp
-- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
-+ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
- LIBS += -framework ApplicationServices
- }
- } else:win32 {
---- src/tools/bootstrap/bootstrap.pro_orig 2010-10-13 09:42:57.000000000 -0400
-+++ src/tools/bootstrap/bootstrap.pro 2010-10-13 10:04:19.000000000 -0400
-@@ -90,7 +90,7 @@
- ../../corelib/io/qfsfileengine_iterator_win.cpp
-
- macx: {
-- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
-+ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
- SOURCES += ../../corelib/kernel/qcore_mac.cpp
- LIBS += -framework CoreServices
- }
Deleted: trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-moc.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-moc.prf.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-moc.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,18 +0,0 @@
---- mkspecs/features/moc.prf 2010-09-10 05:04:49.000000000 -0400
-+++ /opt/local/share/qt4/mkspecs/features/moc.prf 2010-10-30 21:39:56.000000000 -0400
-@@ -83,8 +83,13 @@
- #make sure we can include these files
- moc_dir_short = $$MOC_DIR
- contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
--contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
--else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR
-+
-+# order the local moc path -before- the others, since its headers
-+# should -always be found locally so we want that path first.
-+contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH = $$MOC_DIR $$INCLUDEPATH
-+else:INCLUDEPATH = $$OUT_PWD/$$MOC_DIR $$INCLUDEPATH
-+
-+# message(MOC_DIR is $$MOC_DIR)
-
- # Backwards compatibility: Make shadow builds with default MOC_DIR work
- # if the user did not add the source dir explicitly.
Deleted: trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt.prf.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,62 +0,0 @@
---- mkspecs/features/qt.prf.orig 2010-09-10 05:04:49.000000000 -0400
-+++ mkspecs/features/qt.prf 2010-11-02 14:28:24.000000000 -0400
-@@ -134,7 +134,15 @@
- #specific module settings
- !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
- QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
-+
- for(QTLIB, $$list($$lower($$unique(QT)))) {
-+
-+# message('LIBS' qt before $$QTLIB is '$${LIBS}')
-+# message('INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
-+# message('QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
-+# message('QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
-+# message('QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
-+
- unset(qlib_style)
- !qt_debug:!qt_release {
- CONFIG(debug, debug|release):qlib_style = debug
-@@ -193,8 +201,43 @@
- qtAddLibrary($$qlib)
- }
- }
-+# message('LIBS' qt after $$QTLIB is '$${LIBS}')
-+# message('INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
-+# message('QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
-+# message('QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
-+# message('QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
-+}
-+
-+# remove Qt's libdir from various flags; it is already part of LIBS,
-+# and should be used only to find Qt's libraries. Qt puts LIBDIR
-+# before all other paths, so it is critical that this variable not
-+# contain anything questionable.
-+QMAKE_LIBDIR -= $$QMAKE_LIBDIR_QT
-+QMAKE_LFLAGS -= -L$$QMAKE_LIBDIR_QT
-+!isEqual($$QMAKE_LIBDIR_QT, $$[QT_INSTALL_PREFIX]/lib) {
-+ QMAKE_LFLAGS -= -L$$[QT_INSTALL_PREFIX]/lib
-+}
-+
-+# remove Qt's incdir from various flags; it is already part of
-+# INCLUDEPATH. C*FLAGS come before the INCPATH build from
-+# INCLUDEPATH, so they should never have this -I in it (or, reall, any
-+# other -I but instead just remove the the obvious choices)
-+QMAKE_CFLAGS -= -I$$QMAKE_INCDIR_QT
-+QMAKE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
-+QMAKE_OBJECTIVE_CFLAGS -= -I$$QMAKE_INCDIR_QT
-+QMAKE_OBJECTIVE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
-+!isEqual($$QMAKE_INCDIR_QT, $$[QT_INSTALL_PREFIX]/include) {
-+ QMAKE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
-+ QMAKE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
-+ QMAKE_OBJECTIVE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
-+ QMAKE_OBJECTIVE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
- }
-
-+#message(QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
-+#message(QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
-+#message(QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
-+#message(QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
-+
- qt_compat {
- !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
- INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
Deleted: trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt_functions.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt_functions.prf.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs-features-qt_functions.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,32 +0,0 @@
---- mkspecs/features/qt_functions.prf.orig 2010-09-10 05:04:49.000000000 -0400
-+++ mkspecs/features/qt_functions.prf 2010-11-02 14:23:13.000000000 -0400
-@@ -16,8 +16,18 @@
- }
-
- defineTest(qtAddLibrary) {
-+# message('LIBS' before $$1 is '$${LIBS}')
-+# message('INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
-+# message('QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
-+
-+ # reorder the includes path: user, this library, Qt headers
-+ INCLUDEPATH -= $$QMAKE_INCDIR_QT
- INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$1
-- INCLUDEPATH = $$QMAKE_INCDIR_QT/$$1 $$INCLUDEPATH
-+ INCLUDEPATH += $$QMAKE_INCDIR_QT/$$1 $$QMAKE_INCDIR_QT
-+
-+ # first time through, append the path for Qt's installed libraries:
-+ # -after- all of the other necessary libraries and paths
-+ !contains(LIBS,-L$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
-
- LIB_NAME = $$1
- unset(LINKAGE)
-@@ -73,6 +83,9 @@
- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
- }
- LIBS += $$LINKAGE
-+# message('LIBS' after $$1 is now '$${LIBS}')
-+# message('INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
-+# message('QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
- export(LIBS)
- export(INCLUDEPATH)
- export(QMAKE_FRAMEWORKPATH)
Deleted: trunk/dports/aqua/qt4-mac/files/patch-mkspecs-macx-g++-qmake.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs-macx-g++-qmake.prf.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs-macx-g++-qmake.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,11 +0,0 @@
---- mkspecs/macx-g++/qmake.conf.orig 2010-10-31 13:46:05.000000000 -0400
-+++ mkspecs/macx-g++/qmake.conf 2010-10-31 13:46:08.000000000 -0400
-@@ -9,7 +9,7 @@
- MAKEFILE_GENERATOR = UNIX
- TARGET_PLATFORM = macx
- TEMPLATE = app
--CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-+CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl absolute_library_soname
- QT += core gui
- QMAKE_INCREMENTAL_STYLE = sublib
-
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,13 @@
+--- mkspecs/common/g++-macx.conf.orig 2012-04-23 14:49:04.000000000 -0400
++++ mkspecs/common/g++-macx.conf 2012-04-17 14:38:16.000000000 -0400
+@@ -16,8 +16,8 @@
+
+ QMAKE_LFLAGS_STATIC_LIB += -all_load
+
+-QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.5
+-QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.5
++QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
+
+ QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
+ QMAKE_CXXFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
Modified: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,8 +1,11 @@
---- mkspecs/common/mac.conf.orig 2010-11-02 10:44:30.000000000 -0400
-+++ mkspecs/common/mac.conf 2010-11-02 10:48:37.000000000 -0400
-@@ -40,5 +40,9 @@
+--- mkspecs/common/mac.conf.orig 2012-04-23 14:49:04.000000000 -0400
++++ mkspecs/common/mac.conf 2012-04-17 14:38:16.000000000 -0400
+@@ -38,7 +38,11 @@
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
++QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+# allow CC and CXX to use CCACHE;
+# use "make CCACHE=ccache" when building
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,18 @@
+--- mkspecs/features/moc.prf.orig 2012-04-24 08:27:50.000000000 -0400
++++ mkspecs/features/moc.prf 2012-04-24 08:27:55.000000000 -0400
+@@ -83,8 +83,13 @@
+ #make sure we can include these files
+ moc_dir_short = $$MOC_DIR
+ contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
+-contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
+-else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR
++
++# order the local moc path -before- the others, since its headers
++# should -always be found locally so we want that path first.
++contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH = $$MOC_DIR $$INCLUDEPATH
++else:INCLUDEPATH = $$OUT_PWD/$$MOC_DIR $$INCLUDEPATH
++
++# message(MOC_DIR is $$MOC_DIR)
+
+ # Backwards compatibility: Make shadow builds with default MOC_DIR work
+ # if the user did not add the source dir explicitly.
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,62 @@
+--- mkspecs/features/qt.prf.orig 2012-05-11 10:33:42.000000000 -0400
++++ mkspecs/features/qt.prf 2012-05-23 15:31:06.000000000 -0400
+@@ -137,7 +137,15 @@
+ #specific module settings
+ !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
+ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
++
+ for(QTLIB, $$list($$lower($$unique(QT)))) {
++
++# message(qt: 'LIBS' qt before $$QTLIB is '$${LIBS}')
++# message(qt: 'INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
++# message(qt: 'QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
++# message(qt: 'QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
++# message(qt: 'QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
++
+ unset(qlib_style)
+ !qt_debug:!qt_release {
+ CONFIG(debug, debug|release):qlib_style = debug
+@@ -197,8 +205,43 @@
+ qtAddLibrary($$qlib)
+ }
+ }
++# message(qt: 'LIBS' qt after $$QTLIB is '$${LIBS}')
++# message(qt: 'INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
++# message(qt: 'QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
++# message(qt: 'QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
++# message(qt: 'QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
++}
++
++# remove Qt's libdir from various flags; it is already part of LIBS,
++# and should be used only to find Qt's libraries. Qt puts LIBDIR
++# before all other paths, so it is critical that this variable not
++# contain anything questionable.
++QMAKE_LIBDIR -= $$QMAKE_LIBDIR_QT
++QMAKE_LFLAGS -= -L$$QMAKE_LIBDIR_QT
++!isEqual($$QMAKE_LIBDIR_QT, $$[QT_INSTALL_PREFIX]/lib) {
++ QMAKE_LFLAGS -= -L$$[QT_INSTALL_PREFIX]/lib
++}
++
++# remove Qt's incdir from various flags; it is already part of
++# INCLUDEPATH. C*FLAGS come before the INCPATH build from
++# INCLUDEPATH, so they should never have this -I in it (or, reall, any
++# other -I but instead just remove the the obvious choices)
++QMAKE_CFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_OBJECTIVE_CFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_OBJECTIVE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
++!isEqual($$QMAKE_INCDIR_QT, $$[QT_INSTALL_PREFIX]/include) {
++ QMAKE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_OBJECTIVE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_OBJECTIVE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
+ }
+
++#message(qt: QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
++#message(qt: QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
++#message(qt: QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
++#message(qt: QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
++
+ qt_compat {
+ !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
+ INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,114 @@
+--- mkspecs/features/qt_functions.prf.orig 2012-05-11 10:33:49.000000000 -0400
++++ mkspecs/features/qt_functions.prf 2012-05-25 13:15:09.000000000 -0400
+@@ -16,24 +16,54 @@
+ }
+
+ defineTest(qtAddLibrary) {
++# message(qtAddLibrary: 'LIBS' before $$1 is '$${LIBS}')
++# message(qtAddLibrary: 'INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
++# message(qtAddLibrary: 'QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
++
++ # reorder the includes path: user, this library, Qt headers
++ INCLUDEPATH -= $$QMAKE_INCDIR_QT
+ INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$1
+- INCLUDEPATH = $$QMAKE_INCDIR_QT/$$1 $$INCLUDEPATH
++ INCLUDEPATH += $$QMAKE_INCDIR_QT/$$1 $$QMAKE_INCDIR_QT
++
++ # first time through, append the path for Qt's installed libraries:
++ # -after- all of the other necessary libraries and paths
++
++ mac:!static:contains(QT_CONFIG, qt_framework) {
++ isEmpty(QMAKE_FRAMEWORKDIR_QT) {
++ !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/Library/Frameworks) {
++ LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/Library/Frameworks
++ }
++ } else {
++ !contains(LIBS,-F$$QMAKE_FRAMEWORKDIR_QT) {
++ LIBS = $$LIBS -F$$QMAKE_FRAMEWORKDIR_QT
++ }
++ }
++ isEmpty(QMAKE_LIBDIR_QT) {
++ !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/lib) {
++ LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/lib
++ }
++ } else {
++ !contains(LIBS,-F$$QMAKE_LIBDIR_QT) {
++ LIBS = $$LIBS -F$$QMAKE_LIBDIR_QT
++ }
++ }
++ }
++ isEmpty(QMAKE_LIBDIR_QT) {
++ !contains(LIBS,-L$$[QT_INSTALL_PREFIX]/lib) {
++ LIBS = $$LIBS -L$$[QT_INSTALL_PREFIX]/lib
++ }
++ } else {
++ !contains(LIBS,-L$$QMAKE_LIBDIR_QT) {
++ LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
++ }
++ }
+
+ LIB_NAME = $$1
+ unset(LINKAGE)
+- mac {
+- CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
+- QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT}
+- FRAMEWORK_INCLUDE = $$QMAKE_LIBDIR_QT/$${LIB_NAME}.framework/Headers
+- !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+- INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+- INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+- }
+- LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
+- } else:!qt_no_framework { #detection
+- for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+- exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
+- QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
++ mac:!qt_no_framework {
++ for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
++ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
++ QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
+ FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
+ !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+@@ -42,8 +72,7 @@
+ LINKAGE = -framework $${LIB_NAME}
+ break()
+ }
+- }
+- }
++ }
+ }
+ symbian {
+ isEqual(LIB_NAME, QtCore) {
+@@ -73,7 +102,16 @@
+ isEmpty(LINKAGE) {
+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
+- mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
++ # special for mac: cannot build QtWebKit as debug,
++ # no-framework, and universal. If things got here,
++ # then this is no-framwork; just take care of the rest.
++ mac {
++ contains(QT_CONFIG, x86):contains(QT_CONFIG, x86_64):isEqual(LIB_NAME, QtWebKit) {
++ LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
++ } else {
++ LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
++ }
++ }
+ }
+ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+ }
+@@ -83,6 +121,9 @@
+ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
+ }
+ LIBS += $$LINKAGE
++# message(qtAddLibrary: 'LIBS' after $$1 is now '$${LIBS}')
++# message(qtAddLibrary: 'INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
++# message(qtAddLibrary: 'QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
+ export(LIBS)
+ export(INCLUDEPATH)
+ export(QMAKE_FRAMEWORKPATH)
+@@ -119,4 +160,3 @@
+
+ return(true)
+ }
+-
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,29 @@
+--- mkspecs/features/uitools.prf.orig 2012-04-26 11:40:22.000000000 -0400
++++ mkspecs/features/uitools.prf 2012-04-26 11:42:42.000000000 -0400
+@@ -2,13 +2,21 @@
+ qt:load(qt)
+
+ # Include the correct version of the UiLoader library
+-symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
+-else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+
+-CONFIG(debug, debug|release) {
+- mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
+- win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
++#mac frameworks, for both debug and release
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ QTUITOOLS_LINKAGE = -framework QtUiTools
++} else {
++
++ symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
++ else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
++
++ CONFIG(debug, debug|release) {
++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
++ }
+ }
++
+ LIBS += $$QTUITOOLS_LINKAGE
+
+ INCLUDEPATH = $$QMAKE_INCDIR_QT/QtUiTools $$INCLUDEPATH
Copied: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- mkspecs/macx-g++/qmake.conf.orig 2012-04-23 14:49:04.000000000 -0400
++++ mkspecs/macx-g++/qmake.conf 2012-04-17 14:38:16.000000000 -0400
+@@ -9,7 +9,7 @@
+ MAKEFILE_GENERATOR = UNIX
+ TARGET_PLATFORM = macx
+ TEMPLATE = app
+-CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
++CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl absolute_library_soname
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
Deleted: trunk/dports/aqua/qt4-mac/files/patch-precomp.test.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-precomp.test.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-precomp.test.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,11 +0,0 @@
---- config.tests/unix/precomp.test.orig 2009-02-25 16:09:14.000000000 -0500
-+++ config.tests/unix/precomp.test 2009-03-10 16:49:45.000000000 -0400
-@@ -27,7 +27,7 @@
- rm -f header.pchi header.o source.o
- ;;
-
--*g++*|c++)
-+*g++*|c++|*gcc*|cc)
- case `"$COMPILER" -dumpversion 2>/dev/null` in
- 3.*)
- ;;
Copied: trunk/dports/aqua/qt4-mac/files/patch-qmake_option.h.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-qmake_option.h.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qmake_option.h.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-qmake_option.h.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,10 @@
+--- qmake/option.h.orig 2012-04-23 14:49:04.000000000 -0400
++++ qmake/option.h 2012-04-20 23:03:15.000000000 -0400
+@@ -214,6 +214,7 @@
+ DocumentationPath,
+ HeadersPath,
+ LibrariesPath,
++ FrameworksPath,
+ BinariesPath,
+ PluginsPath,
+ DataPath,
Copied: trunk/dports/aqua/qt4-mac/files/patch-qmake_project.cpp.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-qmake_project.cpp.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qmake_project.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-qmake_project.cpp.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,37 @@
+--- qmake/project.cpp.orig 2012-04-23 14:49:04.000000000 -0400
++++ qmake/project.cpp 2012-04-17 14:38:16.000000000 -0400
+@@ -596,14 +596,17 @@
+ }
+ }
+ }
+- for(QStringList::Iterator concat_it = concat.begin();
+- concat_it != concat.end(); ++concat_it)
++ QByteArray qmake_no_defaults = qgetenv("QMAKE_NO_DEFAULTS");
++ if (qmake_no_defaults.isNull()) {
++ for(QStringList::Iterator concat_it = concat.begin();
++ concat_it != concat.end(); ++concat_it)
+ feature_roots << (QLibraryInfo::location(QLibraryInfo::PrefixPath) +
+ mkspecs_concat + (*concat_it));
+- for(QStringList::Iterator concat_it = concat.begin();
+- concat_it != concat.end(); ++concat_it)
++ for(QStringList::Iterator concat_it = concat.begin();
++ concat_it != concat.end(); ++concat_it)
+ feature_roots << (QLibraryInfo::location(QLibraryInfo::DataPath) +
+ mkspecs_concat + (*concat_it));
++ }
+ return feature_roots;
+ }
+
+@@ -617,8 +620,10 @@
+ for(QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
+ ret << ((*it) + concat);
+ }
+- ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
+-
++ QByteArray qmake_no_defaults = qgetenv("QMAKE_NO_DEFAULTS");
++ if (qmake_no_defaults.isNull()) {
++ ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
++ }
+ return ret;
+ }
+
Copied: trunk/dports/aqua/qt4-mac/files/patch-qmake_property.cpp.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-qmake_property.cpp.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qmake_property.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-qmake_property.cpp.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,19 @@
+--- qmake/property.cpp.orig 2012-04-23 14:49:04.000000000 -0400
++++ qmake/property.cpp 2012-04-20 22:56:47.000000000 -0400
+@@ -91,6 +91,8 @@
+ return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+ else if(v == "QT_INSTALL_LIBS")
+ return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
++ else if(v == "QT_INSTALL_FRAMEWORKS")
++ return QLibraryInfo::location(QLibraryInfo::FrameworksPath);
+ else if(v == "QT_INSTALL_BINS")
+ return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+ else if(v == "QT_INSTALL_PLUGINS")
+@@ -198,6 +200,7 @@
+ specialProps.append("QT_INSTALL_DOCS");
+ specialProps.append("QT_INSTALL_HEADERS");
+ specialProps.append("QT_INSTALL_LIBS");
++ specialProps.append("QT_INSTALL_FRAMEWORKS");
+ specialProps.append("QT_INSTALL_BINS");
+ specialProps.append("QT_INSTALL_PLUGINS");
+ specialProps.append("QT_INSTALL_IMPORTS");
Copied: trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- qmake/qmake.pri.orig 2012-04-23 14:49:04.000000000 -0400
++++ qmake/qmake.pri 2012-04-17 14:38:16.000000000 -0400
+@@ -138,7 +138,7 @@
+ mac {
+ SOURCES += qfilesystemengine_mac.cpp
+ SOURCES += qcore_mac.cpp qsettings_mac.cpp
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ LIBS += -framework ApplicationServices
+ }
+ } else:win32 {
Deleted: trunk/dports/aqua/qt4-mac/files/patch-src-corelib-global-qglobal.h.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-corelib-global-qglobal.h.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-corelib-global-qglobal.h.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,14 +0,0 @@
---- src/corelib/global/qglobal.h.orig 2011-08-04 16:02:04.000000000 +0200
-+++ src/corelib/global/qglobal.h 2011-08-04 16:04:21.000000000 +0200
-@@ -316,7 +316,10 @@
- # if !defined(MAC_OS_X_VERSION_10_6)
- # define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
- # endif
--# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
-+# if !defined(MAC_OS_X_VERSION_10_7)
-+# define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
-+# endif
-+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
- # warning "This version of Mac OS X is unsupported"
- # endif
- #endif
Deleted: trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,20 +0,0 @@
---- src/imports/shaders/shadereffectitem.cpp.orig
-+++ src/imports/shaders/shadereffectitem.cpp
-@@ -509,7 +509,7 @@ void ShaderEffectItem::updateEffectState(const QMatrix4x4 &matrix)
- m_program.setUniformValue(name.constData(), qvariant_cast<QTransform>(v));
- break;
- case QVariant::Int:
-- m_program.setUniformValue(name.constData(), v.toInt());
-+ m_program.setUniformValue(name.constData(), GLint(v.toInt()));
- break;
- case QVariant::Bool:
- m_program.setUniformValue(name.constData(), GLint(v.toBool()));
-@@ -852,7 +852,7 @@ void ShaderEffectItem::updateShaderProgram()
- if (m_program.isLinked()) {
- m_program.bind();
- for (int i = 0; i < m_sources.size(); ++i)
-- m_program.setUniformValue(m_sources.at(i).name.constData(), i);
-+ m_program.setUniformValue(m_sources.at(i).name.constData(), (GLint) i);
- }
-
- m_program_dirty = false;
\ No newline at end of file
Deleted: trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,14 +0,0 @@
---- src/plugins/bearer/corewlan/corewlan.pro.orig 2011-08-04 21:23:52.000000000 -0400
-+++ src/plugins/bearer/corewlan/corewlan.pro 2011-08-04 21:24:31.000000000 -0400
-@@ -5,9 +5,9 @@
- LIBS += -framework Foundation -framework SystemConfiguration
-
- contains(QT_CONFIG, corewlan) {
-- isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
-+ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_DIR@/SDKs/MacOSX10. at MACOSX_VERSION_MINOR@.sdk") {
- LIBS += -framework CoreWLAN -framework Security
-- DEFINES += MAC_SDK_10_6
-+ DEFINES += MAC_SDK_10_ at MACOSX_VERSION_MINOR@
- }
- }
-
Deleted: trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,13 +0,0 @@
---- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig 2011-08-04 16:33:29.000000000 +0200
-+++ src/plugins/bearer/corewlan/qcorewlanengine.mm 2011-08-04 16:34:21.000000000 +0200
-@@ -52,6 +52,10 @@
- #include <QtCore/qdebug.h>
-
- #include <QDir>
-+#ifdef MAC_SDK_10_7
-+ #include <CoreWLAN/CoreWLANConstants.h>
-+ #include <CoreWLAN/CoreWLANTypes.h>
-+#endif
- #include <CoreWLAN/CoreWLAN.h>
- #include <CoreWLAN/CWInterface.h>
- #include <CoreWLAN/CWNetwork.h>
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,12 @@
+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-04-17 14:38:16.000000000 -0400
+@@ -47,6 +47,9 @@
+ #import "SoftLinking.h"
+ #import "TimeRanges.h"
+ #import "WebCoreSystemInterface.h"
++#if defined(slots)
++#undef slots
++#endif
+ #import <QTKit/QTKit.h>
+ #import <objc/objc-runtime.h>
+ #import <wtf/UnusedParam.h>
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,12 @@
+--- src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h 2012-04-23 14:51:28.000000000 -0400
+@@ -411,7 +411,9 @@
+
+ Point m_lastMousePos;
+ void setNPWindowIfNeeded();
++#ifndef NP_NO_CARBON
+ void nullEventTimerFired(Timer<PluginView>*);
++#endif
+ Point globalMousePosForPlugin() const;
+ Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,13 @@
+--- src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm 2012-04-23 14:51:28.000000000 -0400
+@@ -233,8 +233,10 @@
+ setNPWindowIfNeeded();
+
+ // TODO: Implement null timer throttling depending on plugin activation
++#ifndef NP_NO_CARBON
+ m_nullEventTimer = adoptPtr(new Timer<PluginView>(this, &PluginView::nullEventTimerFired));
+ m_nullEventTimer->startRepeating(0.02);
++#endif
+
+ m_lastMousePos.h = m_lastMousePos.v = 0;
+
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,20 @@
+--- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro 2012-04-17 14:38:16.000000000 -0400
+@@ -295,7 +295,7 @@
+
+ !symbian-abld:!symbian-sbsv2 {
+ modfile.files = $$moduleFile
+- modfile.path = $$[QMAKE_MKSPECS]/modules
++ modfile.path = $$[QT_INSTALL_DATA]/mkspecs/modules
+
+ INSTALLS += modfile
+ } else {
+@@ -303,7 +303,7 @@
+
+ inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+ inst_modfile.input = moduleFile
+- inst_modfile.output = $$[QMAKE_MKSPECS]/modules
++ inst_modfile.output = $$[QT_INSTALL_DATA]/mkspecs/modules
+ inst_modfile.CONFIG = no_clean
+
+ QMAKE_EXTRA_COMPILERS += inst_modfile
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,25 @@
+--- src/corelib/global/qlibraryinfo.cpp.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/corelib/global/qlibraryinfo.cpp 2012-04-20 22:59:34.000000000 -0400
+@@ -262,6 +262,11 @@
+ path = QT_CONFIGURE_LIBRARIES_PATH;
+ break;
+ #endif
++#ifdef QT_CONFIGURE_FRAMEWORKS_PATH
++ case FrameworksPath:
++ path = QT_CONFIGURE_FRAMEWORKS_PATH;
++ break;
++#endif
+ #ifdef QT_CONFIGURE_BINARIES_PATH
+ case BinariesPath:
+ path = QT_CONFIGURE_BINARIES_PATH;
+@@ -327,6 +332,10 @@
+ key = QLatin1String("Libraries");
+ defaultValue = QLatin1String("lib");
+ break;
++ case FrameworksPath:
++ key = QLatin1String("Frameworks");
++ defaultValue = QLatin1String("Library/Frameworks");
++ break;
+ case BinariesPath:
+ key = QLatin1String("Binaries");
+ defaultValue = QLatin1String("bin");
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,10 @@
+--- src/corelib/global/qlibraryinfo.h.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/corelib/global/qlibraryinfo.h 2012-04-20 22:56:57.000000000 -0400
+@@ -70,6 +70,7 @@
+ DocumentationPath,
+ HeadersPath,
+ LibrariesPath,
++ FrameworksPath,
+ BinariesPath,
+ PluginsPath,
+ DataPath,
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_corewlan.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_corewlan.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_corewlan.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_corewlan.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- src/plugins/bearer/corewlan/corewlan.pro.orig 2012-03-14 10:01:12.000000000 -0400
++++ src/plugins/bearer/corewlan/corewlan.pro 2012-04-24 09:23:47.000000000 -0400
+@@ -5,7 +5,7 @@
+ LIBS += -framework Foundation -framework SystemConfiguration
+
+ contains(QT_CONFIG, corewlan) {
+- isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") {
++ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_SDK@") {
+ LIBS += -framework CoreWLAN -framework Security
+ }
+ }
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,13 @@
+--- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig 2011-08-04 16:33:29.000000000 +0200
++++ src/plugins/bearer/corewlan/qcorewlanengine.mm 2011-08-04 16:34:21.000000000 +0200
+@@ -52,6 +52,10 @@
+ #include <QtCore/qdebug.h>
+
+ #include <QDir>
++#ifdef MAC_SDK_10_7
++ #include <CoreWLAN/CoreWLANConstants.h>
++ #include <CoreWLAN/CoreWLANTypes.h>
++#endif
+ #include <CoreWLAN/CoreWLAN.h>
+ #include <CoreWLAN/CWInterface.h>
+ #include <CoreWLAN/CWNetwork.h>
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_qbase.pri.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_qbase.pri.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_qbase.pri.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_qbase.pri.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,30 @@
+--- src/qbase.pri.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/qbase.pri 2012-04-18 22:49:14.000000000 -0400
+@@ -137,14 +137,14 @@
+
+ unix|win32-g++*:!symbian {
+ CONFIG += create_pc
+- QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
+ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
+ QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ include_replace.match = $$QMAKE_INCDIR_QT
+ include_replace.replace = $$[QT_INSTALL_HEADERS]
+ lib_replace.match = $$QMAKE_LIBDIR_QT
+- lib_replace.replace = $$[QT_INSTALL_LIBS]
++ lib_replace.replace = $$target.path
+ prefix_replace.match = $$QT_BUILD_TREE
+ prefix_replace.replace = $$[QT_INSTALL_PREFIX]
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
+@@ -152,8 +152,8 @@
+
+ unix:!symbian {
+ CONFIG += create_libtool explicitlib
+- QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS]
+- QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS]
++ QMAKE_LIBTOOL_LIBDIR = $$target.path
++ QMAKE_PRL_LIBDIR = $$target.path
+ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
+ }
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_qt_install.pri.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_qt_install.pri.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_qt_install.pri.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_qt_install.pri.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,16 @@
+--- src/qt_install.pri.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/qt_install.pri 2012-04-20 23:50:49.000000000 -0400
+@@ -3,7 +3,12 @@
+ dlltarget.path=$$[QT_INSTALL_BINS]
+ INSTALLS += dlltarget
+ }
+-target.path=$$[QT_INSTALL_LIBS]
++# install mac frameworks differently than libraries
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ target.path=$$[QT_INSTALL_FRAMEWORKS]
++} else {
++ target.path=$$[QT_INSTALL_LIBS]
++}
+ INSTALLS += target
+
+ #headers
Copied: trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- src/tools/bootstrap/bootstrap.pro.orig 2012-04-23 14:49:04.000000000 -0400
++++ src/tools/bootstrap/bootstrap.pro 2012-04-17 14:38:16.000000000 -0400
+@@ -104,7 +104,7 @@
+ else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
+
+ macx: {
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp
+ SOURCES += ../../corelib/kernel/qcore_mac.cpp
+ LIBS += -framework CoreServices
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,14 @@
+--- tools/assistant/lib/fulltextsearch/fulltextsearch.pro.orig 2012-04-23 14:49:04.000000000 -0400
++++ tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2012-04-23 12:29:24.000000000 -0400
+@@ -6,9 +6,9 @@
+ mac:!static:contains(QT_CONFIG, qt_framework) {
+ CONFIG(debug, debug|release) {
+ !build_pass:CONFIG += build_all
+- }
++ }
+ }
+-QT_CONFIG -= qt_framework
++# QT_CONFIG -= qt_framework
+ QT -= gui
+ TEMPLATE = lib
+ TARGET = QtCLucene
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,26 @@
+--- tools/assistant/lib/lib.pro.orig 2012-03-14 10:01:12.000000000 -0400
++++ tools/assistant/lib/lib.pro 2012-04-25 12:32:49.000000000 -0400
+@@ -12,16 +12,15 @@
+ application \
+ framework.
+ DEFINES -= QT_ASCII_CAST_WARNINGS
+-qclucene = QtCLucene$${QT_LIBINFIX}
+-if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+- mac:qclucene = $${qclucene}_debug
+- win32:qclucene = $${qclucene}d
+-}
+-linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++
++qtAddLibrary(QtCLucene)
++
+ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
+ QtSql \
+- QtXml
+-LIBS_PRIVATE += -l$$qclucene
++ QtGui \
++ QtCore \
++ QtCLucene
++
+ RESOURCES += helpsystem.qrc
+ SOURCES += qhelpenginecore.cpp \
+ qhelpengine.cpp \
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,44 @@
+--- tools/designer/src/components/lib/lib.pro.orig 2012-04-23 14:49:04.000000000 -0400
++++ tools/designer/src/components/lib/lib.pro 2012-04-22 14:42:03.000000000 -0400
+@@ -64,12 +64,38 @@
+ include(../../sharedcomponents.pri)
+ include(../component.pri)
+
+-unix|win32-g++* {
+- QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
++# install mac frameworks differently than libraries
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ target.path=$$[QT_INSTALL_FRAMEWORKS]
++} else {
++ target.path=$$[QT_INSTALL_LIBS]
++}
++
++unix|win32-g++*:!symbian {
++ CONFIG += create_pc
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
++ QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_REQUIRES += QtCore QtDesigner QtXml
+ contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
++ include_replace.match = $$QMAKE_INCDIR_QT
++ include_replace.replace = $$[QT_INSTALL_HEADERS]
++ lib_replace.match = $$QMAKE_LIBDIR_QT
++ lib_replace.replace = $$target.path
++ prefix_replace.match = $$QT_BUILD_TREE
++ prefix_replace.replace = $$[QT_INSTALL_PREFIX]
++ QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
++}
++
++unix:!symbian {
++ CONFIG += create_libtool explicitlib
++ QMAKE_LIBTOOL_LIBDIR = $$target.path
++ QMAKE_PRL_LIBDIR = $$target.path
++ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
+ }
+
+-target.path=$$[QT_INSTALL_LIBS]
+ INSTALLS += target
+ win32 {
+ dlltarget.path=$$[QT_INSTALL_BINS]
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,55 @@
+--- tools/designer/src/lib/lib.pro.orig 2012-04-23 14:49:04.000000000 -0400
++++ tools/designer/src/lib/lib.pro 2012-04-22 14:41:19.000000000 -0400
+@@ -13,8 +13,6 @@
+ VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+ }
+
+-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
+-
+ include(../../../../src/qt_targets.pri)
+ QMAKE_TARGET_PRODUCT = Designer
+ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
+@@ -63,13 +61,42 @@
+ include(../sharedcomponents.pri)
+ include(../components/component.pri)
+
+-target.path=$$[QT_INSTALL_LIBS]
++# install mac frameworks differently than libraries
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ target.path=$$[QT_INSTALL_FRAMEWORKS]
++} else {
++ target.path=$$[QT_INSTALL_LIBS]
++}
+ INSTALLS += target
+ win32 {
+ dlltarget.path=$$[QT_INSTALL_BINS]
+ INSTALLS += dlltarget
+ }
+
++unix|win32-g++*:!symbian {
++ CONFIG += create_pc
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
++ QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_REQUIRES += QtCore QtGui QtXml
++ contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
++ include_replace.match = $$QMAKE_INCDIR_QT
++ include_replace.replace = $$[QT_INSTALL_HEADERS]
++ lib_replace.match = $$QMAKE_LIBDIR_QT
++ lib_replace.replace = $$target.path
++ prefix_replace.match = $$QT_BUILD_TREE
++ prefix_replace.replace = $$[QT_INSTALL_PREFIX]
++ QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
++}
++
++unix:!symbian {
++ CONFIG += create_libtool explicitlib
++ QMAKE_LIBTOOL_LIBDIR = $$target.path
++ QMAKE_PRL_LIBDIR = $$target.path
++ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
++}
+
+ qt_install_headers {
+ designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,88 @@
+--- tools/designer/src/uitools/uitools.pro.orig 2012-03-14 10:01:12.000000000 -0400
++++ tools/designer/src/uitools/uitools.pro 2012-04-25 14:57:29.000000000 -0400
+@@ -1,7 +1,7 @@
+ TEMPLATE = lib
+ TARGET = QtUiTools
+ QT += xml
+-CONFIG += qt staticlib
++CONFIG += qt qt_install_headers
+ DESTDIR = ../../../../lib
+ DLLDESTDIR = ../../../../bin
+
+@@ -28,20 +28,68 @@
+ SOURCES += quiloader.cpp
+
+ include($$QT_BUILD_TREE/include/QtUiTools/headers.pri, "", true)
+-quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+-quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools
+-INSTALLS += quitools_headers
+
+-target.path=$$[QT_INSTALL_LIBS]
++#mac frameworks
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ #QMAKE_FRAMEWORK_VERSION = 4.0
++ CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
++ CONFIG(debug, debug|release) {
++ !build_pass:CONFIG += debug_and_release build_all
++ } else { #release
++ !debug_and_release|build_pass {
++ CONFIG -= qt_install_headers #no need to install these as well
++ FRAMEWORK_HEADERS.version = Versions
++ FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
++ FRAMEWORK_HEADERS.path = Headers
++ }
++ QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
++ }
++}
++
++mac {
++ CONFIG += explicitlib
++ macx-g++ {
++ QMAKE_CFLAGS += -fconstant-cfstrings
++ QMAKE_CXXFLAGS += -fconstant-cfstrings
++ }
++}
++
++# install mac frameworks differently than libraries
++mac:!static:contains(QT_CONFIG, qt_framework) {
++ target.path=$$[QT_INSTALL_FRAMEWORKS]
++} else {
++ target.path=$$[QT_INSTALL_LIBS]
++}
+ INSTALLS += target
+
+-unix|win32-g++* {
+- CONFIG += create_pc
+- QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
++unix|win32-g++*:!symbian {
++ CONFIG += create_pc
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
+ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
+ QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+- QMAKE_PKGCONFIG_REQUIRES += QtXml
++ QMAKE_PKGCONFIG_REQUIRES += QtXml QtCore QtGui
++ include_replace.match = $$QMAKE_INCDIR_QT
++ include_replace.replace = $$[QT_INSTALL_HEADERS]
++ lib_replace.match = $$QMAKE_LIBDIR_QT
++ lib_replace.replace = $$target.path
++ prefix_replace.match = $$QT_BUILD_TREE
++ prefix_replace.replace = $$[QT_INSTALL_PREFIX]
++ QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
++}
++
++unix:!symbian {
++ CONFIG += create_libtool explicitlib
++ QMAKE_LIBTOOL_LIBDIR = $$target.path
++ QMAKE_PRL_LIBDIR = $$target.path
++ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
++}
++
++qt_install_headers {
++ quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
++ quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools
++ INSTALLS += quitools_headers
+ }
+
+ TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
Copied: trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff (from rev 92720, branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- tools/macdeployqt/macdeployqt/main.cpp.orig 2012-04-23 14:49:04.000000000 -0400
++++ tools/macdeployqt/macdeployqt/main.cpp 2012-04-17 14:38:16.000000000 -0400
+@@ -127,7 +127,7 @@
+
+ if (plugins) {
+ if (deploymentInfo.qtPath.isEmpty())
+- deploymentInfo.pluginPath = "/Developer/Applications/Qt/plugins"; // Assume binary package.
++ deploymentInfo.pluginPath = "@QT_PLUGINS_DIR@"; // Assume binary package.
+ else
+ deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
+
Modified: trunk/dports/audio/phonon/Portfile
===================================================================
--- trunk/dports/audio/phonon/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/audio/phonon/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -3,169 +3,67 @@
PortSystem 1.0
PortGroup qt4 1.0
+PortGroup cmake 1.0
name phonon
-version 4.4.2
-revision 3
+version 4.6.0
categories audio kde kde4
license {LGPL-2.1 LGPL-3}
-maintainers nomaintainer
+maintainers michaelld openmaintainer
description Cross Platform Multimedia API used by KDE4
long_description Cross Platform Multimedia API used by KDE4
platforms darwin
homepage http://phonon.kde.org
-master_sites kde:stable/${name}/${version}/
-use_bzip2 yes
+master_sites kde:stable/${name}/${version}/src
+use_xz yes
distname phonon-${version}
-checksums md5 d9eab28383783261254f1cef3b92a3fa \
- sha1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e \
- rmd160 aa37903f166904dd09401541df8fc268a2858606
+checksums md5 bbe0c1c62ed14c31479c4c1a6cf1e173 \
+ sha1 d8dbc188b58c6dd9c6a73d3742a25291e647bb95 \
+ rmd160 4b6037744c519613f0e39065a92d6742305e1366
depends_build-append port:automoc
-# after extracting both qt4-mac (latest) and phonon, do:
-# $ cd `port dir phonon`/phonon*/qt7
-# $ for tf in `ls -1`; do \
-# > diff -u ${tf} `port dir qt4-mac`/work/qt-*/src/3rdparty/phonon/qt7/${tf};
-# > done > `port dir phonon`/files/patch-qt7.diff
-patchfiles patch-qt7.diff
+# fix the library compatibility version to be 4.4.0
+patchfiles patch-CMakeLists.txt.diff
-set PHONON_MAJOR_VERSION [lindex [split ${version} "."] 0]
-set PHONON_MINOR_VERSION [lindex [split ${version} "."] 1]
-set PHONON_PATCH_VERSION [lindex [split ${version} "."] 2]
+configure.args-append \
+ ${qt_cmake_defines} \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true
-set PHONON_BUILD_DIR ${worksrcpath}/build
+post-destroot {
-post-patch {
- # fix phonon/audiodataoutput.cpp to not use the moc file
- reinplace "/audiodataoutput\.moc/d" \
- ${worksrcpath}/phonon/audiodataoutput.cpp
+ # fix plugin name
- # install qt 4.7.0 QMake files into phonon source
- system "cd ${filespath}/qmake && tar cf - . | \
- (cd ${worksrcpath}; tar xf -)"
+ move ${destroot}${qt_plugins_dir}/designer/libphononwidgets.so \
+ ${destroot}${qt_plugins_dir}/designer/libphononwidgets.dylib
- # create the 'phononnamespace.h' file
- system "cd ${worksrcpath}/phonon && \
- sed -e 's, at PHONON_LIB_MAJOR_VERSION@,${PHONON_MAJOR_VERSION},g' \
- -e 's, at PHONON_LIB_MINOR_VERSION@,${PHONON_MINOR_VERSION},g' \
- -e 's, at PHONON_LIB_PATCH_VERSION@,${PHONON_PATCH_VERSION},g' \
- phononnamespace.h.in > phononnamespace.h"
+ # link major library version name
- # create the 'phonon.pc' files (release and debug)
- system "cd ${worksrcpath} && \
- mkdir -p ${PHONON_BUILD_DIR}/lib/pkgconfig && \
- sed -e 's, at PHONON_LIB_MAJOR_VERSION@,${PHONON_MAJOR_VERSION},g' \
- -e 's, at PHONON_LIB_MINOR_VERSION@,${PHONON_MINOR_VERSION},g' \
- -e 's, at PHONON_LIB_PATCH_VERSION@,${PHONON_PATCH_VERSION},g' \
- -e 's, at QT_MOC_CMD@,${qt_moc_cmd},g' \
- -e 's, at QT_UIC_CMD@,${qt_uic_cmd},g' \
- -e 's, at QT_LIBS_DIR@,${qt_libs_dir},g' \
- -e 's, at QT_INCLUDES_DIR@,${qt_includes_dir},g' \
- -e 's, at PHONON_PREFIX@,${prefix},g' < phonon_debug.pc.in > \
- ${PHONON_BUILD_DIR}/lib/pkgconfig/phonon_debug.pc"
- system "cd ${PHONON_BUILD_DIR}/lib/pkgconfig && \
- sed -e 's,_debug,,g' \
- -e 's,debug,release,g' \
- -e 's,Debug,Release,g' \
- phonon_debug.pc > phonon.pc"
+ ln -s ${prefix}/lib/libphonon.dylib ${destroot}${prefix}/lib/libphonon.4.dylib
+ ln -s ${prefix}/lib/libphononexperimental.dylib ${destroot}${prefix}/lib/libphononexperimental.4.dylib
- # create the 'headers.pri' and 'phonon' files
- set public_headers [exec find ${worksrcpath}/phonon \
- -name "*.h" -maxdepth 1 -mindepth 1 | \
- sed -e "s@${worksrcpath}/@@g" | \
- grep -v "_p"]
- set private_headers [exec find ${worksrcpath}/phonon \
- -name "*.h" -maxdepth 1 -mindepth 1 | \
- sed -e "s@${worksrcpath}/@@g" | \
- grep "_p"]
- set class_headers [exec find ${worksrcpath}/includes/phonon \
- -name "\[A-Z\]*" | \
- sed -e "s@${worksrcpath}/includes/@@g"]
+ # fix library and plugin self-names
- # create 'phonon' file first
- set INCLUDE_HEADERS ""
- foreach header ${public_headers} {
- set INCLUDE_HEADERS "${INCLUDE_HEADERS}\#include \"${header}\"@"
- }
- system "cd ${worksrcpath} && \
- sed -e 's, at INCLUDE_HEADERS@,${INCLUDE_HEADERS},' phonon.in | \
- tr '@' '\\n' > includes/phonon/phonon"
- unset INCLUDE_HEADERS
+ system "install_name_tool -id ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/lib/libphonon.dylib"
+ system "install_name_tool -id ${prefix}/lib/libphononexperimental.4.dylib ${destroot}${prefix}/lib/libphononexperimental.dylib"
- # add new phonon to list of headers
- lappend public_headers "includes/phonon/phonon"
+ # fix use of libphonon
- # create 'headers.pri' file second
- set PUBLIC_HEADERS ""
- foreach header ${public_headers} {
- lappend PUBLIC_HEADERS "../${header}"
- }
- set CLASS_HEADERS ""
- foreach header ${class_headers} {
- lappend CLASS_HEADERS "../includes/${header}"
- }
- set PRIVATE_HEADERS ""
- foreach header ${private_headers} {
- lappend PRIVATE_HEADERS "../${header}"
- }
- system "cd ${worksrcpath} && \
- sed -e 's, at PHONON_PUBLIC_HEADERS@,${PUBLIC_HEADERS},' \
- -e 's, at PHONON_CLASS_HEADERS@,${CLASS_HEADERS},' \
- -e 's, at PHONON_PRIVATE_HEADERS@,${PRIVATE_HEADERS},' \
- headers.pri.in > includes/phonon/headers.pri"
- unset PUBLIC_HEADERS
- unset CLASS_HEADERS
- unset PRIVATE_HEADERS
-}
+ system "install_name_tool -change lib/libphonon.4.4.0.dylib ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/lib/libphononexperimental.dylib"
+ system "install_name_tool -change lib/libphonon.4.4.0.dylib ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/share/qt4/plugins/designer/libphononwidgets.dylib"
-pre-configure {
- # set arch type(s); done is a stage to make sure the 'options
- # qt_arch_types' is evaluated -after- +universal (if selected).
- configure.pre_args-append CONFIG+="${qt_arch_types}"
+ # move odd cmake directory into the cmake module's directory
- # set build type
- set build_type "release"
- if {[variant_isset debug]} {
- set build_type "debug_and_release build_all"
- }
- configure.pre_args-append CONFIG+=\"${build_type}\"
-}
-
-# set up to use the installed QMake files
-configure.cmd ${qt_qmake_cmd}
-configure.pre_args \
- CONFIG+="phonon phonon-backend" \
- PHONON_MAJOR_VERSION=${PHONON_MAJOR_VERSION} \
- PHONON_MINOR_VERSION=${PHONON_MINOR_VERSION} \
- PHONON_PATCH_VERSION=${PHONON_PATCH_VERSION} \
- WORKSRCPATH=${worksrcpath} \
- LOCAL_BUILD_TREE=${PHONON_BUILD_DIR}
-configure.args "-o Makefile phonon.pro"
-configure.universal_args
-
-# allow ccache, if specified by the user
-pre-build {
- if {[tbool configure.ccache]} {
- build.post_args "CCACHE=ccache"
- }
-}
-
-# Install cmake files (taken from port 'kdelibs4'). To use this file,
-# include '-DCMAKE_MODULE_PATH=...' in configure.args during the
-# initial 'configure' stage (which uses CMake), to the full path of
-# where the CMake files are installed.
-post-destroot {
xinstall -m 755 -d ${destroot}${qt_cmake_module_dir}
- xinstall -m 644 -W ${filespath} \
- FindPhonon.cmake \
+ move ${destroot}${prefix}/lib/cmake/phonon \
${destroot}${qt_cmake_module_dir}
-}
-universal_variant yes
+ # install 'phonon' header from Qt into include/phonon/.
-variant debug description "Build release and debug versions" {}
+ xinstall -m 644 ${filespath}/phonon ${destroot}${prefix}/include/phonon
+}
+
livecheck.type regex
livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/${name}/
livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
Copied: trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff (from rev 93817, branches/mld-qt-481/dports/audio/phonon/files/patch-CMakeLists.txt.diff)
===================================================================
--- trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2012-05-31 21:31:49.000000000 -0400
++++ CMakeLists.txt 2012-05-31 21:31:52.000000000 -0400
+@@ -38,7 +38,7 @@
+ set(PHONON_LIB_MINOR_VERSION "6") # Only change on binary compatible changes with new interfaces
+ set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P
+ set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}")
+-set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION})
++set(PHONON_LIB_SOVERSION "${PHONON_LIB_MAJOR_VERSION}.4.0")
+
+ add_definitions(${QT_DEFINITIONS})
+ remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT)
Property changes on: trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/dports/devel/qtscriptgenerator/Portfile
===================================================================
--- trunk/dports/devel/qtscriptgenerator/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/devel/qtscriptgenerator/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -5,8 +5,7 @@
PortGroup qt4 1.0
name qtscriptgenerator
-version 0.1.0
-revision 4
+version 0.2.0
categories devel kde4
maintainers michaelld openmaintainer
description QtScript bindings generator.
@@ -17,15 +16,17 @@
homepage http://labs.trolltech.com/page/Projects/QtScript/Generator
distname ${name}-src-${version}
master_sites http://qtscriptgenerator.googlecode.com/files/
-checksums md5 ca4046ad4bda36cd4e21649d4b98886d \
- sha1 eeae733106369e289f257b754822bc372fd6ba75 \
- rmd160 a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3
+checksums md5 9f82b0aa212f7938de37df46cd27165c \
+ sha1 4c1078f26b196156e857c17c9d11a66cfea66f00 \
+ rmd160 01c8ce3b4c8e9ebb3bc3c2d7b319846f34baee04
depends_build-append port:automoc
depends_lib-append port:phonon
patchfiles patch-generator.diff \
- patch-qtbindings.diff
+ patch-qtbindings.diff \
+ patch-generator_typesystem_phonon-qtscript.xml.diff \
+ patch-generator_typesystem_phonon.xml.diff
# check for +debug variant of this port, and make sure phonon was
# installed with +debug as well; if not, error out. phonon checks to
@@ -76,6 +77,9 @@
}
}
-universal_variant yes
+variant debug description "Build release and debug versions" {}
-variant debug description "Build release and debug versions" {}
+# need to check this to make sure it works
+livecheck.type regex
+livecheck.url http://code.google.com/p/qtscriptgenerator/source/browse
+livecheck.regex {>release\.r([0-9.]+)<}
Copied: trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon-qtscript.xml.diff (from rev 93771, branches/mld-qt-481/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon-qtscript.xml.diff)
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon-qtscript.xml.diff (rev 0)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon-qtscript.xml.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- generator/typesystem_phonon-qtscript.xml.orig 2012-05-30 15:18:35.000000000 -0400
++++ generator/typesystem_phonon-qtscript.xml 2012-05-30 15:38:56.000000000 -0400
+@@ -48,6 +48,8 @@
+
+ <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin">
+ <modify-function signature="deviceAccessListFor(Phonon::AudioOutputDevice)const" remove="all" />
++ <modify-function signature="deviceAccessListFor(Phonon::AudioCaptureDevice)const" remove="all" />
++ <modify-function signature="deviceAccessListFor(Phonon::VideoCaptureDevice)const" remove="all" />
+ </interface-type>
+
+ <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an enum" />
Copied: trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon.xml.diff (from rev 93771, branches/mld-qt-481/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon.xml.diff)
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon.xml.diff (rev 0)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-generator_typesystem_phonon.xml.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,11 @@
+--- generator/typesystem_phonon.xml.orig 2012-05-30 15:18:43.000000000 -0400
++++ generator/typesystem_phonon.xml 2012-05-30 15:39:41.000000000 -0400
+@@ -57,6 +57,8 @@
+ <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject"/>
+ <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin">
+ <modify-function signature="deviceAccessListFor(Phonon::AudioOutputDevice)const" remove="all"/>
++ <modify-function signature="deviceAccessListFor(Phonon::AudioCaptureDevice)const" remove="all"/>
++ <modify-function signature="deviceAccessListFor(Phonon::VideoCaptureDevice)const" remove="all"/>
+ </interface-type>
+ <interface-type name="Phonon::StreamInterface" java-name="AbstractStream"/>
+ <interface-type name="Phonon::VideoWidgetInterface" java-name="AbstractVideoWidget"/>
Modified: trunk/dports/graphics/qwtplot3d/Portfile
===================================================================
--- trunk/dports/graphics/qwtplot3d/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/graphics/qwtplot3d/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -5,7 +5,7 @@
name qwtplot3d
version 0.2.7
-revision 3
+revision 4
categories graphics science
platforms darwin
maintainers michaelld openmaintainer
@@ -24,7 +24,8 @@
rmd160 0f28462cb95ef6091d73642c8b26ece60d50bfb8
platforms darwin
-patchfiles patch-qwtplot3d.pro.diff
+patchfiles patch-qwtplot3d.pro.diff \
+ patch-include_qwt3d_openglhelper.h.diff
# use any QWT version, but default to 5.2
depends_lib-append path:lib/libqwt.dylib:qwt52
Copied: trunk/dports/graphics/qwtplot3d/files/patch-include_qwt3d_openglhelper.h.diff (from rev 93772, branches/mld-qt-481/dports/graphics/qwtplot3d/files/patch-include_qwt3d_openglhelper.h.diff)
===================================================================
--- trunk/dports/graphics/qwtplot3d/files/patch-include_qwt3d_openglhelper.h.diff (rev 0)
+++ trunk/dports/graphics/qwtplot3d/files/patch-include_qwt3d_openglhelper.h.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -0,0 +1,10 @@
+--- include/qwt3d_openglhelper.h.orig 2012-05-29 15:07:16.000000000 -0400
++++ include/qwt3d_openglhelper.h 2012-05-29 15:08:16.000000000 -0400
+@@ -5,6 +5,7 @@
+ #if QT_VERSION < 0x040000
+ #include <qgl.h>
+ #else
++#include <OpenGL/glu.h>
+ #include <QtOpenGL/qgl.h>
+ #endif
+
Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/net/avahi/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -68,6 +68,24 @@
# __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
configure.cppflags-append -L${prefix}/lib -D__APPLE_USE_RFC_2292
+post-destroot {
+ xinstall -d -m 0755 ${destroot}${prefix}/etc/LaunchDaemons
+ eval move [glob ${destroot}/Library/LaunchDaemons/*] \
+ ${destroot}${prefix}/etc/LaunchDaemons/
+ # The startupitem.install keyword does not exist in MacPorts < 2.1.
+ if {![info exists startupitem.install]} {
+ set startupitem.install yes
+ }
+ if { ${startupitem.install} != "no" } {
+ xinstall -d -m 0755 ${destroot}/LaunchDaemons
+ ln -s ${prefix}/etc/LaunchDaemons/org.freedesktop.avahi-daemon.plist \
+ ${destroot}/Library/LaunchDaemons/
+ ln -s ${prefix}/etc/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist \
+ ${destroot}/Library/LaunchDaemons/
+
+ }
+}
+
pre-activate {
addgroup avahi
adduser avahi gid=[existsgroup avahi] realname=Avahi Service
Modified: trunk/dports/science/stellarium/Portfile
===================================================================
--- trunk/dports/science/stellarium/Portfile 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/science/stellarium/Portfile 2012-06-13 02:36:06 UTC (rev 94241)
@@ -1,11 +1,11 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
+# -*- 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
# $Id$
PortSystem 1.0
PortGroup qt4 1.0
name stellarium
-version 0.11.2
+version 0.11.3
categories science
platforms darwin
maintainers raimue \
@@ -20,8 +20,8 @@
homepage http://stellarium.org/
master_sites sourceforge
-checksums rmd160 b36bb6d709c4c67e1483630523b8c423622eea20 \
- sha256 85a413ec8aff8774952c32ff6fbf61ba7f1d1d38a224ff51c65750f5803662e2
+checksums rmd160 3596f191da0c76c12d1a1ff31294e1c36675e483 \
+ sha256 f7c7eeaefcdc54c0fb8766f09e0c838acb742719adcdf12a6c1e12d55ecd6ac3
depends_build-append port:cmake
depends_lib-append \
Modified: trunk/dports/www/fcgi/files/patch-configure.in.diff
===================================================================
--- trunk/dports/www/fcgi/files/patch-configure.in.diff 2012-06-13 02:19:23 UTC (rev 94240)
+++ trunk/dports/www/fcgi/files/patch-configure.in.diff 2012-06-13 02:36:06 UTC (rev 94241)
@@ -7,7 +7,7 @@
-AC_INIT
-AM_INIT_AUTOMAKE(fcgi, 2.4.0)
+AC_INIT([fcgi],[2.4.0])
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall foreign])
AM_CONFIG_HEADER(fcgi_config.h)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120612/c4c8c4b3/attachment-0001.html>
More information about the macports-changes
mailing list