Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2019-04-19 21:23:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Fri Apr 19 21:23:21 2019 rev:66 rq:695235 version:5.57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2019-03-21 09:47:04.646886797 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new.5536/kjobwidgets.changes 2019-04-19 21:23:21.743796149 +0200 @@ -1,0 +2,11 @@ +Sun Apr 14 20:21:43 UTC 2019 - [email protected] + +- Update to 5.57.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.57.0.php +- Changes since 5.56.0: + * [KUiServerJobTracker] Update destUrl before finishing the job + * It compiles without foreach + +------------------------------------------------------------------- Old: ---- kjobwidgets-5.56.0.tar.xz New: ---- kjobwidgets-5.57.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.fjfjJV/_old 2019-04-19 21:23:23.079797850 +0200 +++ /var/tmp/diff_new_pack.fjfjJV/_new 2019-04-19 21:23:23.099797875 +0200 @@ -17,14 +17,14 @@ %define lname libKF5JobWidgets5 -%define _tar_path 5.56 +%define _tar_path 5.57 # 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: kjobwidgets -Version: 5.56.0 +Version: 5.57.0 Release: 0 Summary: Widgets for showing progress of asynchronous jobs License: LGPL-2.1-or-later ++++++ kjobwidgets-5.56.0.tar.xz -> kjobwidgets-5.57.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/.gitignore new/kjobwidgets-5.57.0/.gitignore --- old/kjobwidgets-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kjobwidgets-5.57.0/.gitignore 2019-04-07 09:29:58.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/CMakeLists.txt new/kjobwidgets-5.57.0/CMakeLists.txt --- old/kjobwidgets-5.56.0/CMakeLists.txt 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/CMakeLists.txt 2019-04-07 09:29:58.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.56.0") # handled by release scripts -set(KF5_DEP_VERSION "5.56.0") # handled by release scripts +set(KF5_VERSION "5.57.0") # handled by release scripts +set(KF5_DEP_VERSION "5.57.0") # handled by release scripts project(KJobWidgets VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.56.0 NO_MODULE) +find_package(ECM 5.57.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -45,7 +45,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5JobWidgetsConfigVersion.cmake" SOVERSION 5) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) - +add_definitions(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/po/id/kjobwidgets5_qt.po new/kjobwidgets-5.57.0/po/id/kjobwidgets5_qt.po --- old/kjobwidgets-5.56.0/po/id/kjobwidgets5_qt.po 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/po/id/kjobwidgets5_qt.po 2019-04-07 09:29:58.000000000 +0200 @@ -16,7 +16,7 @@ "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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 18.12.1\n" "X-Qt-Contexts: true\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/po/nn/kjobwidgets5_qt.po new/kjobwidgets-5.57.0/po/nn/kjobwidgets5_qt.po --- old/kjobwidgets-5.56.0/po/nn/kjobwidgets5_qt.po 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/po/nn/kjobwidgets5_qt.po 2019-04-07 09:29:58.000000000 +0200 @@ -73,17 +73,17 @@ msgid "%1 and %2" msgstr "%1 og %2" -#: kstatusbarjobtracker.cpp:163 +#: kstatusbarjobtracker.cpp:166 msgctxt "KStatusBarJobTracker|" msgid "Stop" msgstr "Stopp" -#: kstatusbarjobtracker.cpp:244 +#: kstatusbarjobtracker.cpp:247 msgctxt "KStatusBarJobTracker|" msgid " Stalled " msgstr " Stoppa " -#: kstatusbarjobtracker.cpp:246 +#: kstatusbarjobtracker.cpp:249 #, qt-format msgctxt "KStatusBarJobTracker|" msgid " %1/s " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/po/te/kjobwidgets5_qt.po new/kjobwidgets-5.57.0/po/te/kjobwidgets5_qt.po --- old/kjobwidgets-5.56.0/po/te/kjobwidgets5_qt.po 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/po/te/kjobwidgets5_qt.po 2019-04-07 09:29:58.000000000 +0200 @@ -22,8 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " -"4;\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Qt-Contexts: true\n" #: kjobtrackerformatters.cpp:40 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/po/zh_CN/kjobwidgets5_qt.po new/kjobwidgets-5.57.0/po/zh_CN/kjobwidgets5_qt.po --- old/kjobwidgets-5.56.0/po/zh_CN/kjobwidgets5_qt.po 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/po/zh_CN/kjobwidgets5_qt.po 2019-04-07 09:29:58.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-02-20 23:16\n" +"PO-Revision-Date: 2019-03-07 09:22\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.56.0/src/kuiserverjobtracker.cpp new/kjobwidgets-5.57.0/src/kuiserverjobtracker.cpp --- old/kjobwidgets-5.56.0/src/kuiserverjobtracker.cpp 2019-03-02 14:44:08.000000000 +0100 +++ new/kjobwidgets-5.57.0/src/kuiserverjobtracker.cpp 2019-04-07 09:29:58.000000000 +0200 @@ -43,6 +43,8 @@ void _k_killJob(); + static void updateDestUrl(KJob *job, org::kde::JobViewV2 *jobView); + QHash<KJob *, org::kde::JobViewV2 *> progressJobView; }; @@ -59,6 +61,14 @@ } } +void KUiServerJobTracker::Private::updateDestUrl(KJob *job, org::kde::JobViewV2 *jobView) +{ + const QVariant destUrl = job->property("destUrl"); + if (destUrl.isValid()) { + jobView->setDestUrl(QDBusVariant(destUrl)); + } +} + KUiServerJobTracker::KUiServerJobTracker(QObject *parent) : KJobTrackerInterface(parent), d(new Private(this)) { @@ -114,10 +124,7 @@ QObject::connect(jobView, &org::kde::JobViewV2::resumeRequested, job, &KJob::resume); - QVariant destUrl = job->property("destUrl"); - if (destUrl.isValid()) { - jobView->setDestUrl(QDBusVariant(destUrl)); - } + d->updateDestUrl(job, jobView); if (!jobWatch) { //qCDebug(KJOBWIDGETS) << "deleted out from under us when creating the dbus interface"; @@ -146,6 +153,8 @@ org::kde::JobViewV2 *jobView = d->progressJobView.take(job); + d->updateDestUrl(job, jobView); + jobView->setError(job->error()); if (job->error()) { @@ -165,6 +174,8 @@ org::kde::JobViewV2 *jobView = d->progressJobView.take(job); + d->updateDestUrl(job, jobView); + jobView->setError(job->error()); if (job->error()) {
