<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/97af39d284b1d9f14f4f0a93b02e0ace547938da">https://github.com/macports/macports-ports/commit/97af39d284b1d9f14f4f0a93b02e0ace547938da</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 97af39d kdepimblibs4: fix build with newer libical (solves https://trac.macports.org/ticket/59500)
</span>97af39d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97af39d284b1d9f14f4f0a93b02e0ace547938da
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Tue Nov 5 23:43:35 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdepimblibs4: fix build with newer libical (solves https://trac.macports.org/ticket/59500)
</span>---
kde/kdepimlibs4/Portfile | 9 +-
kde/kdepimlibs4/files/patch-ical.diff | 178 +++++++++++++++++++++++++++++++++
kde/kdepimlibs4/files/patch-tests.diff | 12 +++
3 files changed, 196 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepimlibs4/Portfile b/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47317f1..662942a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kdepimlibs4
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 15
</span> categories kde kde4
maintainers {nicos @NicosPavlov}
license GPL-2+ LGPL-2+ BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,12 @@ depends_lib-append port:kdelibs4 \
</span>
#Suppress build of kioslaves which conflict with openssl
patchfiles-append patch-CMakeLists.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-do_not_include_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-do_not_include_cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ical.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tests.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DMAILTRANSPORT_INPROCESS_SMTP=Off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DMAILTRANSPORT_INPROCESS_SMTP=Off \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_FLAGS=\"-std=c++11\"
</span>
subport kdepimlibs4-kioslaves {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepimlibs4/files/patch-ical.diff b/kde/kdepimlibs4/files/patch-ical.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8a22d90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepimlibs4/files/patch-ical.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,178 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepimlibs-4.14.3-orig/kcal/icalformat_p.cpp ./kcal/icalformat_p.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/kcal/icalformat_p.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kcal/icalformat_p.cpp 2019-11-05 22:27:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2087,7 +2087,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2107,7 +2106,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0; // zone is NOT set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = datetime.isUtc() ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _dumpIcaltime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2174,7 +2172,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;'>+ KTimeZone ktz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( !t.is_utc ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( !icaltime_is_utc(t) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ktz = dt.timeZone();
</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;'>+@@ -2207,7 +2205,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _dumpIcaltime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KDateTime::Spec timeSpec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( t.is_utc || t.zone == icaltimezone_get_utc_timezone() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( icaltime_is_utc(t) || t.zone == icaltimezone_get_utc_timezone() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timeSpec = KDateTime::UTC; // the time zone is UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utc = false; // no need to convert to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepimlibs-4.14.3-orig/kcal/icaltimezones.cpp ./kcal/icaltimezones.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/kcal/icaltimezones.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kcal/icaltimezones.cpp 2019-11-05 22:32:03.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QDateTime( QDate( t.year, t.month, t.day ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTime( t.hour, t.minute, t.second ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ( t.is_utc ? Qt::UTC : Qt::LocalTime ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( icaltime_is_utc(t) ? Qt::UTC : Qt::LocalTime ) );
</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;'>+ // Maximum date for time zone data.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = local.time().second();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return t;
</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;'>+@@ -787,7 +786,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ICAL_LASTMODIFIED_PROPERTY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icaltimetype t = icalproperty_get_lastmodified(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( t.is_utc ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( icaltime_is_utc(t) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->d->lastModified = toQDateTime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kDebug() << "LAST-MODIFIED not UTC";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -972,7 +971,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Convert DTSTART to QDateTime, and from local time to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QDateTime localStart = toQDateTime( dtstart ); // local time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dtstart.second -= prevOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dtstart.is_utc = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QDateTime utcStart = toQDateTime( icaltime_normalize( dtstart ) ); // UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transitions += utcStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -999,13 +997,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.minute = dtstart.minute;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = dtstart.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0; // dtstart is in local time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // RFC2445 states that RDATE must be in local time,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // but we support UTC as well to be safe.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( !t.is_utc ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( !icaltime_is_utc(t) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second -= prevOffset; // convert to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t = icaltime_normalize( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transitions += toQDateTime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepimlibs-4.14.3-orig/kcalcore/icalformat_p.cpp ./kcalcore/icalformat_p.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/kcalcore/icalformat_p.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kcalcore/icalformat_p.cpp 2019-11-05 22:21:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2301,7 +2301,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2323,7 +2322,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = datetime.time().second();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0; // zone is NOT set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = datetime.isUtc() ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _dumpIcaltime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2398,7 +2396,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;'>+ KTimeZone ktz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!t.is_utc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!icaltime_is_utc(t)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ktz = dt.timeZone();
</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;'>+@@ -2431,7 +2429,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _dumpIcaltime( t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KDateTime::Spec timeSpec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (t.is_utc || t.zone == icaltimezone_get_utc_timezone()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (icaltime_is_utc(t) || t.zone == icaltimezone_get_utc_timezone()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timeSpec = KDateTime::UTC; // the time zone is UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utc = false; // no need to convert to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepimlibs-4.14.3-orig/kcalcore/icaltimezones.cpp ./kcalcore/icaltimezones.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/kcalcore/icaltimezones.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kcalcore/icaltimezones.cpp 2019-11-05 22:20:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QDateTime(QDate(t.year, t.month, t.day),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTime(t.hour, t.minute, t.second),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (t.is_utc ? Qt::UTC : Qt::LocalTime));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (icaltime_is_utc(t) ? Qt::UTC : Qt::LocalTime));
</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;'>+ // Maximum date for time zone data.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = local.time().second();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.zone = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return t;
</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;'>+@@ -886,7 +885,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ICAL_LASTMODIFIED_PROPERTY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const icaltimetype t = icalproperty_get_lastmodified(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (t.is_utc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (icaltime_is_utc(t)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->d->lastModified = toQDateTime(t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kDebug() << "LAST-MODIFIED not UTC";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1259,7 +1258,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Convert DTSTART to QDateTime, and from local time to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QDateTime localStart = toQDateTime(dtstart); // local time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dtstart.second -= prevOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dtstart.is_utc = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QDateTime utcStart = toQDateTime(icaltime_normalize(dtstart)); // UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transitions += utcStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1286,13 +1284,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.minute = dtstart.minute;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second = dtstart.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.is_date = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 0; // dtstart is in local time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // RFC2445 states that RDATE must be in local time,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // but we support UTC as well to be safe.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!t.is_utc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!icaltime_is_utc(t)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t.second -= prevOffset; // convert to UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t.is_utc = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t = icaltime_normalize(t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transitions += toQDateTime(t);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepimlibs4/files/patch-tests.diff b/kde/kdepimlibs4/files/patch-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a61ed3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepimlibs4/files/patch-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepimlibs-4.14.3-orig/kmime/tests/auto/contenttest.cpp ./kmime/tests/auto/contenttest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/kmime/tests/auto/contenttest.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kmime/tests/auto/contenttest.cpp 2019-11-05 23:14:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,8 +320,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ContentTest::testDecodedContent()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Content *c = new Content();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c->setBody( '\0' );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QVERIFY( c->decodedContent() == QByteArray() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->setBody( QByteArray() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QVERIFY( c->decodedContent() == QByteArray() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->setBody( " " );
</span></pre><pre style='margin:0'>
</pre>