<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/c1198fb7f8ca0a56490cf66b4eff2dfc0905280d">https://github.com/macports/macports-ports/commit/c1198fb7f8ca0a56490cf66b4eff2dfc0905280d</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 c1198fb7f8c kde-extra-cmake-modules-devel: add subport specific patch
</span>c1198fb7f8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c1198fb7f8ca0a56490cf66b4eff2dfc0905280d
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jan 27 07:37:44 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> kde-extra-cmake-modules-devel: add subport specific patch
</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 | 18 +++++++++++-------
.../files/patch-BUNDLEDIR-devel.diff | 20 ++++++++++++++++++++
2 files changed, 31 insertions(+), 7 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 0b2eb635085..0725ca478b1 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;'>@@ -8,7 +8,8 @@ name kde-${ECM}
</span> subport ${name}-devel {}
set kf5.branch 5.86
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "${name}-devel"} {
fetch.type git
git.url https://invent.kde.org/kde/extra-cmake-modules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +17,9 @@ if {${subport} eq "${name}-devel"} {
</span> # v5.75.0-7-ga670c57
version 5.75.0.7
distname ECM-5.1x.git
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-BUNDLEDIR-devel.diff
</span> } else {
version ${kf5.branch}.0
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +36,8 @@ if {${subport} eq "${name}-devel"} {
</span> sha256 aacc5ccdc5799efe34e2dae33418c379466caf7c9802b78348ccfb5782fe6ab5 \
size 318384
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${worksrcpath}/kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-BUNDLEDIR.diff
</span> }
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,10 @@ if {${subport} eq "${name}-devel"} {
</span> # https://phabricator.kde.org/T10112
patchfiles-append patch-mac-installdirs.diff
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DBUILD_HTML_DOCS=OFF \
-DBUILD_MAN_DOCS=OFF \
-DBUILD_QTHELP_DOCS=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR-devel.diff b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2c3ee14eb9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kde-modules/KDEInstallDirs.cmake.orig 2022-01-27 06:16:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kde-modules/KDEInstallDirs.cmake 2022-01-27 06:19:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deprecated variable name in square brackets):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``BUNDLEDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# application bundles (``/Applications/KDE``) [``BUNDLE_INSTALL_DIR``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# application bundles (``/@APPLICATIONSDIR@/KDE``) [``BUNDLE_INSTALL_DIR``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``EXECROOTDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executables and libraries (``<empty>``) [``EXEC_INSTALL_PREFIX``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``BINDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,7 +409,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endmacro()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _define_absolute(BUNDLEDIR "/Applications/KDE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _define_absolute(BUNDLEDIR "/@APPLICATIONSDIR@/KF5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "application bundles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_INSTALL_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>