<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c1ed536cadfa66a1c197fc1ccd7635e050712a9">https://github.com/macports/macports-ports/commit/5c1ed536cadfa66a1c197fc1ccd7635e050712a9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c1ed536cadfa66a1c197fc1ccd7635e050712a9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 6 08:36:13 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtmultimedia: apply patchfile to OS X 10.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Qt uses firstObject in NSArray's interface.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53949
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54066
</span>---
aqua/qt5/Portfile | 9 +++++++++
aqua/qt5/files/patch-firstObject.diff | 16 ++++++++++++++++
aqua/qt56/Portfile | 2 +-
3 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ff6969..74fb841 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1276,6 +1276,15 @@ foreach {module module_info} [array get modules] {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtmultimedia" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-firstObject.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-firstObject.diff b/aqua/qt5/files/patch-firstObject.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b059ce0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-firstObject.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/avfoundation/camera/avfcamerautility.mm.orig 2016-09-12 03:58:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/avfoundation/camera/avfcamerautility.mm 2016-12-28 09:44:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,6 +48,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// see https://trac.macports.org/ticket/53949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// from the 10.9 SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface NSArray (MacPortsCompatibilityFirstObject)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (id)firstObject NS_AVAILABLE(10_6, 4_0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5dae16..10fd2f57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1239,7 +1239,7 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 13 } {
</span> # see https://trac.macports.org/ticket/52922
patchfiles-append patch-firstObject.diff
}
</pre><pre style='margin:0'>
</pre>