<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e0a73e68de6a7b2b05abf93374f476a080400f39">https://github.com/macports/macports-ports/commit/e0a73e68de6a7b2b05abf93374f476a080400f39</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 e0a73e6 Reoslving conflicts with upstream
</span>e0a73e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e0a73e68de6a7b2b05abf93374f476a080400f39
</span>Author: Henry Mohn <henryiii@Henrys-iMac.local>
AuthorDate: Wed Jan 31 12:32:32 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Reoslving conflicts with upstream
</span>---
kde/kmymoney4-devel/Portfile | 8 +++-----
.../files/patch-CMakeLists_QGPGME.txt.diff | 18 ------------------
2 files changed, 3 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4-devel/Portfile b/kde/kmymoney4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e8a8cb..0c3ca4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kmymoney4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kmymoney4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,10 @@ PortGroup kde4 1.1
</span>
fetch.type git
git.url git://anongit.kde.org/kmymoney
<span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch 485aea8e20604cf79612f62d1393fde9872c0273
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch ebeeced0715a82327ae0e2ee833cf93fc3029366
</span>
name kmymoney4-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.8-20161022
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.8.1-20171206
</span>
categories kde kde4 finance
maintainers pixilla openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +40,7 @@ depends_lib-append port:libofx \
</span>
patch.dir ${workpath}/${distname}
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-mainRaster.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists_QGPGME.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-mainRaster.diff
</span>
if {![variant_isset docs]} {
patchfiles-append patch_remove_manpage.diff patch-CMakeLists_remove_APIDOC.txt.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4-devel/files/patch-CMakeLists_QGPGME.txt.diff b/kde/kmymoney4-devel/files/patch-CMakeLists_QGPGME.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4076769..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kmymoney4-devel/files/patch-CMakeLists_QGPGME.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** kmymoney-4.7.2/CMakeLists.txt Sat Apr 25 19:20:16 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kmymoney-4.7.2/CMakeLists.txt Wed Oct 5 23:14:44 2016
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 70,75 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 70,82 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # needed by libkgpgfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(QGpgme REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This is specific for MacPorts, as it ships a newer version of gpgme (1.7.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (QGPGME_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(GPGME_INCLUDES "%PREFIX%/include/KDE4")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories(${GPGME_INCLUDES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif (QGPGME_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(KdepimLibs REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(SharedMimeInfo REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>