Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2022-01-11 21:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Tue Jan 11 21:16:32 2022 rev:99 rq:945068 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2021-12-13 20:44:28.528485660 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new.1892/kjobwidgets.changes 2022-01-11 21:19:12.968956570 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:42 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Change the build system to enable building with Qt6 + * KUIServerV2JobTracker: Add "transient" property support + +------------------------------------------------------------------- Old: ---- kjobwidgets-5.89.0.tar.xz kjobwidgets-5.89.0.tar.xz.sig New: ---- kjobwidgets-5.90.0.tar.xz kjobwidgets-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.uraOpW/_old 2022-01-11 21:19:13.508956951 +0100 +++ /var/tmp/diff_new_pack.uraOpW/_new 2022-01-11 21:19:13.512956954 +0100 @@ -17,21 +17,21 @@ %define lname libKF5JobWidgets5 -%define _tar_path 5.89 +%define _tar_path 5.90 # 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 +%bcond_without released Name: kjobwidgets -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Widgets for showing progress of asynchronous jobs License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -46,7 +46,7 @@ BuildRequires: cmake(Qt5Widgets) >= 5.15.0 BuildRequires: cmake(Qt5X11Extras) >= 5.15.0 BuildRequires: pkgconfig(x11) -%if %{with lang} +%if %{with released} BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif @@ -56,7 +56,6 @@ %package -n %{lname} Summary: Widgets for showing progress of asynchronous jobs Group: System/GUI/KDE -Recommends: %{lname}-lang = %{version} %description -n %{lname} KJobWIdgets provides widgets for showing progress of asynchronous jobs. @@ -86,14 +85,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 --with-qt --without-mo %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kjobwidgets-5.89.0.tar.xz -> kjobwidgets-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/CMakeLists.txt new/kjobwidgets-5.90.0/CMakeLists.txt --- old/kjobwidgets-5.89.0/CMakeLists.txt 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/CMakeLists.txt 2022-01-01 13:33:10.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KJobWidgets VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -21,10 +21,10 @@ set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) if (NOT ANDROID) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() if (NOT APPLE) find_package(X11) @@ -32,6 +32,14 @@ set(HAVE_X11 ${X11_FOUND}) +if (HAVE_X11) + if (QT_MAJOR_VERSION STREQUAL "5") + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + else() + # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Widgets above + endif() +endif() + find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF_DEP_VERSION} REQUIRED) @@ -51,7 +59,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5JobWidgetsConfigVersion.cmake" SOVERSION 5) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) ecm_install_po_files_as_qm(po) add_subdirectory(src) @@ -93,7 +101,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjobwidgets_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/KF5JobWidgetsConfig.cmake.in new/kjobwidgets-5.90.0/KF5JobWidgetsConfig.cmake.in --- old/kjobwidgets-5.89.0/KF5JobWidgetsConfig.cmake.in 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/KF5JobWidgetsConfig.cmake.in 2022-01-01 13:33:10.000000000 +0100 @@ -3,7 +3,7 @@ set(KJOBWIDGETS_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Widgets @REQUIRED_QT_VERSION@) find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5JobWidgetsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/autotests/CMakeLists.txt new/kjobwidgets-5.90.0/autotests/CMakeLists.txt --- old/kjobwidgets-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:33:10.000000000 +0100 @@ -1,10 +1,10 @@ -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) include(ECMAddTests) #TODO: add tests #ecm_add_tests( # footest.cpp -# LINK_LIBRARIES Qt5::Test +# LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test #) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/po/ca@valencia/kjobwidgets5_qt.po new/kjobwidgets-5.90.0/po/ca@valencia/kjobwidgets5_qt.po --- old/kjobwidgets-5.89.0/po/ca@valencia/kjobwidgets5_qt.po 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/po/ca@valencia/kjobwidgets5_qt.po 2022-01-01 13:33:10.000000000 +0100 @@ -6,17 +6,17 @@ # Sebasti?? Pla i Sanz <s...@sastia.com>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <antonibel...@yahoo.com>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <aa...@kde.org>, 2004, 2005, 2007. -# Josep Ma. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep M. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Robert Millan <r...@aybabtu.com>, 2009. # Orestes Mas <ores...@tsc.upc.edu>, 2010. -# Empar <montoro_...@gva.es>, 2019. +# Empar Montoro Mart??n <montoro_...@gva.es>, 2019. msgid "" msgstr "" "Project-Id-Version: kjobwidgets\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2019-06-17 13:28+0200\n" -"Last-Translator: Empar <montoro_...@gva.es>\n" +"Last-Translator: Empar Montoro Mart??n <montoro_...@gva.es>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/po/zh_CN/kjobwidgets5_qt.po new/kjobwidgets-5.90.0/po/zh_CN/kjobwidgets5_qt.po --- old/kjobwidgets-5.89.0/po/zh_CN/kjobwidgets5_qt.po 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/po/zh_CN/kjobwidgets5_qt.po 2022-01-01 13:33:10.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:06\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/src/CMakeLists.txt new/kjobwidgets-5.90.0/src/CMakeLists.txt --- old/kjobwidgets-5.89.0/src/CMakeLists.txt 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/src/CMakeLists.txt 2022-01-01 13:33:10.000000000 +0100 @@ -12,7 +12,7 @@ ecm_create_qm_loader(KF5JobWidgets kjobwidgets5_qt) set(kjobwidgets_dbus_SRCS) -if (TARGET Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) qt_add_dbus_interfaces(kjobwidgets_dbus_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.JobViewServer.xml ) qt_add_dbus_interface(kjobwidgets_dbus_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.JobView.xml jobviewiface ) @@ -39,7 +39,7 @@ ${kjobwidgets_dbus_SRCS} ) -if (TARGET Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) target_sources(KF5JobWidgets PRIVATE kuiserverjobtracker.cpp kuiserverjobtracker.h @@ -68,22 +68,25 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5JobWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KJobWidgets>") +target_include_directories(KF5JobWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KJobWidgets>") target_link_libraries(KF5JobWidgets PUBLIC - Qt5::Widgets + Qt${QT_MAJOR_VERSION}::Widgets KF5::CoreAddons # KJob PRIVATE KF5::WidgetsAddons # KSqueezedTextLabel ) -if (TARGET Qt5::DBus) - target_link_libraries(KF5JobWidgets PRIVATE Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(KF5JobWidgets PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() if (HAVE_X11) - find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - target_link_libraries(KF5JobWidgets PRIVATE Qt5::X11Extras) + if (TARGET Qt5::X11Extras) + target_link_libraries(KF5JobWidgets PRIVATE Qt5::X11Extras) + elseif (TARGET Qt6::Gui) + target_link_libraries(KF5JobWidgets PRIVATE Qt6::GuiPrivate) # qtx11extras_p.h + endif() endif () ecm_generate_headers(KJobWidgets_HEADERS @@ -140,7 +143,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjobwidgets_export.h ${KJobWidgets_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KJobWidgets COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KJobWidgets COMPONENT Devel ) ecm_qt_install_logging_categories( @@ -175,5 +178,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KJobWidgets LIB_NAME KF5JobWidgets DEPS "widgets KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KJobWidgets) +ecm_generate_pri_file(BASE_NAME KJobWidgets LIB_NAME KF5JobWidgets DEPS "widgets KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KJobWidgets) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/src/kdialogjobuidelegate.cpp new/kjobwidgets-5.90.0/src/kdialogjobuidelegate.cpp --- old/kjobwidgets-5.89.0/src/kdialogjobuidelegate.cpp 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/src/kdialogjobuidelegate.cpp 2022-01-01 13:33:10.000000000 +0100 @@ -19,8 +19,12 @@ #include <config-kjobwidgets.h> #if HAVE_X11 +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else #include <QX11Info> #endif +#endif struct MessageBoxData { QWidget *widget; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/src/kuiserverv2jobtracker.cpp new/kjobwidgets-5.90.0/src/kuiserverv2jobtracker.cpp --- old/kjobwidgets-5.89.0/src/kuiserverv2jobtracker.cpp 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/src/kuiserverv2jobtracker.cpp 2022-01-01 13:33:10.000000000 +0100 @@ -111,6 +111,10 @@ // Must not clear currentState as only Plasma 5.22+ will use properties from "hints", // there must still be a full update() call for earlier versions! + if (job->property("transientProgressReporting").toBool()) { + hints.insert(QStringLiteral("transient"), true); + } + auto reply = serverProxy()->uiserver()->requestView(desktopEntry, job->capabilities(), hints); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, q); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/tests/CMakeLists.txt new/kjobwidgets-5.90.0/tests/CMakeLists.txt --- old/kjobwidgets-5.89.0/tests/CMakeLists.txt 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/tests/CMakeLists.txt 2022-01-01 13:33:10.000000000 +0100 @@ -1,12 +1,12 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) macro(kjobwidgets_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Test KF5::JobWidgets) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::Test KF5::JobWidgets) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro() @@ -18,5 +18,5 @@ set(kjobcreator_SRCS kjobcreator.cpp) qt_wrap_ui(kjobcreator_SRCS kjobcreator.ui) add_executable(kjobcreator ${kjobcreator_SRCS}) -target_link_libraries(kjobcreator Qt5::Widgets KF5::JobWidgets) +target_link_libraries(kjobcreator Qt${QT_MAJOR_VERSION}::Widgets KF5::JobWidgets) ecm_mark_as_test(kjobcreator) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/tests/kjobcreator.cpp new/kjobwidgets-5.90.0/tests/kjobcreator.cpp --- old/kjobwidgets-5.89.0/tests/kjobcreator.cpp 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/tests/kjobcreator.cpp 2022-01-01 13:33:10.000000000 +0100 @@ -302,6 +302,7 @@ m_job->setProperty("destUrl", m_ui.destUrl->text()); m_job->setProperty("immediateProgressReporting", m_ui.immediateCheck->isChecked()); + m_job->setProperty("transientProgressReporting", m_ui.transientCheck->isChecked()); m_job->setPercentage(m_ui.percent->value()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.89.0/tests/kjobcreator.ui new/kjobwidgets-5.90.0/tests/kjobcreator.ui --- old/kjobwidgets-5.89.0/tests/kjobcreator.ui 2021-12-04 19:39:26.000000000 +0100 +++ new/kjobwidgets-5.90.0/tests/kjobcreator.ui 2022-01-01 13:33:10.000000000 +0100 @@ -300,6 +300,13 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="transientCheck"> + <property name="text"> + <string>Transient</string> + </property> + </widget> + </item> </layout> </item> <item row="12" column="0">
