![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package libkolabxml for openSUSE:Factory checked in at 2016-01-23 01:05:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old) and /work/SRC/openSUSE:Factory/.libkolabxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkolabxml" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2016-01-09 23:09:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2016-01-23 01:05:04.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 8 14:28:11 UTC 2016 - tittiatcoke@gmail.com + +- New upstream release 1.1.2 + - Build fixes for the tests (Qt5 related) + +------------------------------------------------------------------- Old: ---- libkolabxml-1.1.1.tar.gz New: ---- libkolabxml-1.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolabxml.spec ++++++ --- /var/tmp/diff_new_pack.z1ZXaX/_old 2016-01-23 01:05:04.000000000 +0100 +++ /var/tmp/diff_new_pack.z1ZXaX/_new 2016-01-23 01:05:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkolabxml # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ %global php_confdir %{_sysconfdir}/php5/conf.d %define libname %{name}1 Name: libkolabxml -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Kolab XML Format Schema Definitions Library License: LGPL-3.0+ ++++++ libkolabxml-1.1.1.tar.gz -> libkolabxml-1.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.1.1/CMakeLists.txt new/libkolabxml-1.1.2/CMakeLists.txt --- old/libkolabxml-1.1.1/CMakeLists.txt 2015-07-31 10:52:28.000000000 +0200 +++ new/libkolabxml-1.1.2/CMakeLists.txt 2015-11-25 12:36:44.000000000 +0100 @@ -45,7 +45,7 @@ set (Libkolabxml_VERSION_MAJOR 1) set (Libkolabxml_VERSION_MINOR 1) # Enable the full x.y.z version only for release versions -set (Libkolabxml_VERSION_PATCH 1) +set (Libkolabxml_VERSION_PATCH 2) set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" ) #set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.1.1/tests/CMakeLists.txt new/libkolabxml-1.1.2/tests/CMakeLists.txt --- old/libkolabxml-1.1.1/tests/CMakeLists.txt 2015-07-31 10:52:28.000000000 +0200 +++ new/libkolabxml-1.1.2/tests/CMakeLists.txt 2015-11-25 12:36:44.000000000 +0100 @@ -7,7 +7,6 @@ find_package(Qt5Core REQUIRED) find_package(Qt5Test REQUIRED) - include("../cmake/modules/ECMQt4To5Porting.cmake") include_directories(${QT_INCLUDES}) # TODO: Port away from this. if(CMAKE_VERSION VERSION_LESS 2.8.9) @@ -18,7 +17,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() - set(QT_QTTEST_LIBRARIES Qt5::Test) + set(QT_QTCORE_LIBRARY Qt5::Core) + set(QT_QTTEST_LIBRARY Qt5::Test) else() set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only set(QT_MIN_VERSION 4.6.2) # Qt 4 only @@ -32,7 +32,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore) +include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR}) if (NOT APPLE) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.1.1/tests/kolabconversationtest.cpp new/libkolabxml-1.1.2/tests/kolabconversationtest.cpp --- old/libkolabxml-1.1.1/tests/kolabconversationtest.cpp 2015-07-31 10:52:28.000000000 +0200 +++ new/libkolabxml-1.1.2/tests/kolabconversationtest.cpp 2015-11-25 12:36:44.000000000 +0100 @@ -27,7 +27,7 @@ void KolabConversationTest::configurationDeserialationTest() { boost::shared_ptr <Kolab::Configuration> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Configuration>(TEST_DATA_PATH "/testfiles/testConfiguration.xml", true); - QVERIFY(ptr); + QVERIFY(static_cast<bool>(ptr)); QVERIFY(ptr->isValid()); QCOMPARE(ptr->type(), Kolab::Configuration::TypeRelation); @@ -36,7 +36,7 @@ void KolabConversationTest::noteDeserialationTest() { boost::shared_ptr <Kolab::Note> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Note>(TEST_DATA_PATH "/testfiles/testNote.xml", true); - QVERIFY(ptr); + QVERIFY(static_cast<bool>(ptr)); QVERIFY(ptr->isValid()); QCOMPARE(ptr->summary(), std::string("summarytext")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.1.1/tests/serializers.h new/libkolabxml-1.1.2/tests/serializers.h --- old/libkolabxml-1.1.1/tests/serializers.h 2015-07-31 10:52:28.000000000 +0200 +++ new/libkolabxml-1.1.2/tests/serializers.h 2015-11-25 12:36:44.000000000 +0100 @@ -12,7 +12,7 @@ QByteArray ba = "Kolab::cDateTime("; ba += QByteArray::number(dt.year()) + ", " + QByteArray::number(dt.month())+ ", " + QByteArray::number(dt.day()) + ", "; ba += QByteArray::number(dt.hour()) + ", " + QByteArray::number(dt.minute()) + ", " + QByteArray::number(dt.second())+ ", "; - ba += QString(dt.isUTC()?QString("UTC"):QString("TZ: "+QString::fromStdString(dt.timezone()))).toLatin1(); + ba += dt.isUTC()?QByteArray("UTC"):QByteArray("TZ: "+QByteArray(dt.timezone().c_str())); ba += ")"; return qstrdup(ba.data()); } @@ -32,9 +32,9 @@ char *toString(const Kolab::Attendee &a) { QByteArray ba = "Kolab::Attendee("; - ba += QString::fromStdString(a.contact().email()).toLatin1() + ", " + QString::fromStdString(a.contact().name()).toLatin1()+ ", " + - QByteArray::number(a.partStat()) + ", " + QByteArray::number(a.role()) + ", " + QByteArray::number(a.rsvp()) + ", " + - QString::fromStdString(a.contact().uid()).toLatin1(); + ba += QByteArray(a.contact().email().c_str()) + ", " + QByteArray(a.contact().name().c_str())+ ", " + + QByteArray::number(a.partStat()) + ", " + QByteArray::number(a.role()) + ", " + QByteArray::number(a.rsvp()) + ", " + + QByteArray(a.contact().uid().c_str()); ba += ")"; return qstrdup(ba.data()); } @@ -54,7 +54,7 @@ char *toString(const std::string &s) { QByteArray ba = "string("; - ba += QString::fromStdString(s).toLatin1(); + ba += QByteArray(s.c_str()); ba += ")"; return qstrdup(ba.data()); } @@ -104,8 +104,8 @@ char *toString(const Kolab::Attachment &a) { QByteArray ba = "Kolab::Attachment("; - ba += QString::fromStdString(a.uri()).toLatin1() + ", " + QString::fromStdString(a.mimetype()).toLatin1()+ ", " + - QString::fromStdString(a.label()).toLatin1(); + ba += QByteArray(a.uri().c_str()) + ", " + QByteArray(a.mimetype().c_str())+ ", " + + QByteArray(a.label().c_str()); ba += ")"; return qstrdup(ba.data()); } @@ -125,9 +125,9 @@ char *toString(const Kolab::ContactReference &a) { QByteArray ba = "Kolab::ContactReference("; - ba += QString::fromStdString(a.email()).toLatin1()+ ", "; - ba += QString::fromStdString(a.name()).toLatin1()+ ", "; - ba += QString::fromStdString(a.uid()).toLatin1(); + ba += QByteArray(a.email().c_str())+ ", "; + ba += QByteArray(a.name().c_str())+ ", "; + ba += QByteArray(a.uid().c_str()); ba += ")"; return qstrdup(ba.data()); } @@ -147,9 +147,9 @@ char *toString(const Kolab::Alarm &a) { QByteArray ba = "Kolab::Alarm("; - ba += QByteArray::number(a.type()) + "\n " + QString::fromStdString(a.summary())+ "\n " + - QString::fromStdString(a.text())+"\n " +toString(a.duration()) + "\n " + QByteArray::number(a.numrepeat())+ "\n " + toString(a.start()) + "\n " + - toString(a.relativeStart()) + "\n " + QByteArray::number(a.relativeTo()) + "\n " + toString(a.audioFile()) + "\n " + toString(a.attendees()) + "\n "; + ba += QByteArray::number(a.type()) + "\n " + QByteArray(a.summary().c_str())+ "\n " + + QByteArray(a.text().c_str())+"\n " +QByteArray(toString(a.duration())) + "\n " + QByteArray::number(a.numrepeat())+ "\n " + QByteArray(toString(a.start())) + "\n " + + QByteArray(toString(a.relativeStart())) + "\n " + QByteArray::number(a.relativeTo()) + "\n " + QByteArray(toString(a.audioFile())) + "\n " + QByteArray(toString(a.attendees())) + "\n "; ba += ")"; return qstrdup(ba.data()); } @@ -169,8 +169,8 @@ char *toString(const Kolab::Related &a) { QByteArray ba = "Kolab::Related("; - ba += QString::fromStdString(a.text()).toLatin1()+ "\n " + - QString::fromStdString(a.uri()).toLatin1()+"\n " + + ba += QByteArray(a.text().c_str())+ "\n " + + QByteArray(a.uri().c_str())+"\n " + QByteArray::number(a.relationTypes()) + "\n " + QByteArray::number(a.type()) + "\n "; ba += ")"; @@ -192,9 +192,9 @@ char *toString(const Kolab::Affiliation &a) { QByteArray ba = "Kolab::Affiliation("; - ba += QString::fromStdString(a.organisation()).toLatin1()+ "\n " + - QString::fromStdString(a.logo())+"\n " + "\n " + toString(a.roles())+ "\n " + toString(a.relateds()) + "\n " + - toString(a.addresses()) + "\n "; + ba += QByteArray(a.organisation().c_str())+ "\n " + + QByteArray(a.logo().c_str()) + "\n " + "\n " + QByteArray(toString(a.roles())) + "\n " + QByteArray(toString(a.relateds())) + "\n " + + QByteArray(toString(a.addresses())) + "\n "; ba += ")"; return qstrdup(ba.data()); }