Hello community,
here is the log from the commit of package libkolab-qt5 for openSUSE:Factory checked in at 2015-10-14 16:44:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
and /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkolab-qt5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes 2015-10-03 20:16:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes 2015-10-14 16:44:53.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 28 17:49:14 UTC 2015 - tittiatcoke@gmail.com
+
+- Updated patch fix_new_kcontacts.diff to fix building against
+ KMime 15.08.1
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fix_new_kcontacts.diff ++++++
--- /var/tmp/diff_new_pack.XRE9IX/_old 2015-10-14 16:44:53.000000000 +0200
+++ /var/tmp/diff_new_pack.XRE9IX/_new 2015-10-14 16:44:53.000000000 +0200
@@ -1,14 +1,7 @@
-From ea6273aedbab41d1b91036eafc53b88ba871f836 Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck
-Date: Sun, 19 Jul 2015 20:28:35 +0200
-Subject: Fix2
-
-
-diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
-index 3f802bb..987ffae 100644
---- a/conversion/kabcconversion.cpp
-+++ b/conversion/kabcconversion.cpp
-@@ -666,8 +666,8 @@ Kolab::Contact fromKABC(const KContacts::Addressee &addressee)
+diff -urNB libkolab-1.0.1/conversion/kabcconversion.cpp new/conversion/kabcconversion.cpp
+--- libkolab-1.0.1/conversion/kabcconversion.cpp 2015-07-31 15:43:01.000000000 +0200
++++ new/conversion/kabcconversion.cpp 2015-09-28 19:47:56.137890076 +0200
+@@ -664,8 +664,8 @@
}
std::vectorKolab::Url urls;
@@ -19,18 +12,19 @@
}
const QString &blogUrl = addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("BlogFeed"));
if (!blogUrl.isEmpty()) {
-
-From 34b8cbdd02f274ef0d219c090a32aa1f3019ceae Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck
-Date: Sun, 19 Jul 2015 20:47:32 +0200
-Subject: Fix 4
-
-
-diff --git a/kolabformatV2/contact.cpp b/kolabformatV2/contact.cpp
-index d125bd1..7f2fd13 100644
---- a/kolabformatV2/contact.cpp
-+++ b/kolabformatV2/contact.cpp
-@@ -947,7 +947,7 @@ void Contact::setFields( const KContacts::Addressee* addressee )
+@@ -703,7 +703,7 @@
+ c.setRelateds(std::vectorKolab::Related() << Kolab::Related(Kolab::Related::Text, toStdString(spouse), Kolab::Related::Spouse));
+ }
+ c.setBDay(fromDate(KDateTime(addressee.birthday(), KDateTime::ClockTime)));
+- c.setAnniversary(fromDate(KDateTime(QDate::fromString( addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Anniversary")), Qt::ISODate ), KDateTime::ClockTime)));
++ c.setAnniversary(fromDate(KDateTime(QDate::fromString( addressee.custom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Anniversary")), Qt::ISODate ), KDateTime::Spec(KDateTime::ClockTime))));
+ if (!addressee.photo().isEmpty()) {
+ std::string mimetype;
+ const std::string &photo = fromPicture(addressee.photo(), mimetype);
+diff -urNB libkolab-1.0.1/kolabformatV2/contact.cpp new/kolabformatV2/contact.cpp
+--- libkolab-1.0.1/kolabformatV2/contact.cpp 2015-07-31 15:43:01.000000000 +0200
++++ new/kolabformatV2/contact.cpp 2015-09-28 19:47:17.356720656 +0200
+@@ -947,7 +947,7 @@
setPrefix( addressee->prefix() );
setSuffix( addressee->suffix() );
setOrganization( addressee->organization() );
@@ -39,7 +33,7 @@
setIMAddress( addressee->custom( "KADDRESSBOOK", "X-IMAddress" ) );
setDepartment( addressee->department());
setOfficeLocation( addressee->custom( "KADDRESSBOOK", "X-Office" ) );
-@@ -1082,6 +1082,9 @@ void Contact::saveTo( KContacts::Addressee* addressee )
+@@ -1082,6 +1082,9 @@
{
// TODO: This needs the same set of TODOs as the setFields method
KolabBase::saveTo( addressee );
@@ -49,7 +43,7 @@
addressee->setGivenName( givenName() );
addressee->setAdditionalName( middleNames() );
-@@ -1090,7 +1093,7 @@ void Contact::saveTo( KContacts::Addressee* addressee )
+@@ -1090,7 +1093,7 @@
addressee->setPrefix( prefix() );
addressee->setSuffix( suffix() );
addressee->setOrganization( organization() );
