Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2015-04-13 20:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2015-03-16 09:27:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new/kjobwidgets.changes 2015-04-13 20:23:02.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 4 14:40:32 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * Propagate error code to JobView DBus interface + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + +------------------------------------------------------------------- Old: ---- kjobwidgets-5.8.0.tar.xz New: ---- kjobwidgets-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.dfX5QK/_old 2015-04-13 20:23:03.000000000 +0200 +++ /var/tmp/diff_new_pack.dfX5QK/_new 2015-04-13 20:23:03.000000000 +0200 @@ -16,19 +16,22 @@ # +%bcond_without lang %define lname libKF5JobWidgets5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kjobwidgets -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kcoreaddons-devel >= %{kf5_version} +BuildRequires: kcoreaddons-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +%if %{with lang} BuildRequires: libqt5-linguist-devel >= 5.2.0 +%endif BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 @@ -48,7 +51,9 @@ %package -n %lname Summary: Widgets for showing progress of asynchronous jobs Group: System/GUI/KDE +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %description -n %lname KJobWIdgets provides widgets for showing progress of asynchronous jobs. @@ -58,7 +63,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kcoreaddons-devel >= %{kf5_version} +Requires: kcoreaddons-devel >= %{_tar_path} Requires: pkgconfig(Qt5Widgets) >= 5.2.0 %description devel @@ -75,15 +80,19 @@ %install %kf5_makeinstall -C build - %fdupes %{buildroot}%{_kf5_sharedir} + %fdupes %{buildroot} - %find_lang %{name}5 --with-qt --without-mo +%if %{with lang} +%find_lang %{name}5 --with-qt --without-mo +%endif %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%if %{with lang} %files -n %lname-lang -f %{name}5.lang +%endif %files -n %lname %defattr(-,root,root) ++++++ kjobwidgets-5.8.0.tar.xz -> kjobwidgets-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/CMakeLists.txt new/kjobwidgets-5.9.0/CMakeLists.txt --- old/kjobwidgets-5.8.0/CMakeLists.txt 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/CMakeLists.txt 2015-04-04 14:08:56.000000000 +0200 @@ -2,7 +2,7 @@ project(KJobWidgets) -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -12,8 +12,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.8.0") # handled by release scripts -set(KF5_DEP_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_DEP_VERSION "5.9.0") # handled by release scripts set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/po/fr/kjobwidgets5_qt.po new/kjobwidgets-5.9.0/po/fr/kjobwidgets5_qt.po --- old/kjobwidgets-5.8.0/po/fr/kjobwidgets5_qt.po 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/po/fr/kjobwidgets5_qt.po 2015-04-04 14:08:56.000000000 +0200 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-06-29 22:06+0200\n" "Last-Translator: Sebastien Renard <ren...@kde.org>\n" "Language-Team: French <kde-francoph...@kde.org>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/src/CMakeLists.txt new/kjobwidgets-5.9.0/src/CMakeLists.txt --- old/kjobwidgets-5.8.0/src/CMakeLists.txt 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/src/CMakeLists.txt 2015-04-04 14:08:56.000000000 +0200 @@ -16,7 +16,6 @@ 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 ) -qt5_add_dbus_interface(kjobwidgets_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.JobViewV2.xml jobviewifacev2 ) add_library(KF5JobWidgets ${kjobwidgets_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/src/kuiserverjobtracker.cpp new/kjobwidgets-5.9.0/src/kuiserverjobtracker.cpp --- old/kjobwidgets-5.8.0/src/kuiserverjobtracker.cpp 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/src/kuiserverjobtracker.cpp 2015-04-04 14:08:56.000000000 +0200 @@ -22,7 +22,6 @@ #include "kuiserverjobtracker_p.h" #include "jobviewiface.h" -#include "jobviewifacev2.h" #include "debug.h" #include <kjob.h> @@ -147,6 +146,8 @@ org::kde::JobViewV2 *jobView = d->progressJobView.take(job); + jobView->setError(job->error()); + if (job->error()) { jobView->terminate(job->errorText()); } else { @@ -164,6 +165,8 @@ org::kde::JobViewV2 *jobView = d->progressJobView.take(job); + jobView->setError(job->error()); + if (job->error()) { jobView->terminate(job->errorText()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/src/kuiserverjobtracker_p.h new/kjobwidgets-5.9.0/src/kuiserverjobtracker_p.h --- old/kjobwidgets-5.8.0/src/kuiserverjobtracker_p.h 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/src/kuiserverjobtracker_p.h 2015-04-04 14:08:56.000000000 +0200 @@ -27,7 +27,6 @@ #include <QtCore/QMap> #include "jobviewserverinterface.h" -#include "jobviewiface.h" class KSharedUiServerProxy : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.8.0/src/org.kde.JobView.xml new/kjobwidgets-5.9.0/src/org.kde.JobView.xml --- old/kjobwidgets-5.8.0/src/org.kde.JobView.xml 2015-03-07 15:46:16.000000000 +0100 +++ new/kjobwidgets-5.9.0/src/org.kde.JobView.xml 2015-04-04 14:08:56.000000000 +0200 @@ -1,7 +1,7 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> <node> - <interface name="org.kde.JobView"> + <interface name="org.kde.JobViewV2"> <method name="terminate"> <arg name="errorMessage" type="s" direction="in"/> <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/> @@ -42,7 +42,14 @@ <arg name="number" type="u" direction="in"/> <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/> </method> - + <method name="setDestUrl"> + <arg name="destUrl" type="v" direction="in"/> + <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/> + </method> + <method name="setError"> + <arg name="errorCode" type="u" direction="in"/> + <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/> + </method> <signal name="suspendRequested"/> <signal name="resumeRequested"/> <signal name="cancelRequested"/>
