Hello community,
here is the log from the commit of package kunitconversion for
openSUSE:Leap:15.2 checked in at 2020-02-16 18:27:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/kunitconversion (Old)
and /work/SRC/openSUSE:Leap:15.2/.kunitconversion.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kunitconversion"
Sun Feb 16 18:27:27 2020 rev:60 rq:773949 version:5.67.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/kunitconversion/kunitconversion.changes
2020-01-19 15:50:08.941797347 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.kunitconversion.new.26092/kunitconversion.changes
2020-02-16 18:28:20.194718507 +0100
@@ -1,0 +2,15 @@
+Sun Feb 2 18:07:12 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Replace %make_jobs with %cmake_build.
+
+-------------------------------------------------------------------
+Sun Feb 2 14:33:00 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.67.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.67.0.php
+- Changes since 5.66.0:
+ * Make it compiles against qt5.15
+
+-------------------------------------------------------------------
Old:
----
kunitconversion-5.66.0.tar.xz
kunitconversion-5.66.0.tar.xz.sig
New:
----
kunitconversion-5.67.0.tar.xz
kunitconversion-5.67.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kunitconversion.spec ++++++
--- /var/tmp/diff_new_pack.nxoHd2/_old 2020-02-16 18:28:20.578718708 +0100
+++ /var/tmp/diff_new_pack.nxoHd2/_new 2020-02-16 18:28:20.578718708 +0100
@@ -17,14 +17,14 @@
%define lname libKF5UnitConversion5
-%define _tar_path 5.66
+%define _tar_path 5.67
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kunitconversion
-Version: 5.66.0
+Version: 5.67.0
Release: 0
Summary: Tool for converting physical units
License: LGPL-2.1-or-later
@@ -42,10 +42,10 @@
BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version}
-BuildRequires: cmake(Qt5Core) >= 5.11.0
-BuildRequires: cmake(Qt5Network) >= 5.11.0
-BuildRequires: cmake(Qt5Test) >= 5.11.0
-BuildRequires: cmake(Qt5Xml) >= 5.11.0
+BuildRequires: cmake(Qt5Core) >= 5.12.0
+BuildRequires: cmake(Qt5Network) >= 5.12.0
+BuildRequires: cmake(Qt5Test) >= 5.12.0
+BuildRequires: cmake(Qt5Xml) >= 5.12.0
%description
KUnitConversion provides functions to convert values in different physical
@@ -69,7 +69,7 @@
Group: Development/Libraries/KDE
Requires: %{lname} = %{version}
Requires: extra-cmake-modules
-Requires: cmake(Qt5Core) >= 5.11.0
+Requires: cmake(Qt5Core) >= 5.12.0
%description devel
KUnitConversion provides functions to convert values in different physical
@@ -84,7 +84,7 @@
%build
%cmake_kf5 -d build
- %make_jobs
+ %cmake_build
%install
%kf5_makeinstall -C build
++++++ kunitconversion-5.66.0.tar.xz -> kunitconversion-5.67.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/CMakeLists.txt
new/kunitconversion-5.67.0/CMakeLists.txt
--- old/kunitconversion-5.66.0/CMakeLists.txt 2020-01-04 11:13:55.000000000
+0100
+++ new/kunitconversion-5.67.0/CMakeLists.txt 2020-02-02 13:54:33.000000000
+0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.66.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.66.0") # handled by release scripts
+set(KF5_VERSION "5.67.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.67.0") # handled by release scripts
project(KUnitConversion VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.66.0 NO_MODULE)
+find_package(ECM 5.67.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -41,7 +41,7 @@
ki18n_install(po)
endif()
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200)
add_definitions(-DQT_NO_FOREACH)
add_subdirectory(src)
if (BUILD_TESTING)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/po/da/kunitconversion5.po
new/kunitconversion-5.67.0/po/da/kunitconversion5.po
--- old/kunitconversion-5.66.0/po/da/kunitconversion5.po 2020-01-04
11:13:55.000000000 +0100
+++ new/kunitconversion-5.67.0/po/da/kunitconversion5.po 2020-02-02
13:54:33.000000000 +0100
@@ -1,14 +1,14 @@
# Copyright (C) 2010 This_file_is_part_of_KDE
# This file is distributed under the same license as the kdelibs package.
#
-# Martin Schlander <[email protected]>, 2009, 2010, 2011, 2015, 2016,
2017, 2018, 2019.
+# Martin Schlander <[email protected]>, 2009, 2010, 2011, 2015, 2016,
2017, 2018, 2019, 2020.
# Anton Rasmussen <[email protected]>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: libconversion\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-08-28 02:48+0200\n"
-"PO-Revision-Date: 2019-11-26 20:04+0100\n"
+"PO-Revision-Date: 2020-01-30 19:52+0100\n"
"Last-Translator: Martin Schlander <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
"Language: da\n"
@@ -1130,12 +1130,12 @@
#: binary_data.cpp:54
#, kde-format
msgid "Binary Data"
-msgstr ""
+msgstr "Binære data"
#: binary_data.cpp:54
#, kde-format
msgid "Binary Data Size"
-msgstr ""
+msgstr "Størrelse på binære data"
#: binary_data.cpp:56
#, kde-format
@@ -2224,15 +2224,12 @@
msgstr "%1 bits"
#: binary_data.cpp:362
-#, fuzzy, kde-format
-#| msgctxt "amount in units (integer)"
-#| msgid "%1 baht"
-#| msgid_plural "%1 baht"
+#, kde-format
msgctxt "amount in units (integer)"
msgid "%1 bit"
msgid_plural "%1 bits"
msgstr[0] "%1 bit"
-msgstr[1] "%1 baht"
+msgstr[1] "%1 bits"
#: currency.cpp:62
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/po/ko/kunitconversion5.po
new/kunitconversion-5.67.0/po/ko/kunitconversion5.po
--- old/kunitconversion-5.66.0/po/ko/kunitconversion5.po 2020-01-04
11:13:55.000000000 +0100
+++ new/kunitconversion-5.67.0/po/ko/kunitconversion5.po 2020-02-02
13:54:33.000000000 +0100
@@ -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 <[email protected]>, 2011, 2014, 2017, 2019.
+# Shinjo Park <[email protected]>, 2011, 2014, 2017, 2019, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-08-28 02:48+0200\n"
-"PO-Revision-Date: 2019-07-24 00:05+0200\n"
+"PO-Revision-Date: 2020-01-26 23:12+0100\n"
"Last-Translator: Shinjo Park <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
"Language: ko\n"
@@ -15,7 +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 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
#: acceleration.cpp:29
#, kde-format
@@ -10312,157 +10312,125 @@
#, kde-format
msgctxt "power unit symbol"
msgid "dBk"
-msgstr ""
+msgstr "dBk"
#: power.cpp:243
-#, fuzzy, kde-format
-#| msgctxt "unit description in lists"
-#| msgid "kilowatts"
+#, kde-format
msgctxt "unit description in lists"
msgid "decibel kilowatts"
-msgstr "킬로와트"
+msgstr "데시벨 킬로와트"
#: power.cpp:244
#, kde-format
msgctxt "unit synonyms for matching user input"
msgid "dBk;dBkW;dB(kW)"
-msgstr ""
+msgstr "dBk;dBkW;dB(kW)"
#: power.cpp:246
-#, fuzzy, kde-format
-#| msgctxt "amount in units (real)"
-#| msgid "%1 kilowatts"
+#, kde-format
msgctxt "amount in units (real)"
msgid "%1 decibel kilowatts"
-msgstr "%1킬로와트"
+msgstr "%1데시벨 킬로와트"
#: power.cpp:247
-#, fuzzy, kde-format
-#| msgctxt "amount in units (integer)"
-#| msgid "%1 kilowatt"
-#| msgid_plural "%1 kilowatts"
+#, kde-format
msgctxt "amount in units (integer)"
msgid "%1 decibel kilowatt"
msgid_plural "%1 decibel kilowatts"
-msgstr[0] "%1킬로와트"
+msgstr[0] "%1데시벨 킬로와트"
#: power.cpp:250
-#, fuzzy, kde-format
-#| msgctxt "power unit symbol"
-#| msgid "dW"
+#, kde-format
msgctxt "power unit symbol"
msgid "dBW"
-msgstr "dW"
+msgstr "dBW"
#: power.cpp:251
-#, fuzzy, kde-format
-#| msgctxt "unit description in lists"
-#| msgid "deciwatts"
+#, kde-format
msgctxt "unit description in lists"
msgid "decibel watts"
-msgstr "데시와트"
+msgstr "데시벨 와트"
#: power.cpp:252
#, kde-format
msgctxt "unit synonyms for matching user input"
msgid "dBW;dB(W)"
-msgstr ""
+msgstr "dBW;dB(W)"
#: power.cpp:254
-#, fuzzy, kde-format
-#| msgctxt "amount in units (real)"
-#| msgid "%1 deciwatts"
+#, kde-format
msgctxt "amount in units (real)"
msgid "%1 decibel watts"
-msgstr "%1데시와트"
+msgstr "%1데시벨 와트"
#: power.cpp:255
-#, fuzzy, kde-format
-#| msgctxt "amount in units (integer)"
-#| msgid "%1 deciwatt"
-#| msgid_plural "%1 deciwatts"
+#, kde-format
msgctxt "amount in units (integer)"
msgid "%1 decibel watt"
msgid_plural "%1 decibel watts"
-msgstr[0] "%1데시와트"
+msgstr[0] "%1데시벨 와트"
#: power.cpp:258
-#, fuzzy, kde-format
-#| msgctxt "length unit symbol"
-#| msgid "dm"
+#, kde-format
msgctxt "power unit symbol"
msgid "dBm"
-msgstr "dm"
+msgstr "dBm"
#: power.cpp:259
-#, fuzzy, kde-format
-#| msgctxt "unit description in lists"
-#| msgid "milliwatts"
+#, kde-format
msgctxt "unit description in lists"
msgid "decibel milliwatts"
-msgstr "밀리와트"
+msgstr "데시벨 밀리와트"
#: power.cpp:260
#, kde-format
msgctxt "unit synonyms for matching user input"
msgid "dBm;dBmW;dB(mW)"
-msgstr ""
+msgstr "dBm;dBmW;dB(mW)"
#: power.cpp:262
-#, fuzzy, kde-format
-#| msgctxt "amount in units (real)"
-#| msgid "%1 milliwatts"
+#, kde-format
msgctxt "amount in units (real)"
msgid "%1 decibel milliwatts"
-msgstr "%1밀리와트"
+msgstr "%1데시벨 밀리와트"
#: power.cpp:263
-#, fuzzy, kde-format
-#| msgctxt "amount in units (integer)"
-#| msgid "%1 milliwatt"
-#| msgid_plural "%1 milliwatts"
+#, kde-format
msgctxt "amount in units (integer)"
msgid "%1 decibel milliwatt"
msgid_plural "%1 decibel milliwatts"
-msgstr[0] "%1밀리와트"
+msgstr[0] "%1데시벨 밀리와트"
#: power.cpp:266
#, kde-format
msgctxt "power unit symbol"
msgid "dBµW"
-msgstr ""
+msgstr "dBµW"
#: power.cpp:267
-#, fuzzy, kde-format
-#| msgctxt "unit description in lists"
-#| msgid "microwatts"
+#, kde-format
msgctxt "unit description in lists"
msgid "decibel microwatts"
-msgstr "마이크로와트"
+msgstr "데시벨 마이크로와트"
#: power.cpp:268
#, kde-format
msgctxt "unit synonyms for matching user input"
msgid "dBuW;dBµW;dB(uW);dB(µW)"
-msgstr ""
+msgstr "dBuW;dBµW;dB(uW);dB(µW)"
#: power.cpp:270
-#, fuzzy, kde-format
-#| msgctxt "amount in units (real)"
-#| msgid "%1 microwatts"
+#, kde-format
msgctxt "amount in units (real)"
msgid "%1 decibel microwatts"
-msgstr "%1마이크로와트"
+msgstr "%1데시벨 마이크로와트"
#: power.cpp:271
-#, fuzzy, kde-format
-#| msgctxt "amount in units (integer)"
-#| msgid "%1 microwatt"
-#| msgid_plural "%1 microwatts"
+#, kde-format
msgctxt "amount in units (integer)"
msgid "%1 decibel microwatt"
msgid_plural "%1 decibel microwatts"
-msgstr[0] "%1마이크로와트"
+msgstr[0] "%1데시벨 마이크로와트"
#: pressure.cpp:29
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/po/sk/kunitconversion5.po
new/kunitconversion-5.67.0/po/sk/kunitconversion5.po
--- old/kunitconversion-5.66.0/po/sk/kunitconversion5.po 2020-01-04
11:13:55.000000000 +0100
+++ new/kunitconversion-5.67.0/po/sk/kunitconversion5.po 2020-02-02
13:54:33.000000000 +0100
@@ -1,20 +1,20 @@
# translation of libkunitconversion.po to Slovak
# Roman Paholik <[email protected]>, 2014, 2016.
# Mthw <[email protected]>, 2019.
-# Matej Mrenica <[email protected]>, 2019.
+# Matej Mrenica <[email protected]>, 2019, 2020.
msgid ""
msgstr ""
"Project-Id-Version: libkunitconversion\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-08-28 02:48+0200\n"
-"PO-Revision-Date: 2019-12-03 19:15+0100\n"
+"PO-Revision-Date: 2020-01-14 17:27+0100\n"
"Last-Translator: Matej Mrenica <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 19.11.90\n"
+"X-Generator: Lokalize 19.12.1\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: acceleration.cpp:29
@@ -16111,7 +16111,8 @@
msgctxt "unit synonyms for matching user input"
msgid ""
"fluid ounce;fluid ounces;fl.oz.;oz.fl.;oz. fl.;fl. oz.;fl oz;fluid ounce"
-msgstr "dutá unca;duté unce;fl.oz.;oz.fl.;oz. fl.;fl. oz.;fl oz;dutá unca"
+msgstr ""
+"tekutá unca;tekuté unce;fl.oz.;oz.fl.;oz. fl.;fl. oz.;fl oz;tekutá unca"
#: volume.cpp:423
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/po/zh_CN/kunitconversion5.po
new/kunitconversion-5.67.0/po/zh_CN/kunitconversion5.po
--- old/kunitconversion-5.66.0/po/zh_CN/kunitconversion5.po 2020-01-04
11:13:55.000000000 +0100
+++ new/kunitconversion-5.67.0/po/zh_CN/kunitconversion5.po 2020-02-02
13:54:33.000000000 +0100
@@ -20,15 +20,14 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-08-28 02:48+0200\n"
-"PO-Revision-Date: 2019-11-19 23:01\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"PO-Revision-Date: 2020-01-20 21:48\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
"X-Crowdin-Project: kdeorg\n"
"X-Crowdin-Language: zh-CN\n"
"X-Crowdin-File: /kf5-trunk/messages/frameworks/kunitconversion5.pot\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kunitconversion-5.66.0/src/currency.cpp
new/kunitconversion-5.67.0/src/currency.cpp
--- old/kunitconversion-5.66.0/src/currency.cpp 2020-01-04 11:13:55.000000000
+0100
+++ new/kunitconversion-5.67.0/src/currency.cpp 2020-02-02 13:54:33.000000000
+0100
@@ -672,7 +672,11 @@
QNetworkAccessManager manager;
auto *reply =
manager.get(QNetworkRequest(QUrl(QString::fromLatin1(URL)))); // reply is owned
by the network access manager
QObject::connect(reply, &QNetworkReply::finished, [&] {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
if (!reply->error()) {
+#else
+ if (!reply->networkError()) {
+#endif
const QString cacheDir = info.absolutePath();
if (!QFileInfo::exists(cacheDir)) {
QDir().mkpath(cacheDir);
