Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2018-01-22 16:01:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Mon Jan 22 16:01:46 2018 rev:50 rq:566692 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2018-01-09 14:42:59.784488666 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new/kjobwidgets.changes 2018-01-22 16:01:47.892870296 +0100 @@ -1,0 +2,13 @@ +Tue Jan 16 22:50:18 CET 2018 - lbeltr...@kde.org + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Offer QWindow API for KJobWidgets:: decorators + * it was split + * Autogenerate debug file + +------------------------------------------------------------------- Old: ---- kjobwidgets-5.41.0.tar.xz New: ---- kjobwidgets-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.AWAEe4/_old 2018-01-22 16:01:48.620836230 +0100 +++ /var/tmp/diff_new_pack.AWAEe4/_new 2018-01-22 16:01:48.624836043 +0100 @@ -1,7 +1,7 @@ # # spec file for package kjobwidgets # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5JobWidgets5 -%define _tar_path 5.41 +%define _tar_path 5.42 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kjobwidgets -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -102,6 +102,7 @@ %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5JobWidgets.so.* +%{_kf5_debugdir}/*.categories %files devel %defattr(-,root,root) ++++++ kjobwidgets-5.41.0.tar.xz -> kjobwidgets-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/.reviewboardrc new/kjobwidgets-5.42.0/.reviewboardrc --- old/kjobwidgets-5.41.0/.reviewboardrc 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kjobwidgets' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/CMakeLists.txt new/kjobwidgets-5.42.0/CMakeLists.txt --- old/kjobwidgets-5.41.0/CMakeLists.txt 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/CMakeLists.txt 2018-01-07 17:19:30.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KJobWidgets VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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) @@ -15,7 +15,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) - +include(ECMQtDeclareLoggingCategory) include(ECMPoQmTools) @@ -28,10 +28,8 @@ set(HAVE_X11 ${X11_FOUND}) -if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) -endif() +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) include(GenerateExportHeader) @@ -95,6 +93,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -endif() +install(FILES kjobwidgets.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/kjobwidgets.categories new/kjobwidgets-5.42.0/kjobwidgets.categories --- old/kjobwidgets-5.41.0/kjobwidgets.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kjobwidgets-5.42.0/kjobwidgets.categories 2018-01-07 17:19:30.000000000 +0100 @@ -0,0 +1 @@ +kf5.kjobwidgets kfilewidgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/po/en_GB/kjobwidgets5_qt.po new/kjobwidgets-5.42.0/po/en_GB/kjobwidgets5_qt.po --- old/kjobwidgets-5.41.0/po/en_GB/kjobwidgets5_qt.po 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/po/en_GB/kjobwidgets5_qt.po 2018-01-07 17:19:30.000000000 +0100 @@ -2,15 +2,15 @@ # Malcolm Hunter <malcolm.hun...@gmx.co.uk>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <kde-en...@jriddell.org>, 2003. # Andrew Coles <andrew_co...@yahoo.co.uk>, 2004, 2005, 2009, 2010. -# Steve Allewell <steve.allew...@gmail.com>, 2014, 2016. +# Steve Allewell <steve.allew...@gmail.com>, 2014, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2016-09-16 16:45+0000\n" +"PO-Revision-Date: 2017-12-30 12:14+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: English <kde-l10n-en...@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" @@ -272,7 +272,7 @@ #: kwidgetjobtracker.cpp:576 msgctxt "KWidgetJobTracker|" msgid "Progress Dialog" -msgstr "Progress Dialog" +msgstr "Progress Dialogue" #: kwidgetjobtracker.cpp:591 #, qt-format @@ -293,4 +293,4 @@ #: kwidgetjobtracker.cpp:681 msgctxt "KWidgetJobTracker|" msgid "Click this to collapse the dialog, to hide details" -msgstr "Click this to collapse the dialog, to hide details" +msgstr "Click this to collapse the dialogue, to hide details" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/po/zh_CN/kjobwidgets5_qt.po new/kjobwidgets-5.42.0/po/zh_CN/kjobwidgets5_qt.po --- old/kjobwidgets-5.41.0/po/zh_CN/kjobwidgets5_qt.po 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/po/zh_CN/kjobwidgets5_qt.po 2018-01-07 17:19:30.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2017-07-13 11:17-0400\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -25,6 +25,12 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: crowdin.com\n" "X-Qt-Contexts: true\n" +"X-Qt-Contexts: true\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/kjobwidgets5_qt.pot\n" #: kjobtrackerformatters.cpp:32 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/src/CMakeLists.txt new/kjobwidgets-5.42.0/src/CMakeLists.txt --- old/kjobwidgets-5.41.0/src/CMakeLists.txt 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/src/CMakeLists.txt 2018-01-07 17:19:30.000000000 +0100 @@ -10,10 +10,11 @@ kjobwidgets.cpp kstatusbarjobtracker.cpp kwidgetjobtracker.cpp - debug.cpp ${kjobwidgets_QM_LOADER} ) +ecm_qt_declare_logging_category(kjobwidgets_SRCS HEADER debug.h IDENTIFIER KJOBWIDGETS CATEGORY_NAME kf5.kjobwidgets) + qt5_add_dbus_interfaces(kjobwidgets_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.JobViewServer.xml ) qt5_add_dbus_interface(kjobwidgets_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.JobView.xml jobviewiface ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/src/debug.cpp new/kjobwidgets-5.42.0/src/debug.cpp --- old/kjobwidgets-5.41.0/src/debug.cpp 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/src/debug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "debug.h" - -// logging category for this framework, default: log stuff >= warning -Q_LOGGING_CATEGORY(KJOBWIDGETS, "kf5.kjobwidgets", QtWarningMsg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/src/debug.h new/kjobwidgets-5.42.0/src/debug.h --- old/kjobwidgets-5.41.0/src/debug.h 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/src/debug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KJOBWIDGETS_DEBUG_H -#define KJOBWIDGETS_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KJOBWIDGETS) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/src/kjobwidgets.cpp new/kjobwidgets-5.42.0/src/kjobwidgets.cpp --- old/kjobwidgets-5.41.0/src/kjobwidgets.cpp 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/src/kjobwidgets.cpp 2018-01-07 17:19:30.000000000 +0100 @@ -27,11 +27,7 @@ void KJobWidgets::setWindow(KJob *job, QWidget *widget) { job->setProperty("widget", QVariant::fromValue(widget)); - QWindow *window = widget ? widget->windowHandle() : nullptr; - job->setProperty("window", QVariant::fromValue(window)); - if (window) { - job->setProperty("window-id", QVariant::fromValue(qptrdiff(window->winId()))); - } + KJobWindows::setWindow(job, widget ? widget->windowHandle() : nullptr); } QWidget *KJobWidgets::window(KJob *job) @@ -39,18 +35,6 @@ return job->property("widget").value<QWidget *>(); } -#if 0 -void KJobWidgets::setWindow(KJob *job, QWindow *window) -{ - job->setProperty("window", QVariant::fromValue(window)); -} - -QWindow *KJobWidgets::window(KJob *job) // ### will have to be in a different namespace -{ - return job->property("window").value<QWindow *>(); -} -#endif - // duplicated from kwindowsystem static int timestampCompare(unsigned long time1_, unsigned long time2_) // like strcmp() { @@ -75,3 +59,16 @@ return job->property("userTimestamp").toULongLong(); } + +void KJobWindows::setWindow(KJob *job, QWindow *window) +{ + job->setProperty("window", QVariant::fromValue(window)); + if (window) { + job->setProperty("window-id", QVariant::fromValue(window->winId())); + } +} + +QWindow *KJobWindows::window(KJob *job) +{ + return job->property("window").value<QWindow *>(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.41.0/src/kjobwidgets.h new/kjobwidgets-5.42.0/src/kjobwidgets.h --- old/kjobwidgets-5.41.0/src/kjobwidgets.h 2017-12-02 21:06:27.000000000 +0100 +++ new/kjobwidgets-5.42.0/src/kjobwidgets.h 2018-01-07 17:19:30.000000000 +0100 @@ -45,12 +45,6 @@ KJOBWIDGETS_EXPORT void setWindow(KJob *job, QWidget *widget); /** - * Overload that takes a QWindow. - * @since 5.0 - */ -//KJOBWIDGETS_EXPORT void setWindow(KJob *job, QWindow *window); - -/** * Return the window associated with this job. * @since 5.0 */ @@ -68,4 +62,26 @@ KJOBWIDGETS_EXPORT unsigned long userTimestamp(KJob *job); } +namespace KJobWindows +{ +/** + * Associate this job with a window given by @p window. + * This is used: + * @li by KDialogJobUiDelegate as parent widget for error messages + * @li by KWidgetJobTracker as parent widget for progress dialogs + * @li by KIO::AbstractJobInteractionInterface as parent widget for rename/skip dialogs + * and possibly more. + * @li by KIO::DropJob as parent widget of popup menus. + * This is required on Wayland to properly position the menu. + * @since 5.42 + */ +KJOBWIDGETS_EXPORT void setWindow(KJob *job, QWindow *window); + +/** + * Return the window associated with this job. + * @since 5.42 + */ +KJOBWIDGETS_EXPORT QWindow *window(KJob *job); +} + #endif
