commit kcontacts for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2017-05-22 10:39:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcontacts (Old)
and /work/SRC/openSUSE:Factory/.kcontacts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts"
Mon May 22 10:39:39 2017 rev:20 rq:495919 version:17.04.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2017-05-08 18:49:15.552726797 +0200
+++ /work/SRC/openSUSE:Factory/.kcontacts.new/kcontacts.changes 2017-05-22 10:39:41.810780238 +0200
@@ -1,0 +2,14 @@
+Wed May 17 20:36:00 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-17.04.1.php
+- Changes since 17.04.0:
+ * VCardParser: gain 1% of performance by using indexOf+mid instead of split('\n')
+ * Add missing include (make it happy jenkins)
+ * VCardParser: rewrite parser to use a state machine instead of split()
+ * VCardParser: extract class for parsing the current line
+ * Revert 1760aca (which commented out some unittests...).
+
+-------------------------------------------------------------------
Old:
----
kcontacts-17.04.0.tar.xz
New:
----
kcontacts-17.04.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcontacts.spec ++++++
--- /var/tmp/diff_new_pack.IyEDR7/_old 2017-05-22 10:39:43.458547905 +0200
+++ /var/tmp/diff_new_pack.IyEDR7/_new 2017-05-22 10:39:43.458547905 +0200
@@ -20,7 +20,7 @@
%define kf5_version 5.5.0
Name: kcontacts
-Version: 17.04.0
+Version: 17.04.1
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
++++++ kcontacts-17.04.0.tar.xz -> kcontacts-17.04.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/CMakeLists.txt new/kcontacts-17.04.1/CMakeLists.txt
--- old/kcontacts-17.04.0/CMakeLists.txt 2017-04-14 02:21:53.000000000 +0200
+++ new/kcontacts-17.04.1/CMakeLists.txt 2017-05-09 02:26:31.000000000 +0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.5.0")
+set(PIM_VERSION "5.5.1")
project(KContacts VERSION ${PIM_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/autotests/data/vcard10.vcf.ref new/kcontacts-17.04.1/autotests/data/vcard10.vcf.ref
--- old/kcontacts-17.04.0/autotests/data/vcard10.vcf.ref 2017-04-08 06:47:01.000000000 +0200
+++ new/kcontacts-17.04.1/autotests/data/vcard10.vcf.ref 2017-04-26 06:55:00.000000000 +0200
@@ -35,7 +35,8 @@
N:Name;Surname;;Dr. med.;
NOTE:Sprechzeiten:\nMo 8–12\, 15–18\nDi 8–12\nMi 8–12\, 14
–15\nDo 14–19\nFr 8–12
-TITLE:Facharzt für Allgemeinmedizin
+TITLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:=46acharzt f=C3=BCr Allgemein
+ medizin
UID:b4fc4930-043f-446a-9a76-cf0b548368d8
END:VCARD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/autotests/importexportvcardtest.cpp new/kcontacts-17.04.1/autotests/importexportvcardtest.cpp
--- old/kcontacts-17.04.0/autotests/importexportvcardtest.cpp 2017-04-08 06:47:01.000000000 +0200
+++ new/kcontacts-17.04.1/autotests/importexportvcardtest.cpp 2017-04-26 06:55:00.000000000 +0200
@@ -21,6 +21,7 @@
#include "importexportvcardtest.h"
#include <QTest>
#include "vcardtool.h"
+#include <QDebug>
ImportExportVCardTest::ImportExportVCardTest(QObject *parent)
: QObject(parent)
@@ -33,6 +34,27 @@
}
+static void compareBuffers(const QByteArray &outputData, const QByteArray &expected)
+{
+ if (outputData != expected) {
+ qDebug() << " outputData " << outputData;
+ qDebug() << " expected " << expected;
+ }
+ const QList<QByteArray> outputLines = outputData.split('\n');
+ const QList<QByteArray> outputRefLines = expected.split('\n');
+ for (int i = 0; i < qMin(outputLines.count(), outputRefLines.count()); ++i) {
+ const QByteArray actual = outputLines.at(i);
+ const QByteArray expect = outputRefLines.at(i);
+ if (actual != expect) {
+ qCritical() << "Mismatch at output line" << (i + 1);
+ QCOMPARE(actual, expect);
+ QCOMPARE(actual.count(), expect.count());
+ }
+ }
+ QCOMPARE(outputLines.count(), outputRefLines.count());
+ QCOMPARE(outputData.size(), expected.size());
+}
+
void ImportExportVCardTest::shouldExportFullTestVcard4()
{
QByteArray vcarddata("BEGIN:VCARD\r\n"
@@ -71,8 +93,9 @@
"END:VCARD\r\n\r\n");
QByteArray vcardexpected("BEGIN:VCARD\r\n"
"VERSION:4.0\r\n"
- "ADR;GEO=\"geo:51.523701,0.158500\";LABEL=\"Mr Sherlock Holmes\";TYPE:;;221B Bak\r\n"
- " er Street;London;;NW1;United Kingdom\r\n"
+ "ADR;GEO=\"geo:51.523701,0.158500\";LABEL=\"Mr Sherlock Holmes, 221B Baker Stre\r\n"
+ " et, London NW1, England, United Kingdom\";TYPE:;;221B Baker Street;London;;\r\n"
+ " NW1;United Kingdom\r\n"
"ANNIVERSARY:19960415\r\n"
"BDAY:19531015T231000Z\r\n"
"CALADRURI;PREF=1:mailto:detective@sherlockholmes.com\r\n"
@@ -93,7 +116,7 @@
"PRODID:-//KADDRESSBOOK//NONSGML Version 1//EN\r\n"
"REV:20140722T222710Z\r\n"
"ROLE:Detective\r\n"
- "TEL;PREF=1;VALUE=uri:ext=5555\r\n"
+ "TEL;TYPE=\"home,voice\";PREF=1;VALUE=uri:tel:+44-555-555-5555;ext=5555\r\n"
"TEL;TYPE=\"cell,voice\";VALUE=uri:tel:+44-555-555-6666\r\n"
"TEL;TYPE=\"voice,work\";VALUE=uri:tel:+44-555-555-7777\r\n"
"TITLE;ALTID=1;LANGUAGE=fr:Patron\r\n"
@@ -107,8 +130,7 @@
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
const QByteArray result = vcard.exportVCards(lst, KContacts::VCard::v4_0);
- //qDebug() << " result " << result;
- QCOMPARE(result, vcardexpected);
+ compareBuffers(result, vcardexpected);
}
void ImportExportVCardTest::shouldExportMiscElementVcard4()
@@ -140,9 +162,7 @@
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
const QByteArray result = vcard.exportVCards(lst, KContacts::VCard::v4_0);
- //qDebug() << " result " << result;
- QCOMPARE(result, vcardexpected);
-
+ compareBuffers(result, vcardexpected);
}
void ImportExportVCardTest::shouldExportMemberElementVcard4()
@@ -174,8 +194,9 @@
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
const QByteArray result = vcard.exportVCards(lst, KContacts::VCard::v4_0);
- //qDebug() << " result " << result;
- QCOMPARE(result, vcardexpected);
+ compareBuffers(result, vcardexpected);
}
+// TODO please make this data driven before copy/pasting more methods here...
+
QTEST_MAIN(ImportExportVCardTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/autotests/testroundtrip.cpp new/kcontacts-17.04.1/autotests/testroundtrip.cpp
--- old/kcontacts-17.04.0/autotests/testroundtrip.cpp 2017-04-08 06:47:01.000000000 +0200
+++ new/kcontacts-17.04.1/autotests/testroundtrip.cpp 2017-04-26 06:55:00.000000000 +0200
@@ -99,6 +99,27 @@
}
}
+static void compareBuffers(const char *version, const QByteArray &outputData, const QByteArray &outputRefData)
+{
+ if (outputData != outputRefData) {
+ qDebug() << " outputData " << outputData;
+ qDebug() << " outputRefData " << outputRefData;
+ }
+ const QList<QByteArray> outputLines = outputData.split('\n');
+ const QList<QByteArray> outputRefLines = outputRefData.split('\n');
+ for (int i = 0; i < qMin(outputLines.count(), outputRefLines.count()); ++i) {
+ const QByteArray actual = outputLines.at(i);
+ const QByteArray expect = outputRefLines.at(i);
+ if (actual != expect) {
+ qCritical() << "Mismatch in" << version << "output line" << (i + 1);
+ QCOMPARE(actual, expect);
+ QCOMPARE(actual.count(), expect.count());
+ }
+ }
+ QCOMPARE(outputLines.count(), outputRefLines.count());
+ QCOMPARE(outputData.size(), outputRefData.size());
+}
+
void RoundtripTest::testVCardRoundtrip()
{
QFETCH(QString, inputFile);
@@ -128,23 +149,7 @@
QVERIFY(outputFile.open(QIODevice::ReadOnly));
const QByteArray outputRefData = outputFile.readAll();
- QCOMPARE(outputData.size(), outputRefData.size());
-
- const QList<QByteArray> outputLines = outputData.split('\n');
- const QList<QByteArray> outputRefLines = outputRefData.split('\n');
- QCOMPARE(outputLines.count(), outputRefLines.count());
- for (int i = 0; i < outputLines.count(); ++i) {
- const QByteArray actual = outputLines[i];
- const QByteArray expect = outputRefLines[i];
-
- if (actual != expect) {
- qCritical() << "Mismatch in v2.1 output line" << (i + 1);
- QCOMPARE(actual.count(), expect.count());
-
- qCritical() << "\nActual:" << actual << "\nExpect:" << expect;
- QCOMPARE(actual, expect);
- }
- }
+ compareBuffers("v2.1", outputData, outputRefData);
}
if (!output3_0File.isEmpty()) {
@@ -154,26 +159,7 @@
QVERIFY(outputFile.open(QIODevice::ReadOnly));
const QByteArray outputRefData = outputFile.readAll();
- if (outputData.size() != outputRefData.size()) {
- qDebug() << " outputRefData " << outputRefData << endl;
- qDebug() << " outputData " << outputData;
- }
- QCOMPARE(outputData.size(), outputRefData.size());
- const QList<QByteArray> outputLines = outputData.split('\n');
- const QList<QByteArray> outputRefLines = outputRefData.split('\n');
- QCOMPARE(outputLines.count(), outputRefLines.count());
- for (int i = 0; i < outputLines.count(); ++i) {
- const QByteArray actual = outputLines[i];
- const QByteArray expect = outputRefLines[i];
-
- if (actual != expect) {
- qCritical() << "Mismatch in v3.0 output line" << (i + 1);
-
- qCritical() << "\nActual:" << actual << "\nExpect:" << expect;
- QCOMPARE(actual.count(), expect.count());
- QCOMPARE(actual, expect);
- }
- }
+ compareBuffers("v3.0", outputData, outputRefData);
}
#if 0
if (!output4_0File.isEmpty()) {
@@ -183,28 +169,7 @@
QVERIFY(outputFile.open(QIODevice::ReadOnly));
const QByteArray outputRefData = outputFile.readAll();
- if (outputData.size() != outputRefData.size()) {
- qDebug() << " outputRefData " << outputRefData << endl;
- qDebug() << " outputData " << outputData;
- }
- //QCOMPARE( outputData.size(), outputRefData.size() );
-
- const QList<QByteArray> outputLines = outputData.split('\n');
- const QList<QByteArray> outputRefLines = outputRefData.split('\n');
- //QCOMPARE(outputLines.count(), outputRefLines.count());
-
- for (int i = 0; i < outputLines.count(); ++i) {
- const QByteArray actual = outputLines[i];
- const QByteArray expect = outputRefLines[i];
-
- if (actual != expect) {
- qCritical() << "Mismatch in v4.0 output line" << (i + 1);
-
- qCritical() << "\nActual:" << actual << "\nExpect:" << expect;
- QCOMPARE(actual.count(), expect.count());
- QCOMPARE(actual, expect);
- }
- }
+ compareBuffers("v4.0", outputData, outputRefData);
}
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/autotests/testroundtrip.qrc new/kcontacts-17.04.1/autotests/testroundtrip.qrc
--- old/kcontacts-17.04.0/autotests/testroundtrip.qrc 2017-04-08 06:47:01.000000000 +0200
+++ new/kcontacts-17.04.1/autotests/testroundtrip.qrc 2017-04-26 06:55:00.000000000 +0200
@@ -3,14 +3,14 @@
<qresource prefix="/input">
<file>data/vcard1.vcf</file>
<file>data/vcard2.vcf</file>
- <!-- <file>data/vcard3.vcf</file>
- <file>data/vcard4.vcf</file> -->
+ <file>data/vcard3.vcf</file>
+ <file>data/vcard4.vcf</file>
<file>data/vcard5.vcf</file>
<file>data/vcard6.vcf</file>
<file>data/vcard7.vcf</file>
<file>data/vcard8.vcf</file>
<file>data/vcard9.vcf</file>
- <!-- <file>data/vcard10.vcf</file> -->
+ <file>data/vcard10.vcf</file>
<file>data/vcard11.vcf</file>
<file>data/vcard12.vcf</file>
<file>data/vcard13.vcf</file>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.0/src/vcardparser/vcardparser.cpp new/kcontacts-17.04.1/src/vcardparser/vcardparser.cpp
--- old/kcontacts-17.04.0/src/vcardparser/vcardparser.cpp 2017-04-08 06:47:01.000000000 +0200
+++ new/kcontacts-17.04.1/src/vcardparser/vcardparser.cpp 2017-04-26 06:55:00.000000000 +0200
@@ -22,6 +22,7 @@
#include
participants (1)
-
root@hilbert.suse.de