<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69369614250434f6f5a985696d4e87a035d00d15">https://github.com/macports/macports-ports/commit/69369614250434f6f5a985696d4e87a035d00d15</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 69369614250 kblackbox, kbruch, kolourpaint, okular: fix issue with conflict about "VERSION" file with C++20 compilers (see https://trac.macports.org/ticket/62831)
</span>69369614250 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 69369614250434f6f5a985696d4e87a035d00d15
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Sun May 9 15:25:47 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> kblackbox, kbruch, kolourpaint, okular: fix issue with conflict about "VERSION" file with C++20 compilers (see https://trac.macports.org/ticket/62831)
</span>---
kde/kblackbox/Portfile | 4 ++++
kde/kbruch/Portfile | 4 ++++
kde/kolourpaint/Portfile | 4 ++++
kde/okular/Portfile | 4 ++++
4 files changed, 16 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kblackbox/Portfile b/kde/kblackbox/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5873607f9b6..23a18107912 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kblackbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kblackbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,10 @@ depends_lib-append port:kdelibs4 \
</span>
patchfiles-append patch-CMakeLists-icons.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset docs]} {
patchfiles-append patch-CMakeLists.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kbruch/Portfile b/kde/kbruch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f4930d78c7..46612e3d647 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kbruch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kbruch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ checksums rmd160 e9d738e56352533d4b55e8a65bfc2a69b8b3fb1e \
</span> #Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset docs]} {
patchfiles patch-CMakeLists.txt.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kolourpaint/Portfile b/kde/kolourpaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e0dd7aea6e..2721b56a794 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kolourpaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kolourpaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,10 @@ depends_lib-append port:kdelibs4 \
</span> port:oxygen-icons \
port:qimageblitz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset docs]} {
patchfiles patch-CMakeLists.txt.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/okular/Portfile b/kde/okular/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0d513fed6e..b8c2acb112e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/okular/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/okular/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +44,10 @@ depends_lib-append port:kdelibs4 \
</span> port:libkexiv2 \
path:include/turbojpeg.h:libjpeg-turbo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
#Okular does not handle *.dylib plugins (ticket #42603)
ln -s ${prefix}/lib/kde4/okularpart.dylib \
</pre><pre style='margin:0'>
</pre>