[107841] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Sat Jul 6 19:09:09 PDT 2013
Revision: 107841
https://trac.macports.org/changeset/107841
Author: michaelld at macports.org
Date: 2013-07-06 19:09:09 -0700 (Sat, 06 Jul 2013)
Log Message:
-----------
qt4-mac: update to 4.8.5.
Modified Paths:
--------------
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-configure.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2013-07-07 00:21:46 UTC (rev 107840)
+++ trunk/dports/aqua/qt4-mac/Portfile 2013-07-07 02:09:09 UTC (rev 107841)
@@ -15,8 +15,8 @@
# so this port cannot conflict with it.
#conflicts qt3 qt3-mac qt4-mac-devel
conflicts qt3 qt3-mac
-version 4.8.4
-revision 6
+version 4.8.5
+set version_to_minor [join [lrange [split ${version} "."] 0 1] "."]
categories aqua
platforms macosx
@@ -29,11 +29,11 @@
(headers, data, and libraries) for writing \
cross-platform GUI-based applications.
-master_sites trolltech
+master_sites http://download.qt-project.org/official_releases/qt/${version_to_minor}/${version}/
distname qt-everywhere-opensource-src-${version}
-checksums sha1 f5880f11c139d7d8d01ecb8d874535f7d9553198 \
- rmd160 3c09a3b1411385d0917225f01ac2ff3a2ce83fda
+checksums sha1 745f9ebf091696c0d5403ce691dc28c039d77b9e \
+ rmd160 1e7bb099d5d1cda0b663cebe207c846c8d04750d
minimum_xcodeversions {8 2.5}
@@ -155,7 +155,7 @@
# (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
+# 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
@@ -239,11 +239,6 @@
patchfiles-append \
patch-tools_macdeployqt_shared_shared.cpp.diff
-# (25) fix spurious global struct declariation
-
-patchfiles-append \
- patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
-
###############################################
# disable CCACHE for now (ticket #34856)
@@ -1049,15 +1044,6 @@
depends_lib-append port:mesa
- post-patch {
-
- # fix variable name in 'configure' for OpenVG
-
- reinplace "s at CONFIG_ARG@QMAKE_OPENVG_ARG at g" \
- ${worksrcpath}/configure
-
- }
-
pre-configure {
# set OpenVG arg, for both testing and building
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 2013-07-07 00:21:46 UTC (rev 107840)
+++ trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff 2013-07-07 02:09:09 UTC (rev 107841)
@@ -1,6 +1,6 @@
---- config.tests/unix/compile.test.orig 2012-11-23 05:11:21.000000000 -0500
-+++ config.tests/unix/compile.test 2012-11-29 12:02:46.000000000 -0500
-@@ -69,7 +69,7 @@
+--- config.tests/unix/compile.test.orig 2013-07-06 14:39:26.000000000 -0400
++++ config.tests/unix/compile.test 2013-07-06 14:39:44.000000000 -0400
+@@ -73,7 +73,7 @@
rm -f "$EXE" "${EXE}.exe"
echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
Modified: trunk/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2013-07-07 00:21:46 UTC (rev 107840)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2013-07-07 02:09:09 UTC (rev 107841)
@@ -1,6 +1,6 @@
---- configure.orig 2013-02-10 21:03:10.000000000 -0500
-+++ configure 2013-02-10 21:22:49.000000000 -0500
-@@ -918,12 +918,14 @@
+--- configure.orig 2013-07-06 19:48:02.000000000 -0400
++++ configure 2013-07-06 19:51:14.000000000 -0400
+@@ -924,12 +924,14 @@
CFG_ICU=auto
CFG_SYSTEM_PROXIES=no
CFG_SLOG2=auto
@@ -15,7 +15,7 @@
QT_INSTALL_BINS=
QT_INSTALL_PLUGINS=
QT_INSTALL_IMPORTS=
-@@ -1137,7 +1139,7 @@
+@@ -1143,7 +1145,7 @@
VAL=no
;;
#Qt style yes options
@@ -24,7 +24,7 @@
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
-@@ -1392,6 +1394,9 @@
+@@ -1398,6 +1400,9 @@
libdir)
QT_INSTALL_LIBS="$VAL"
;;
@@ -34,7 +34,7 @@
qtnamespace)
QT_NAMESPACE="$VAL"
;;
-@@ -2509,6 +2514,13 @@
+@@ -2515,6 +2520,13 @@
UNKNOWN_OPT=yes
fi
;;
@@ -48,7 +48,7 @@
system-proxies)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_SYSTEM_PROXIES="$VAL"
-@@ -3451,6 +3463,53 @@
+@@ -3450,6 +3462,53 @@
CFG_MAC_XARCH=no
fi
@@ -101,8 +101,8 @@
+
#auto-detect DWARF2 on the mac
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
- if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
-@@ -3460,15 +3519,6 @@
+ if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
+@@ -3459,15 +3518,6 @@
fi
fi
@@ -118,7 +118,7 @@
# don't autodetect support for separate debug info on objcopy when
# cross-compiling as lots of toolchains seems to have problems with this
if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
-@@ -3685,6 +3735,19 @@
+@@ -3694,6 +3744,19 @@
fi
QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
@@ -138,7 +138,7 @@
#bins
if [ -z "$QT_INSTALL_BINS" ]; then #default
if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-@@ -4752,6 +4815,7 @@
+@@ -4761,6 +4824,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"`
@@ -146,7 +146,7 @@
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"`
-@@ -4777,6 +4841,7 @@
+@@ -4786,6 +4850,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"`
@@ -154,7 +154,7 @@
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"`
-@@ -4794,6 +4859,7 @@
+@@ -4803,6 +4868,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";
@@ -162,7 +162,7 @@
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";
-@@ -4812,6 +4878,7 @@
+@@ -4821,6 +4887,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";
@@ -170,7 +170,7 @@
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";
-@@ -4837,6 +4904,7 @@
+@@ -4846,6 +4913,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;
@@ -178,7 +178,7 @@
#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;
-@@ -4996,20 +5064,11 @@
+@@ -5005,20 +5073,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\""
@@ -204,8 +204,26 @@
if [ '!' -z "$CFG_SDK" ]; then
echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -7161,16 +7220,8 @@
+@@ -6957,7 +7016,7 @@
+ # detect OpenVG support
+ if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+- if compileTest "unix/openvg" "OpenVG"; then
++ if compileTest "unix/openvg" "OpenVG" $QMAKE_OPENVG_ARG; then
+ if [ "$CFG_OPENVG" = "auto" ]; then
+ CFG_OPENVG=yes
+ fi
+@@ -6988,7 +7047,7 @@
+ CFG_OPENVG=no
+ fi
+ fi
+- if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $CONFIG_ARG; then
++ if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $QMAKE_OPENVG_ARG; then
+ CFG_OPENVG_SHIVA=yes
+ fi
+ fi
+@@ -7179,16 +7238,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
@@ -223,7 +241,7 @@
# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
case "$XPLATFORM" in
-@@ -7447,6 +7498,10 @@
+@@ -7467,6 +7518,10 @@
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
fi
@@ -234,7 +252,7 @@
if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
#On Mac we implicitly link against libz, so we
-@@ -7910,28 +7965,32 @@
+@@ -7930,28 +7985,32 @@
# env. variable.
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
@@ -283,7 +301,7 @@
fi
fi
-@@ -8689,6 +8748,7 @@
+@@ -8709,6 +8768,7 @@
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
@@ -291,7 +309,7 @@
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
EOF
-@@ -8727,6 +8787,11 @@
+@@ -8747,6 +8807,11 @@
echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
fi
@@ -303,7 +321,7 @@
#dump in the OPENSSL_LIBS info
if [ '!' -z "$OPENSSL_LIBS" ]; then
echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
-@@ -8886,6 +8951,7 @@
+@@ -8906,6 +8971,7 @@
else
echo "Debug .................. $CFG_DEBUG"
fi
Modified: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff 2013-07-07 00:21:46 UTC (rev 107840)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff 2013-07-07 02:09:09 UTC (rev 107841)
@@ -1,6 +1,6 @@
---- 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 @@
+--- mkspecs/features/qt.prf.orig 2013-07-06 14:28:19.000000000 -0400
++++ mkspecs/features/qt.prf 2013-07-06 14:28:33.000000000 -0400
+@@ -145,7 +145,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
@@ -16,7 +16,7 @@
unset(qlib_style)
!qt_debug:!qt_release {
CONFIG(debug, debug|release):qlib_style = debug
-@@ -197,8 +205,43 @@
+@@ -206,8 +214,43 @@
qtAddLibrary($$qlib)
}
}
Deleted: trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff 2013-07-07 00:21:46 UTC (rev 107840)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff 2013-07-07 02:09:09 UTC (rev 107841)
@@ -1,11 +0,0 @@
---- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig 2013-02-01 11:18:44.000000000 -0500
-+++ src/gui/kernel/qt_cocoa_helpers_mac_p.h 2013-02-01 11:19:03.000000000 -0500
-@@ -155,7 +155,7 @@
- void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
- bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
- inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
--struct ::TabletProximityRec;
-+// struct ::TabletProximityRec;
- void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
- Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
- Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130706/d7ae9f24/attachment.html>
More information about the macports-changes
mailing list