commit libkomparediff2 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package libkomparediff2 for
openSUSE:Leap:15.2 checked in at 2020-06-15 05:29:14
Comparing /work/SRC/openSUSE:Leap:15.2/libkomparediff2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.3606 (New)
Package is "libkomparediff2"
Mon Jun 15 05:29:14 2020 rev:60 rq:813999 version:20.04.2
Changes:
--- /work/SRC/openSUSE:Leap:15.2/libkomparediff2/libkomparediff2.changes
2020-05-24 18:08:11.294044086 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.3606/libkomparediff2.changes
2020-06-15 05:29:15.861946202 +0200
@@ -1,0 +2,10 @@
+Tue Jun 9 12:16:16 UTC 2020 - Christophe Giboudeaux
+
+- Update to 20.04.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-06-apps-update
+- Changes since 20.04.1:
+ * Fix broken error emission if blendOriginalIntoModelList went wrong
+
+---
Old:
libkomparediff2-20.04.1.tar.xz
libkomparediff2-20.04.1.tar.xz.sig
New:
libkomparediff2-20.04.2.tar.xz
libkomparediff2-20.04.2.tar.xz.sig
Other differences:
--
++ libkomparediff2.spec ++
--- /var/tmp/diff_new_pack.AfDmkJ/_old 2020-06-15 05:29:16.197947283 +0200
+++ /var/tmp/diff_new_pack.AfDmkJ/_new 2020-06-15 05:29:16.201947296 +0200
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version:20.04.1
+Version:20.04.2
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
++ libkomparediff2-20.04.1.tar.xz -> libkomparediff2-20.04.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/komparemodellist.cpp
new/libkomparediff2-20.04.2/komparemodellist.cpp
--- old/libkomparediff2-20.04.1/komparemodellist.cpp2020-05-06
22:10:31.0 +0200
+++ new/libkomparediff2-20.04.2/komparemodellist.cpp2020-06-07
04:45:24.0 +0200
@@ -269,7 +269,7 @@
if (!blendOriginalIntoModelList(m_info->localSource))
{
qCDebug(LIBKOMPAREDIFF2) << "Oops cant blend original file into
modellist : " << m_info->localSource;
-emit(i18n("There were problems applying the diff %1 to the
file %2.", m_info->destination.url(), m_info->source.url()));
+emit error(i18n("There were problems applying the diff %1
to the file %2.", m_info->destination.url(), m_info->source.url()));
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/po/cs/libkomparediff2.po
new/libkomparediff2-20.04.2/po/cs/libkomparediff2.po
--- old/libkomparediff2-20.04.1/po/cs/libkomparediff2.po2020-05-12
03:21:28.0 +0200
+++ new/libkomparediff2-20.04.2/po/cs/libkomparediff2.po2020-06-09
02:40:31.0 +0200
@@ -1,6 +1,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vit Pelcak , 2013.
+# Vit Pelcak , 2013, 2020.
#
msgid ""
msgstr ""
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.04.0\n"
#: komparemodellist.cpp:68
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/po/fr/libkomparediff2.po
new/libkomparediff2-20.04.2/po/fr/libkomparediff2.po
--- old/libkomparediff2-20.04.1/po/fr/libkomparediff2.po2020-05-12
03:21:28.0 +0200
+++ new/libkomparediff2-20.04.2/po/fr/libkomparediff2.po2020-06-09
02:40:31.0 +0200
@@ -1,6 +1,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# xavier , 2013.
+# xavier , 2013, 2020.
#
msgid ""
msgstr ""
@@ -9,13 +9,13 @@
"POT-Creation-Date: 2020-05-07 09:21+0200\n"
"PO-Revision-Date: 2013-08-13 10:30+0200\n"
"Last-Translator: xavier \n"
-"Language-Team: French \n"
+"Language-Team: French \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.04.0\n"
"X-Environment: kde\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit libkomparediff2 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package libkomparediff2 for
openSUSE:Leap:15.2 checked in at 2020-05-24 18:08:10
Comparing /work/SRC/openSUSE:Leap:15.2/libkomparediff2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.2738 (New)
Package is "libkomparediff2"
Sun May 24 18:08:10 2020 rev:59 rq:806672 version:20.04.1
Changes:
--- /work/SRC/openSUSE:Leap:15.2/libkomparediff2/libkomparediff2.changes
2020-05-12 11:35:59.432196865 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.2738/libkomparediff2.changes
2020-05-24 18:08:11.294044086 +0200
@@ -1,0 +2,11 @@
+Fri May 15 15:42:15 UTC 2020 - Luca Beltrame
+
+- Update to 20.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-05-apps-update
+- Changes since 20.04.0:
+ * Do not crash if real files have less lines than what the patch claims
(kde#420771)
+ * Fix KompareModelList::openDirAndDiff/openFileAndDiff to find the real files
+
+---
@@ -15,2 +25,0 @@
- * For more details please see:
- * https://kde.org/announcements/releases/20.04-rc
@@ -24,2 +32,0 @@
- * For more details please see:
- * https://kde.org/announcements/releases/20.04-beta
@@ -35 +42 @@
- * https://www.kde.org/announcements/releases/19.12.3
+ * https://kde.org/announcements/releases/2020-03-apps-update
@@ -49 +56 @@
- * https://www.kde.org/announcements/releases/19.12.2
+ * https://kde.org/announcements/releases/2020-02-apps-update
Old:
libkomparediff2-20.04.0.tar.xz
libkomparediff2-20.04.0.tar.xz.sig
New:
libkomparediff2-20.04.1.tar.xz
libkomparediff2-20.04.1.tar.xz.sig
Other differences:
--
++ libkomparediff2.spec ++
--- /var/tmp/diff_new_pack.Tw2OKD/_old 2020-05-24 18:08:11.602044752 +0200
+++ /var/tmp/diff_new_pack.Tw2OKD/_new 2020-05-24 18:08:11.602044752 +0200
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version:20.04.0
+Version:20.04.1
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
++ libkomparediff2-20.04.0.tar.xz -> libkomparediff2-20.04.1.tar.xz ++
4827 lines of diff (skipped)
commit libkomparediff2 for openSUSE:Leap:15.2
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
+
+- 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
+
+- 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
+
+- 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.0
+0100
+++ new/libkomparediff2-20.04.0/CMakeLists.txt 2020-04-17 02:35:06.0
+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")
+
commit libkomparediff2 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package libkomparediff2 for
openSUSE:Leap:15.2 checked in at 2020-03-15 07:08:11
Comparing /work/SRC/openSUSE:Leap:15.2/libkomparediff2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.3160 (New)
Package is "libkomparediff2"
Sun Mar 15 07:08:11 2020 rev:57 rq:784012 version:19.12.3
Changes:
--- /work/SRC/openSUSE:Leap:15.2/libkomparediff2/libkomparediff2.changes
2020-02-13 14:40:19.525639827 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.3160/libkomparediff2.changes
2020-03-15 07:08:12.460850115 +0100
@@ -1,0 +2,9 @@
+Thu Mar 5 20:36:44 UTC 2020 - Luca Beltrame
+
+- Update to 19.12.3
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/releases/19.12.3
+- No code change since 19.12.2
+
+---
Old:
libkomparediff2-19.12.2.tar.xz
libkomparediff2-19.12.2.tar.xz.sig
New:
libkomparediff2-19.12.3.tar.xz
libkomparediff2-19.12.3.tar.xz.sig
Other differences:
--
++ libkomparediff2.spec ++
--- /var/tmp/diff_new_pack.R4ofQy/_old 2020-03-15 07:08:12.904850380 +0100
+++ /var/tmp/diff_new_pack.R4ofQy/_new 2020-03-15 07:08:12.908850383 +0100
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version:19.12.2
+Version:19.12.3
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
++ libkomparediff2-19.12.2.tar.xz -> libkomparediff2-19.12.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkomparediff2-19.12.2/po/ca@valencia/libkomparediff2.po
new/libkomparediff2-19.12.3/po/ca@valencia/libkomparediff2.po
--- old/libkomparediff2-19.12.2/po/ca@valencia/libkomparediff2.po
2020-02-04 01:37:42.0 +0100
+++ new/libkomparediff2-19.12.3/po/ca@valencia/libkomparediff2.po
2020-03-03 01:26:05.0 +0100
@@ -84,8 +84,8 @@
#: komparemodellist.cpp:301
#, kde-format
msgid ""
-"There were problems applying the diff %1 to the folder
%2."
+"There were problems applying the diff %1 to the folder %2."
+""
msgstr ""
"S'han produït problemes durant l'aplicació del diff %1 a la "
"carpeta %2."
@@ -117,9 +117,9 @@
"b>. The temporary file is still available under: %2. You can manually "
"copy it to the right place."
msgstr ""
-"No s'ha pogut pujar el fitxer temporal a la localització de destinació
"
-"%1. El fitxer temporal encara és disponible sota: %2. Podeu
copiar-"
-"lo manualment a la ubicació correcta."
+"No s'ha pogut pujar el fitxer temporal a la localització de destinació "
+"%1. El fitxer temporal encara és disponible sota: %2. Podeu "
+"copiar-lo manualment a la ubicació correcta."
#: komparemodellist.cpp:517 komparemodellist.cpp:630 komparemodellist.cpp:650
#, kde-format
commit libkomparediff2 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package libkomparediff2 for
openSUSE:Leap:15.2 checked in at 2020-02-13 14:40:18
Comparing /work/SRC/openSUSE:Leap:15.2/libkomparediff2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.26092 (New)
Package is "libkomparediff2"
Thu Feb 13 14:40:18 2020 rev:56 rq:772066 version:19.12.2
Changes:
--- /work/SRC/openSUSE:Leap:15.2/libkomparediff2/libkomparediff2.changes
2020-01-15 15:21:47.746455110 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.libkomparediff2.new.26092/libkomparediff2.changes
2020-02-13 14:40:19.525639827 +0100
@@ -1,0 +2,14 @@
+Fri Feb 7 08:38:22 UTC 2020 - Christophe Giboudeaux
+
+- Replace %make_jobs with %cmake_build.
+
+---
+Wed Feb 5 06:29:46 UTC 2020 - Luca Beltrame
+
+- Update to 19.12.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/releases/19.12.2
+- No code change since 19.12.1
+
+---
Old:
libkomparediff2-19.12.1.tar.xz
libkomparediff2-19.12.1.tar.xz.sig
New:
libkomparediff2-19.12.2.tar.xz
libkomparediff2-19.12.2.tar.xz.sig
Other differences:
--
++ libkomparediff2.spec ++
--- /var/tmp/diff_new_pack.mwO21V/_old 2020-02-13 14:40:19.933640050 +0100
+++ /var/tmp/diff_new_pack.mwO21V/_new 2020-02-13 14:40:19.937640052 +0100
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version:19.12.1
+Version:19.12.2
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
@@ -81,7 +81,7 @@
%build
%cmake_kf5 -d build
- %make_jobs
+ %cmake_build
%install
%kf5_makeinstall -C build
++ libkomparediff2-19.12.1.tar.xz -> libkomparediff2-19.12.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkomparediff2-19.12.1/po/ca@valencia/libkomparediff2.po
new/libkomparediff2-19.12.2/po/ca@valencia/libkomparediff2.po
--- old/libkomparediff2-19.12.1/po/ca@valencia/libkomparediff2.po
2020-01-07 03:19:14.0 +0100
+++ new/libkomparediff2-19.12.2/po/ca@valencia/libkomparediff2.po
2020-02-04 01:37:42.0 +0100
@@ -84,8 +84,8 @@
#: komparemodellist.cpp:301
#, kde-format
msgid ""
-"There were problems applying the diff %1 to the folder %2."
-""
+"There were problems applying the diff %1 to the folder
%2."
msgstr ""
"S'han produït problemes durant l'aplicació del diff %1 a la "
"carpeta %2."
@@ -117,9 +117,9 @@
"b>. The temporary file is still available under: %2. You can manually "
"copy it to the right place."
msgstr ""
-"No s'ha pogut pujar el fitxer temporal a la localització de destinació "
-"%1. El fitxer temporal encara és disponible sota: %2. Podeu "
-"copiar-lo manualment a la ubicació correcta."
+"No s'ha pogut pujar el fitxer temporal a la localització de destinació
"
+"%1. El fitxer temporal encara és disponible sota: %2. Podeu
copiar-"
+"lo manualment a la ubicació correcta."
#: komparemodellist.cpp:517 komparemodellist.cpp:630 komparemodellist.cpp:650
#, kde-format
@@ -144,764 +144,3 @@
msgstr ""
"El diff està mal format. Algunes línies no es poden analitzar i no es "
"mostraran a la vista de diferències."
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Albert Astals Cid,Antoni Bella"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "aa...@kde.org,antonibel...@yahoo.com"
-
-#~ msgid "Could not load our KompareViewPart."
-#~ msgstr "No s'ha pogut carregar el nostre KompareViewPart."
-
-#~ msgid "Navigation"
-#~ msgstr "Navegació"
-
-#~ msgid "Could not load our KompareNavigationPart."
-#~ msgstr "No s'ha pogut carregar el nostre KompareNavigationPart."
-
-#~ msgid " Diff..."
-#~ msgstr " diff..."
-
-#~ msgid " Files..."
-#~ msgstr " fitxers..."
-
-#~ msgid " URL with Diff..."
-#~ msgstr " l'URL amb el diff..."
-
-#~ msgid "Show T View"
-#~ msgstr "Mostra vista de "
-
-#~ msgid " 0 of 0 differences "
-#~ msgstr " 0 de 0 diferències "
-
-#~ msgid " 0 of 0 files "
-#~ msgstr " 0 de 0 fitxers "
-
-#~ msgid " %2 of %1 file "
-#~ msgid_plural " %2 of %1 files "
-#~ msgstr[0] "%2 d'%1 fitxer "
-#~ msgstr[1] " %2 de %1 fitxers "
-
-#~ msgid " %1 file "
-#~ msgid_plural " %1 files "
-#~ msgstr[0] " %1 fitxer "
-#~ msgstr[1] " %1 fitxers "
-
-#~ msgid " %2 of %1 difference, %3 applied "
-#~ msgid_plural " %2 of %1 differences, %3 applied "
-#~ msgstr[0] " %2 d'%1 diferència, %3 aplicada "
-#~
