<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/38b7f19120fbd71992991213a752105c479651b1">https://github.com/macports/macports-ports/commit/38b7f19120fbd71992991213a752105c479651b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38b7f19120fbd71992991213a752105c479651b1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Apr 4 15:15:44 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: ensure patch files apply cleanly
</span>---
aqua/qt5/files/patch-pc_files.diff | 2 +-
...-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff | 6 +++---
aqua/qt5/files/patch-qt515-highsierra1.diff | 2 +-
aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff | 2 +-
aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a055242615e..204cd588048 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
+++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3396,7 +3396,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3392,7 +3392,7 @@
</span> t << "-I${includedir}";
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
&& libDir != QLatin1String("/Library/Frameworks")) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff b/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b75fb72a7cf..ce741555cbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ diff --git configure.json configure.json
</span> index 29afbac43d5..a9249e1ed29 100644
--- configure.json
+++ configure.json
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,11 +241,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -244,11 +244,18 @@
</span>
"testTypeDependencies": {
"linkerSupportsFlag": [ "use_bfd_linker", "use_gold_linker", "use_lld_linker" ],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ index 29afbac43d5..a9249e1ed29 100644
</span> },
"testTypeAliases": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -749,7 +756,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,7 +769,7 @@
</span> },
"architecture": {
"label": "Architecture",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ diff --git configure.pri configure.pri
</span> index a04aa172366..f55b7cb448d 100644
--- configure.pri
+++ configure.pri
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -660,6 +660,13 @@ defineTest(qtConfOutput_commitOptions) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -662,6 +662,13 @@ defineTest(qtConfOutput_commitOptions) {
</span> write_file($$QT_BUILD_TREE/mkspecs/qdevice.pri, $${currentConfig}.output.devicePro)|error()
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qt515-highsierra1.diff b/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ad59a3dedb..efda7a0b8eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,4 +20,4 @@
</span> +#endif
if (poolFrame) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Dl_info info;
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dl_info info;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 75512a21da4..62ee92149ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/multimedia/configure.json.orig 2017-06-22 23:32:22.000000000 -0700
+++ src/multimedia/configure.json 2017-08-28 05:37:24.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@
</span> "label": "OpenAL",
"test": "openal",
"sources": [
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff b/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dcc76d0343f..a2d54b86bcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/3rdparty/chromium/base/process/process_metrics_mac.cc.orig 2020-09-09 18:35:17.000000000 -0600
+++ src/3rdparty/chromium/base/process/process_metrics_mac.cc 2020-09-09 18:35:49.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,7 +232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@
</span> }
DCHECK_EQ(HOST_VM_INFO64_COUNT, count);
</pre><pre style='margin:0'>
</pre>