<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e37905c6bfebb3a18b2f96ba77a314b02a29ee37">https://github.com/macports/macports-ports/commit/e37905c6bfebb3a18b2f96ba77a314b02a29ee37</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e37905c6bfe quassel: Fix arm64 build
</span>e37905c6bfe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e37905c6bfebb3a18b2f96ba77a314b02a29ee37
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Wed Feb 1 18:00:36 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> quassel: Fix arm64 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Drops the explicit `set(CMAKE_OSX_ARCHITECTURES "x86_64")` from
</span><span style='display:block; white-space:pre;color:#404040;'> Quassel's cmake configuration, which will otherwise take precedence over the
</span><span style='display:block; white-space:pre;color:#404040;'> `-DCMAKE_OSX_ARCHITECTURES=` command line argument populated by the
</span><span style='display:block; white-space:pre;color:#404040;'> cmake port group (... and break the build on non-x86_64 systems).
</span>---
irc/quassel/Portfile | 3 ++-
irc/quassel/files/patch-fix-cmake-osx-architectures.diff | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/quassel/Portfile b/irc/quassel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70bd603ccb8..f956ce7296f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/quassel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/quassel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,8 @@ compiler.cxx_standard \
</span> 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-dmg.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-dmg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-cmake-osx-architectures.diff
</span>
configure.args -DWANT_CORE=OFF \
-DWANT_QTCLIENT=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/quassel/files/patch-fix-cmake-osx-architectures.diff b/irc/quassel/files/patch-fix-cmake-osx-architectures.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7118b719785
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/quassel/files/patch-fix-cmake-osx-architectures.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/QuasselCompileSettings.cmake.orig 2023-02-01 17:44:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/QuasselCompileSettings.cmake 2023-02-01 17:44:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mac build stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_OSX_ARCHITECTURES "x86_64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_compile_options(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mmacosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -stdlib=libc++
</span></pre><pre style='margin:0'>
</pre>