<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/55e37c2396449ba3c69c62ac96540710605a0a65">https://github.com/macports/macports-ports/commit/55e37c2396449ba3c69c62ac96540710605a0a65</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 55e37c23964 kde-extra-cmake-modules: make applications_dir patch more general
</span>55e37c23964 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 55e37c2396449ba3c69c62ac96540710605a0a65
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Jan 26 20:20:00 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> kde-extra-cmake-modules: make applications_dir patch more general
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64529
</span>---
kde/kde-extra-cmake-modules/Portfile | 4 ++++
kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/Portfile b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e478d3cb2e..0b2eb635085 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,10 @@ if {${subport} eq "${name}-devel"} {
</span>
patch.pre_args -Np1
patchfiles-append patch-BUNDLEDIR.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${worksrcpath}/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
supported_archs noarch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a94fd179d4b..e30fc7665d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>
``BUNDLEDIR``
- application bundles (``/Applications/KDE``) [``BUNDLE_INSTALL_DIR``]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ application bundles (``/Applications/MacPorts/KF5``) [``BUNDLE_INSTALL_DIR``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ application bundles (``/@APPLICATIONSDIR@/KF5``) [``BUNDLE_INSTALL_DIR``]
</span> ``EXECROOTDIR``
executables and libraries (``<empty>``) [``EXEC_INSTALL_PREFIX``]
``BINDIR``
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span>
if(APPLE)
- _define_absolute(BUNDLEDIR "/Applications/KDE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _define_absolute(BUNDLEDIR "/Applications/MacPorts/KF5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _define_absolute(BUNDLEDIR "/@APPLICATIONSDIR@/KF5"
</span> "application bundles"
BUNDLE_INSTALL_DIR)
endif()
</pre><pre style='margin:0'>
</pre>