Hello community,
here is the log from the commit of package libkomparediff2 for
openSUSE:Leap:15.2 checked in at 2020-05-12 11:35:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/libkomparediff2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2"
Tue May 12 11:35:58 2020 rev:58 rq:797489 version:20.04.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/libkomparediff2/libkomparediff2.changes
2020-03-15 07:08:12.460850115 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.2738/libkomparediff2.changes
2020-05-12 11:35:59.432196865 +0200
@@ -1,0 +2,28 @@
+Thu Apr 23 12:23:10 UTC 2020 - Luca Beltrame <lbeltr...@kde.org>
+
+- Update to 20.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-04-apps-update
+- No code change since 20.03.90
+
+-------------------------------------------------------------------
+Sun Apr 5 20:30:41 UTC 2020 - Luca Beltrame <lbeltr...@kde.org>
+
+- Update to 20.03.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-rc
+- No code change since 20.03.80
+
+-------------------------------------------------------------------
+Sun Mar 22 09:17:38 UTC 2020 - Luca Beltrame <lbeltr...@kde.org>
+
+- Update to 20.03.80
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-beta
+- Changes since 19.12.3:
+ * Remove use of QLinkedList
+
+-------------------------------------------------------------------
Old:
----
libkomparediff2-19.12.3.tar.xz
libkomparediff2-19.12.3.tar.xz.sig
New:
----
libkomparediff2-20.04.0.tar.xz
libkomparediff2-20.04.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkomparediff2.spec ++++++
--- /var/tmp/diff_new_pack.zJjEox/_old 2020-05-12 11:35:59.780197596 +0200
+++ /var/tmp/diff_new_pack.zJjEox/_new 2020-05-12 11:35:59.780197596 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkomparediff2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,22 +22,18 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version: 19.12.3
+Version: 20.04.0
Release: 0
Summary: A library to compare files and strings
License: (GPL-2.0-or-later AND LGPL-2.0-or-later) AND BSD-2-Clause
Group: Development/Libraries/KDE
URL: https://www.kde.org
Source:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-%if %{with lang}
-Source1:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2: applications.keyring
-%endif
BuildRequires: extra-cmake-modules
+BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
-BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Parts)
@@ -47,6 +43,10 @@
BuildRequires: cmake(Qt5Widgets)
Obsoletes: %{name}-kf5 < %{version}
Provides: %{name}-kf5 = %{version}
+%if %{with lang}
+Source1:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2: applications.keyring
+%endif
%description
A library to compare files and strings, used in Kompare and KDevelop.
@@ -65,16 +65,12 @@
Summary: A library to compare files and strings
Group: System/Libraries
Provides: %{name} = %{version}
-%if %{with lang}
Recommends: %{name}-lang
-%endif
%description %{soname}
A library to compare files and strings, used in Kompare and KDevelop.
-%if %{with lang}
%lang_package
-%endif
%prep
%setup -q
++++++ libkomparediff2-19.12.3.tar.xz -> libkomparediff2-20.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/CMakeLists.txt
new/libkomparediff2-20.04.0/CMakeLists.txt
--- old/libkomparediff2-19.12.3/CMakeLists.txt 2020-03-03 01:26:08.000000000
+0100
+++ new/libkomparediff2-20.04.0/CMakeLists.txt 2020-04-17 02:35:06.000000000
+0200
@@ -42,7 +42,6 @@
add_definitions(
-DQT_DEPRECATED_WARNINGS
- -DQT_DISABLE_DEPRECATED_BEFORE=0x050900
-DQT_USE_QSTRINGBUILDER
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII
@@ -51,7 +50,10 @@
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_STRICT_ITERATORS
)
-
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
+endif()
add_definitions(-DTRANSLATION_DOMAIN=\"libkomparediff2\")
ecm_qt_declare_logging_category(komparediff2_DBG_SRCS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/komparemodellist.cpp
new/libkomparediff2-20.04.0/komparemodellist.cpp
--- old/libkomparediff2-19.12.3/komparemodellist.cpp 2019-02-28
04:48:11.000000000 +0100
+++ new/libkomparediff2-20.04.0/komparemodellist.cpp 2020-03-09
17:24:11.000000000 +0100
@@ -25,7 +25,7 @@
#include <QRegExp>
#include <QTextCodec>
#include <QTextStream>
-#include <QLinkedList>
+#include <QList>
#include <QTemporaryFile>
#include <QMimeType>
#include <QMimeDatabase>
@@ -1069,14 +1069,8 @@
int srcLineNo = 1, destLineNo = 1;
- const QStringList list = split(fileContents);
- QLinkedList<QString> lines;
- for (const QString& str : list) {
- lines.append(str);
- }
-
- QLinkedList<QString>::ConstIterator linesIt = lines.begin();
- QLinkedList<QString>::ConstIterator lEnd = lines.end();
+ const QStringList lines = split(fileContents);
+ auto linesIt = lines.constBegin(), lEnd = lines.constEnd();
DiffHunkList* hunks = model->hunks();
qCDebug(LIBKOMPAREDIFF2) << "Hunks in hunklist: " << hunks->count();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/po/en_GB/libkomparediff2.po
new/libkomparediff2-20.04.0/po/en_GB/libkomparediff2.po
--- old/libkomparediff2-19.12.3/po/en_GB/libkomparediff2.po 2020-03-03
01:26:05.000000000 +0100
+++ new/libkomparediff2-20.04.0/po/en_GB/libkomparediff2.po 2020-04-17
02:35:05.000000000 +0200
@@ -11,7 +11,7 @@
"POT-Creation-Date: 2019-05-20 03:12+0200\n"
"PO-Revision-Date: 2010-05-30 15:14+0100\n"
"Last-Translator: Andrew Coles <andrew_co...@yahoo.co.uk>\n"
-"Language-Team: British English <kde-i18n-...@kde.org>\n"
+"Language-Team: British English <kde-l10n-en...@kde.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/po/ko/libkomparediff2.po
new/libkomparediff2-20.04.0/po/ko/libkomparediff2.po
--- old/libkomparediff2-19.12.3/po/ko/libkomparediff2.po 2020-03-03
01:26:06.000000000 +0100
+++ new/libkomparediff2-20.04.0/po/ko/libkomparediff2.po 2020-04-17
02:35:05.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
+# Shinjo Park <k...@peremen.name>, 2008, 2010, 2014, 2020.
#
-# Shinjo Park <k...@peremen.name>, 2008, 2010, 2014.
msgid ""
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:12+0200\n"
-"PO-Revision-Date: 2014-03-01 01:56+0900\n"
+"PO-Revision-Date: 2020-04-05 12:26+0200\n"
"Last-Translator: Shinjo Park <k...@peremen.name>\n"
"Language-Team: Korean <kde...@kde.org>\n"
"Language: ko\n"
@@ -15,6 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 19.04.3\n"
#: komparemodellist.cpp:68
#, kde-format
@@ -133,8 +134,8 @@
"The diff is malformed. Some lines could not be parsed and will not be "
"displayed in the diff view."
msgstr ""
-"변경 사항 파일이 올바르지 않습니다. 일부 줄을 처리할 수 없어서 표시되지 않을 "
-"것입니다."
+"변경 사항 파일이 올바르지 않습니다. 일부 줄을 처리할 수 없어서 표시되지 않습"
+"니다."
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/po/nb/libkomparediff2.po
new/libkomparediff2-20.04.0/po/nb/libkomparediff2.po
--- old/libkomparediff2-19.12.3/po/nb/libkomparediff2.po 2020-03-03
01:26:06.000000000 +0100
+++ new/libkomparediff2-20.04.0/po/nb/libkomparediff2.po 2020-04-17
02:35:05.000000000 +0200
@@ -11,7 +11,7 @@
"POT-Creation-Date: 2019-05-20 03:12+0200\n"
"PO-Revision-Date: 2013-04-08 21:44+0200\n"
"Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n"
-"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n"
+"Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/po/nn/libkomparediff2.po
new/libkomparediff2-20.04.0/po/nn/libkomparediff2.po
--- old/libkomparediff2-19.12.3/po/nn/libkomparediff2.po 2020-03-03
01:26:07.000000000 +0100
+++ new/libkomparediff2-20.04.0/po/nn/libkomparediff2.po 2020-04-17
02:35:05.000000000 +0200
@@ -9,7 +9,7 @@
"POT-Creation-Date: 2019-05-20 03:12+0200\n"
"PO-Revision-Date: 2019-05-01 11:44+0200\n"
"Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n"
-"Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n"
"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-19.12.3/po/zh_CN/libkomparediff2.po
new/libkomparediff2-20.04.0/po/zh_CN/libkomparediff2.po
--- old/libkomparediff2-19.12.3/po/zh_CN/libkomparediff2.po 2020-03-03
01:26:08.000000000 +0100
+++ new/libkomparediff2-20.04.0/po/zh_CN/libkomparediff2.po 2020-04-17
02:35:06.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:12+0200\n"
-"PO-Revision-Date: 2020-01-20 21:57\n"
+"PO-Revision-Date: 2020-03-25 19:57\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
