[127528] trunk/dports/aqua/qt5-mac
mcalhoun at macports.org
mcalhoun at macports.org
Tue Oct 28 21:25:13 PDT 2014
Revision: 127528
https://trac.macports.org/changeset/127528
Author: mcalhoun at macports.org
Date: 2014-10-28 21:25:13 -0700 (Tue, 28 Oct 2014)
Log Message:
-----------
* update version 5.3.1 -> 5.3.2
* macdeployqt should look for frameworks in the correct location (fixes #44934)
* add explicit cast to allow build on Yosemite (fixes #45298)
* add patch to allow build on 32-bit systems
* fix include directories in .pc files (fixes #44204)
Modified Paths:
--------------
trunk/dports/aqua/qt5-mac/Portfile
Added Paths:
-----------
trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff
trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff
trunk/dports/aqua/qt5-mac/files/patch-shared.diff
Modified: trunk/dports/aqua/qt5-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt5-mac/Portfile 2014-10-29 03:02:47 UTC (rev 127527)
+++ trunk/dports/aqua/qt5-mac/Portfile 2014-10-29 04:25:13 UTC (rev 127528)
@@ -4,7 +4,7 @@
PortSystem 1.0
name qt5-mac
-version 5.3.1
+version 5.3.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
@@ -22,8 +22,8 @@
master_sites http://download.qt-project.org/official_releases/qt/${branch}/${version}/single/
-checksums rmd160 4cf6af424fe84223c5d9570848b4e21e251c5cdf \
- sha256 ba898625ba525d90a54739d2e33e4701d0bcd22d45663737b8123cd9b17b35a1
+checksums rmd160 5cd61acc2fbfba2597a386a09d83710ed2fdf483 \
+ sha256 c8d3fd2ead30705c6673c5e4af6c6f3973346b4fb2bd6079c7be0943a5b0282d
if { ${os.major} < 10 } {
pre-fetch {
@@ -115,6 +115,15 @@
# During testing, NSStringFromRect requires NSRect.
patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
+ # see #44934 (and #35067 for the qt4-mac version)
+ patchfiles-append patch-shared.diff
+
+ # see https://bugreports.qt-project.org/browse/QTBUG-41136
+ patchfiles-append patch-avfmediaplayersession.diff
+
+ # see https://bugreports.qt-project.org/browse/QTBUG-41367
+ patchfiles-append patch-qmacstyle_mac.diff
+
# --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
@@ -288,6 +297,15 @@
}
post-destroot {
+
+ # see #44204
+ foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir}/pkgconfig *.pc] {
+ set framework [file rootname [file tail ${f}]]
+ set incname [string map {Qt5 Qt} ${framework}]
+ reinplace "s|-I\${includedir}/${incname}|-I\${includedir}|g" ${f}
+ reinplace "s|includedir=\${prefix}/include|includedir=\${libdir}/${framework}/Headers|g" ${f}
+ }
+
# move items out of the Frameworks directory that are more appropriate to lib directory
xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}
foreach d [glob -tails -nocomplain -directory ${destroot}${qt_frameworks_dir}/cmake *] {
Added: trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff
===================================================================
--- trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff 2014-10-29 04:25:13 UTC (rev 127528)
@@ -0,0 +1,11 @@
+--- qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm.orig 2014-10-26 12:44:28.000000000 -0700
++++ qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm 2014-10-26 12:46:11.000000000 -0700
+@@ -295,7 +295,7 @@
+ //AVPlayerItem "status" property value observer.
+ if (context == AVFMediaPlayerSessionObserverStatusObservationContext)
+ {
+- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
++ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue];
+ switch (status)
+ {
+ //Indicates that the status of the player is not yet known because
Added: trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff
===================================================================
--- trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff 2014-10-29 04:25:13 UTC (rev 127528)
@@ -0,0 +1,14 @@
+--- .//qtbase/src/widgets/styles/qmacstyle_mac.mm.orig 2014-09-11 03:48:01.000000000 -0700
++++ .//qtbase/src/widgets/styles/qmacstyle_mac.mm 2014-10-28 19:28:34.000000000 -0700
+@@ -3667,9 +3667,9 @@
+
+ NSBezierPath *pushButtonFocusRingPath;
+ if (bdi.kind == kThemeBevelButton)
+- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
++ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
+ else
+- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
++ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
+ qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
+ }
+
Added: trunk/dports/aqua/qt5-mac/files/patch-shared.diff
===================================================================
--- trunk/dports/aqua/qt5-mac/files/patch-shared.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-shared.diff 2014-10-29 04:25:13 UTC (rev 127528)
@@ -0,0 +1,11 @@
+--- .//qttools/src/macdeployqt/shared/shared.cpp.orig 2014-09-11 03:48:25.000000000 -0700
++++ .//qttools/src/macdeployqt/shared/shared.cpp 2014-10-26 11:14:49.000000000 -0700
+@@ -168,7 +168,7 @@
+ state = DylibName;
+ continue;
+ } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
+- info.installName += "/" + (qtPath + "lib/").simplified();
++ info.installName += "/" + (qtPath + "Frameworks/").simplified();
+ info.frameworkDirectory = info.installName;
+ state = FrameworkName;
+ continue;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141028/46c9b5bf/attachment-0001.html>
More information about the macports-changes
mailing list