[108402] trunk/dports/aqua/qt4-mac

Mon Jul 22 12:12:19 PDT 2013

Revision: 108402
          https://trac.macports.org/changeset/108402
Author:   michaelld at macports.org
Date:     2013-07-22 12:12:19 -0700 (Mon, 22 Jul 2013)
Log Message:
-----------
qt4-mac:
* "version_to_minor" -> "branch" per Portfile standards;
* remove incorporated and no-longer-used patch and tweak Portfile accordingly;
* no rev-bump needed.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Removed Paths:
-------------
    trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================

--- trunk/dports/aqua/qt4-mac/Portfile	2013-07-22 19:10:44 UTC (rev 108401)
+++ trunk/dports/aqua/qt4-mac/Portfile	2013-07-22 19:12:19 UTC (rev 108402)
@@ -16,7 +16,7 @@
 #conflicts           qt3 qt3-mac qt4-mac-devel
 conflicts           qt3 qt3-mac
 version             4.8.5
-set version_to_minor [join [lrange [split ${version} "."] 0 1] "."]
+set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          aqua
 platforms           macosx
@@ -29,7 +29,7 @@
                     (headers, data, and libraries) for writing \
                     cross-platform GUI-based applications.
 
-master_sites        http://download.qt-project.org/official_releases/qt/${version_to_minor}/${version}/
+master_sites        http://download.qt-project.org/official_releases/qt/${branch}/${version}/
 distname            qt-everywhere-opensource-src-${version}
 
 checksums           sha1    745f9ebf091696c0d5403ce691dc28c039d77b9e \
@@ -152,41 +152,36 @@
     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
+# (12) fix use of CARBON, found on PPC64; 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; fix WebCore to handle
+# (13) fix MKSPECS install location for WebKit; fix WebCore to handle
 # 32-bit compiling correctly on x86 and ppc
 
 patchfiles-append   \
     patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
 
-# (15) fix the corewlan qmake file to use non-standard Developer SDK
+# (14) 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
 
-# (16) fix the corewlan source to work under 10.7
+# (15) fix the corewlan source to work under 10.7
 
 patchfiles-append   patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
 
-# (17) Use the "target.path" for libdir for core libraries instead of
+# (16) 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.
 
 patchfiles-append   patch-src_qbase.pri.diff
 
-# (18) (a) Disable explicit disabling of framework or static install;
+# (17) (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
@@ -204,13 +199,13 @@
     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
+# (18) 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"
+# (19) 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.
 
@@ -218,23 +213,23 @@
     patchfiles-append patch-QtHelp_10.4_only.diff
 }
 
-# (21) fix the Mac timer's use of "mach_timebase_info"
+# (20) fix the Mac timer's use of "mach_timebase_info"
 
 patchfiles-append   \
     patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
 
-# (22) fix WebCore to handle 32-bit compiling correctly on x86 and ppc
+# (21) fix WebCore to handle 32-bit compiling correctly on x86 and ppc
 
 patchfiles-append   \
     patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
 
-# (23) Under 10.8 only: Patch to fix corelib linking
+# (22) Under 10.8 only: Patch to fix corelib linking
 
 platform darwin 12 {
     patchfiles-append patch-src_corelib_corelib.pro.diff
 }
 
-# (24) fix Framework directory in MacDeployQt tool
+# (23) fix Framework directory in MacDeployQt tool
 
 patchfiles-append   \
     patch-tools_macdeployqt_shared_shared.cpp.diff
@@ -1081,6 +1076,10 @@
 
 }
 
+post-activate {
+    ui_msg "NOTE: Qt database plugins for mysql55, postgresql91, and sqlite2 are NOT installed by this port\; they are installed by qt4-mac-*-plugin instead."
+}
+
 #variant quartz conflicts x11
 #variant quartz \
 #description {Build for Native OSX Quartz GUI, not X11 (default)} {}

Deleted: 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_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff	2013-07-22 19:10:44 UTC (rev 108401)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff	2013-07-22 19:12:19 UTC (rev 108402)
@@ -1,12 +0,0 @@
---- 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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130722/af0e95b6/attachment.html>
