<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5f370dc1ef64b780b8b7e1f1eb9c00568114214e">https://github.com/macports/macports-ports/commit/5f370dc1ef64b780b8b7e1f1eb9c00568114214e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5f370dc1ef64b780b8b7e1f1eb9c00568114214e
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 05:11:59 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: consolidate patches for files in mkspecs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since resultant build is the same.
</span>---
aqua/qt5/Portfile | 25 ++++++++++++++---------
aqua/qt5/files/patch-macx.conf.diff | 10 ----------
aqua/qt5/files/patch-mkspecs.diff | 27 +++++++++++++++++++++++--
aqua/qt5/files/patch-mkspecs_compiler.diff | 13 ------------
aqua/qt55/Portfile | 25 ++++++++++++++---------
aqua/qt55/files/patch-macx.conf.diff | 10 ----------
aqua/qt55/files/patch-mkspecs.diff | 31 +++++++++++++++++++++++++----
aqua/qt55/files/patch-mkspecs_compiler.diff | 13 ------------
aqua/qt56/Portfile | 25 ++++++++++++++---------
aqua/qt56/files/patch-macx.conf.diff | 10 ----------
aqua/qt56/files/patch-mkspecs.diff | 27 +++++++++++++++++++++++--
aqua/qt56/files/patch-mkspecs_compiler.diff | 13 ------------
aqua/qt57/Portfile | 25 ++++++++++++++---------
aqua/qt57/files/patch-macx.conf.diff | 10 ----------
aqua/qt57/files/patch-mkspecs.diff | 27 +++++++++++++++++++++++--
aqua/qt57/files/patch-mkspecs_compiler.diff | 13 ------------
16 files changed, 166 insertions(+), 138 deletions(-)
<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 076f4ec..2c7832c 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;'>@@ -764,11 +764,23 @@ foreach {module module_info} [array get modules] {
</span> copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use compiler specified by configure.compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} ne "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect MacPorts build variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mkspecs.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> post-patch {
reinplace \
"s|__MACPORTS_CC__|${configure.cc}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -793,10 +805,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${cxx_stdlib} eq "libc++"} {
set replace_cxx_stdlib ${cxx_stdlib}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -807,9 +816,8 @@ foreach {module module_info} [array get modules] {
</span> set replace_cxx_stdlib "macports-libstdc++"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -830,7 +838,6 @@ foreach {module module_info} [array get modules] {
</span> }
# respect configure.sdk_version value
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macx.conf.diff
</span> post-patch {
reinplace \
"s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-macx.conf.diff b/aqua/qt5/files/patch-macx.conf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 431fff4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(mac.conf)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs.diff b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6696d4c..52000af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,6 @@
</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;background:#e0ffe0;'>+ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(mac.conf)
</span> --- mkspecs/macx-clang/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2016-12-24 08:54:33.000000000 -0700
@@ -7,6 +7,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +123,6 @@
</span>
-QMAKE_CXXFLAGS += -stdlib=libc++
-QMAKE_LFLAGS += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span> QMAKE_AR_LTCG = libtool -static -o
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs_compiler.diff b/aqua/qt5/files/patch-mkspecs_compiler.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6a99ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b81a468..dc3d891 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -682,11 +682,23 @@ foreach {module module_info} [array get modules] {
</span> copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use compiler specified by configure.compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} ne "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect MacPorts build variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mkspecs.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> post-patch {
reinplace \
"s|__MACPORTS_CC__|${configure.cc}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -711,10 +723,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${cxx_stdlib} eq "libc++"} {
set replace_cxx_stdlib ${cxx_stdlib}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,9 +734,8 @@ foreach {module module_info} [array get modules] {
</span> set replace_cxx_stdlib "macports-libstdc++"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -748,7 +756,6 @@ foreach {module module_info} [array get modules] {
</span> }
# respect configure.sdk_version value
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macx.conf.diff
</span> post-patch {
reinplace \
"s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-macx.conf.diff b/aqua/qt55/files/patch-macx.conf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 51a203d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_PLATFORM += osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(mac.conf)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-mkspecs.diff b/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eabe00c..920ea7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,6 @@
</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;background:#e0ffe0;'>+ QMAKE_PLATFORM += osx macx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(mac.conf)
</span> --- mkspecs/macx-clang/qmake.conf.orig 2015-10-12 21:35:32.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2016-11-12 07:33:45.000000000 -0700
@@ -11,6 +11,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +123,7 @@
</span>
-QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++
-QMAKE_LFLAGS_CXX11 += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS_CXX11 += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS_CXX11 += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS_CXX11 += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS_CXX11 += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-mkspecs_compiler.diff b/aqua/qt55/files/patch-mkspecs_compiler.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6a99ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</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 cbde076..951c90f 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;'>@@ -708,11 +708,23 @@ foreach {module module_info} [array get modules] {
</span> copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use compiler specified by configure.compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} ne "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect MacPorts build variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mkspecs.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> post-patch {
reinplace \
"s|__MACPORTS_CC__|${configure.cc}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -737,10 +749,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${cxx_stdlib} eq "libc++"} {
set replace_cxx_stdlib ${cxx_stdlib}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -751,9 +760,8 @@ foreach {module module_info} [array get modules] {
</span> set replace_cxx_stdlib "macports-libstdc++"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,7 +782,6 @@ foreach {module module_info} [array get modules] {
</span> }
# respect configure.sdk_version value
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macx.conf.diff
</span> post-patch {
reinplace \
"s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-macx.conf.diff b/aqua/qt56/files/patch-macx.conf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 431fff4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(mac.conf)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-mkspecs.diff b/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31fa02b..808dd09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,6 @@
</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;background:#e0ffe0;'>+ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(mac.conf)
</span> --- mkspecs/macx-clang/qmake.conf.orig 2016-10-31 19:10:55.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2016-10-31 19:12:23.000000000 -0700
@@ -11,6 +11,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,5 +123,5 @@
</span>
-QMAKE_CXXFLAGS += -stdlib=libc++
-QMAKE_LFLAGS += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-mkspecs_compiler.diff b/aqua/qt56/files/patch-mkspecs_compiler.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6a99ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ceba288..71fcd07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,11 +759,23 @@ foreach {module module_info} [array get modules] {
</span> copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use compiler specified by configure.compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} ne "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect MacPorts build variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mkspecs.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> post-patch {
reinplace \
"s|__MACPORTS_CC__|${configure.cc}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -788,10 +800,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${cxx_stdlib} eq "libc++"} {
set replace_cxx_stdlib ${cxx_stdlib}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -802,9 +811,8 @@ foreach {module module_info} [array get modules] {
</span> set replace_cxx_stdlib "macports-libstdc++"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -825,7 +833,6 @@ foreach {module module_info} [array get modules] {
</span> }
# respect configure.sdk_version value
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macx.conf.diff
</span> post-patch {
reinplace \
"s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-macx.conf.diff b/aqua/qt57/files/patch-macx.conf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 431fff4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(mac.conf)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-mkspecs.diff b/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 35258b4..4c4aea8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,6 @@
</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;background:#e0ffe0;'>+ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(mac.conf)
</span> --- mkspecs/macx-clang/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2016-12-24 08:54:33.000000000 -0700
@@ -11,6 +11,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,5 +123,5 @@
</span>
-QMAKE_CXXFLAGS += -stdlib=libc++
-QMAKE_LFLAGS += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-mkspecs_compiler.diff b/aqua/qt57/files/patch-mkspecs_compiler.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6a99ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-mkspecs_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span></pre><pre style='margin:0'>
</pre>