<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/f0e35b608dc2aa612d256557d1b769f64812fe6e">https://github.com/macports/macports-ports/commit/f0e35b608dc2aa612d256557d1b769f64812fe6e</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 f0e35b6 kmymoney4: update to version 4.8.4 take over maintainership
</span>f0e35b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f0e35b608dc2aa612d256557d1b769f64812fe6e
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Tue Feb 11 17:18:33 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> kmymoney4: update to version 4.8.4
</span><span style='display:block; white-space:pre;color:#404040;'> take over maintainership
</span>---
kde/kmymoney4/Portfile | 28 +++++++---------
.../files/patch-CMakeLists_QGPGME.txt.diff | 18 ----------
.../files/patch-CMakeLists_kmymoneysettings.h.diff | 38 ----------------------
kde/kmymoney4/files/patch-comparisons.diff | 24 ++++++++++++++
4 files changed, 35 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4/Portfile b/kde/kmymoney4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 596a676..c51b72f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kmymoney4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kmymoney4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,32 +6,32 @@ PortSystem 1.0
</span> PortGroup kde4 1.1
name kmymoney4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.7.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.8.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories kde kde4 finance
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {nicos @NicosPavlov} openmaintainer
</span>
description kmymoney version 4
long_description KMyMoney is the personal finance manager for KDE.
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://kmymoney2.sourceforge.net/index-home.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://kmymoney.org
</span> master_sites http://download.kde.org/stable/kmymoney/${version}/src/
livecheck.type regex
livecheck.url http://download.kde.org/stable/kmymoney
livecheck.regex "(4\\.\\d+?(\\.\\d+))/"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname kmymoney-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname kmymoney-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_7z yes
</span>
build.asroot yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 523e6bde2fd71453aa2d38711ae47342 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f9854f59377343418b5bdd12a34887aa0a821ca6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8b1c62955c1821ff986bf4a888e82af6bcbfecd6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 25a177a63842a3515042216aa1fb3e65f711067f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 849a13bbfb2e01a783050bb0bcc8b1b728314dccb75f619d3aa23e41fecca7f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21421802
</span>
conflicts kmymoney4-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,17 +45,11 @@ depends_lib-append port:libofx \
</span> patch.dir ${workpath}/${distname}
patch.pre_args -p1
patchfiles patch-mainRaster.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists_QGPGME.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists_kmymoneysettings.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-comparisons.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #
# OK, let's try building with documentation and see whether we end up with meinproc crashing again:
#
# patch-CMakeLists.txt.diff \
# patch-CMakeLists_remove_APIDOC.txt.diff \
# patch_remove_manpage_and_APIDOC.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is needed for patch-CMakeLists_QGPGME.txt.diff:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4/files/patch-CMakeLists_QGPGME.txt.diff b/kde/kmymoney4/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/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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4/files/patch-CMakeLists_kmymoneysettings.h.diff b/kde/kmymoney4/files/patch-CMakeLists_kmymoneysettings.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93e8809..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kmymoney4/files/patch-CMakeLists_kmymoneysettings.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ralf Habacker <ralf.habacker@freenet.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 10 Aug 2017 13:45:04 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix 'Compile error on Fedora 26'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CMake build system used some outdated variables which has been replaced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-by cmake build in variables to fix the issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FIXED-IN:4.8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-BUG:383351
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5aacbea..b007dfb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kmymoney/dialogs/settings/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kmymoney/dialogs/settings/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (libsettings_a_SOURCES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ksettingscolors.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ksettingsfonts.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ksettingsforecast.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kmymoney4/files/patch-comparisons.diff b/kde/kmymoney4/files/patch-comparisons.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a7223f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kmymoney4/files/patch-comparisons.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur kmymoney-4.8.4-orig/kmymoney/dialogs/kexportdlg.cpp kmymoney-4.8.4/kmymoney/dialogs/kexportdlg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kmymoney-4.8.4-orig/kmymoney/dialogs/kexportdlg.cpp 2019-08-13 04:54:24.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kmymoney-4.8.4/kmymoney/dialogs/kexportdlg.cpp 2020-02-11 13:50:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_profileComboBox->setCurrentItem(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (list.contains(current) > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (list.contains(current) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_profileComboBox->setCurrentIndex(m_profileComboBox->findText(current, Qt::MatchExactly));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur kmymoney-4.8.4-orig/kmymoney/mymoney/mymoneyreport.cpp kmymoney-4.8.4/kmymoney/mymoney/mymoneyreport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kmymoney-4.8.4-orig/kmymoney/mymoney/mymoneyreport.cpp 2019-08-13 04:54:24.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kmymoney-4.8.4/kmymoney/mymoney/mymoneyreport.cpp 2020-02-11 13:46:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -888,7 +888,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ payees(list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tags(list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (list.contains(id) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (list.contains(id) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int MyMoneyReport::m_lineWidth = 2;
</span></pre><pre style='margin:0'>
</pre>