Hello community, here is the log from the commit of package libkomparediff2 for openSUSE:Factory checked in at 2016-08-29 14:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old) and /work/SRC/openSUSE:Factory/.libkomparediff2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes 2016-07-21 07:49:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkomparediff2.new/libkomparediff2.changes 2016-08-29 14:50:06.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:29:54 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:45:07 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkomparediff2-16.04.3.tar.xz New: ---- libkomparediff2-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkomparediff2.spec ++++++ --- /var/tmp/diff_new_pack.5SgXlz/_old 2016-08-29 14:50:09.000000000 +0200 +++ /var/tmp/diff_new_pack.5SgXlz/_new 2016-08-29 14:50:09.000000000 +0200 @@ -35,7 +35,7 @@ Summary: A library to compare files and strings License: (GPL-2.0+ and LGPL-2.0+) and BSD-2-Clause Group: Development/Libraries/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz ++++++ libkomparediff2-16.04.3.tar.xz -> libkomparediff2-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-16.04.3/CMakeLists.txt new/libkomparediff2-16.08.0/CMakeLists.txt --- old/libkomparediff2-16.04.3/CMakeLists.txt 2016-03-17 23:06:40.000000000 +0100 +++ new/libkomparediff2-16.08.0/CMakeLists.txt 2016-06-25 14:10:52.000000000 +0200 @@ -29,6 +29,8 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2ConfigVersion.cmake" SOVERSION 5) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + set(komparediff2_SRCS kompareprocess.cpp komparemodellist.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-16.04.3/komparemodellist.cpp new/libkomparediff2-16.08.0/komparemodellist.cpp --- old/libkomparediff2-16.04.3/komparemodellist.cpp 2016-03-17 23:06:40.000000000 +0100 +++ new/libkomparediff2-16.08.0/komparemodellist.cpp 2016-06-25 14:10:52.000000000 +0200 @@ -660,7 +660,7 @@ qCDebug(LIBKOMPAREDIFF2) << "KompareModelList::saveDiff: "; m_diffTemp = new QTemporaryFile(); - m_diffURL = url; + m_diffURL = QUrl(url); // ### TODO the "url" argument should be a QUrl if( !m_diffTemp->open() ) { emit error( i18n( "Could not open a temporary file." ) ); @@ -704,7 +704,7 @@ emit status( Kompare::FinishedWritingDiff ); } - m_diffURL.truncate( 0 ); + m_diffURL = QUrl(); m_diffTemp->remove(); delete m_diffTemp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-16.04.3/komparemodellist.h new/libkomparediff2-16.08.0/komparemodellist.h --- old/libkomparediff2-16.04.3/komparemodellist.h 2016-03-17 23:06:40.000000000 +0100 +++ new/libkomparediff2-16.08.0/komparemodellist.h 2016-06-25 14:10:52.000000000 +0200 @@ -173,9 +173,9 @@ QStringList split( const QString& diff ); void setDepthAndApplied(); -private: +private: // ### an exported class without a d pointer? Really? What about BC? QTemporaryFile* m_diffTemp; - QString m_diffURL; + QUrl m_diffURL; KompareProcess* m_diffProcess;
