Hello community, here is the log from the commit of package libksysguard5 for openSUSE:Factory checked in at 2020-03-12 22:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksysguard5 (Old) and /work/SRC/openSUSE:Factory/.libksysguard5.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksysguard5" Thu Mar 12 22:59:56 2020 rev:101 rq:783642 version:5.18.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libksysguard5/libksysguard5.changes 2020-03-05 23:16:52.625129556 +0100 +++ /work/SRC/openSUSE:Factory/.libksysguard5.new.3160/libksysguard5.changes 2020-03-12 23:00:03.683032706 +0100 @@ -1,0 +2,13 @@ +Tue Mar 10 14:55:32 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.3.php +- Changes since 5.18.2: + * Only deprecate up to target frameworks + * Only link to Qt5WebChannel if Qt5WebEngineWidgets available +- Drop patches, now upstream: + * 0001-Only-link-to-Qt5WebChannel-if-Qt5WebEngineWidgets-av.patch + +------------------------------------------------------------------- Old: ---- 0001-Only-link-to-Qt5WebChannel-if-Qt5WebEngineWidgets-av.patch libksysguard-5.18.2.tar.xz libksysguard-5.18.2.tar.xz.sig New: ---- libksysguard-5.18.3.tar.xz libksysguard-5.18.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.xPPRq8/_old 2020-03-12 23:00:05.447033410 +0100 +++ /var/tmp/diff_new_pack.xPPRq8/_new 2020-03-12 23:00:05.499033430 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: libksysguard5 -Version: 5.18.2 +Version: 5.18.3 Release: 0 Summary: Task management and system monitoring library License: GPL-2.0-or-later @@ -30,8 +30,6 @@ Source2: plasma.keyring %endif Source3: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch1: 0001-Only-link-to-Qt5WebChannel-if-Qt5WebEngineWidgets-av.patch BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem BuildRequires: xz ++++++ libksysguard-5.18.2.tar.xz -> libksysguard-5.18.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/CMakeLists.txt new/libksysguard-5.18.3/CMakeLists.txt --- old/libksysguard-5.18.2/CMakeLists.txt 2020-02-25 14:16:51.000000000 +0100 +++ new/libksysguard-5.18.3/CMakeLists.txt 2020-03-10 14:08:39.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(libksysguard) -set(PROJECT_VERSION "5.18.2") +set(PROJECT_VERSION "5.18.3") set(PROJECT_VERSION_MAJOR 5) # check with non-Plasma consumers (e.g. KDevelop) before bumping these versions @@ -26,7 +26,7 @@ include(CheckLibraryExists) include(FeatureSummary) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS DBus Network Widgets WebChannel) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS DBus Network Widgets) find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} CONFIG) set_package_properties(Qt5WebEngineWidgets PROPERTIES URL "git://code.qt.org/qt/qtwebenginewidgets.git" @@ -34,6 +34,13 @@ TYPE OPTIONAL PURPOSE "Used by the HTML-based GUI ksysguard library" ) +find_package(Qt5WebChannel ${QT_MIN_VERSION} CONFIG) +set_package_properties(Qt5WebChannel PROPERTIES + URL "git://code.qt.org/qt/qtwebchannel.git" + DESCRIPTION "Qt WebChannel module" + TYPE OPTIONAL + PURPOSE "Used by the HTML-based GUI ksysguard library" + ) find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO) find_package(KF5 OPTIONAL_COMPONENTS Plasma) @@ -75,9 +82,14 @@ endif() endif() +set(WEBENGINE_SCRIPTING_ENABLED FALSE) +if(Qt5WebEngineWidgets_FOUND AND Qt5WebChannel_FOUND) + set(WEBENGINE_SCRIPTING_ENABLED TRUE) +endif() +add_feature_info("Scripting plugin support" WEBENGINE_SCRIPTING_ENABLED "Support scripting plugins using WebEngine and WebChannel") + set(HAVE_X11 ${X11_FOUND}) set(HAVE_XRES ${X11_XRes_FOUND}) -set(HAVE_QTWEBENGINEWIDGETS ${Qt5WebEngineWidgets_FOUND}) configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h ) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) @@ -86,7 +98,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) if (EXISTS "${CMAKE_SOURCE_DIR}/.git") - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) endif() set(CMAKE_CXX_STANDARD 14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/config-ksysguard.h.cmake new/libksysguard-5.18.3/config-ksysguard.h.cmake --- old/libksysguard-5.18.2/config-ksysguard.h.cmake 2020-02-25 14:15:59.000000000 +0100 +++ new/libksysguard-5.18.3/config-ksysguard.h.cmake 2020-03-10 14:07:57.000000000 +0100 @@ -10,8 +10,8 @@ /* Define to 1 if you have the X11 xres file */ #cmakedefine HAVE_XRES 1 -/* Define if you have QtWebEngineWidgets */ -#cmakedefine01 HAVE_QTWEBENGINEWIDGETS +/* Define if you have QtWebEngineWidgets and QtWebChannel */ +#cmakedefine01 WEBENGINE_SCRIPTING_ENABLED /* Define if you have X11 at all */ #cmakedefine01 HAVE_X11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/po/id/ksgrd.po new/libksysguard-5.18.3/po/id/ksgrd.po --- old/libksysguard-5.18.2/po/id/ksgrd.po 2020-02-25 14:16:26.000000000 +0100 +++ new/libksysguard-5.18.3/po/id/ksgrd.po 2020-03-10 14:08:18.000000000 +0100 @@ -1,6 +1,6 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the libksysguard package. -# Wantoyo <wanto...@gmail.com>, 2018, 2019. +# Wantoyo <wanto...@gmail.com>, 2018, 2019, 2020. # msgid "" msgstr "" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.08.3\n" +"X-Generator: Lokalize 19.12.1\n" #: SensorAgent.cpp:111 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/po/zh_CN/ksgrd.po new/libksysguard-5.18.3/po/zh_CN/ksgrd.po --- old/libksysguard-5.18.2/po/zh_CN/ksgrd.po 2020-02-25 14:16:48.000000000 +0100 +++ new/libksysguard-5.18.3/po/zh_CN/ksgrd.po 2020-03-10 14:08:37.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-11-28 03:39+0100\n" -"PO-Revision-Date: 2020-01-20 21:55\n" +"PO-Revision-Date: 2020-03-10 10:57\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/po/zh_CN/ksysguardlsofwidgets.po new/libksysguard-5.18.3/po/zh_CN/ksysguardlsofwidgets.po --- old/libksysguard-5.18.2/po/zh_CN/ksysguardlsofwidgets.po 2020-02-25 14:16:48.000000000 +0100 +++ new/libksysguard-5.18.3/po/zh_CN/ksysguardlsofwidgets.po 2020-03-10 14:08:37.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 03:25+0200\n" -"PO-Revision-Date: 2020-01-20 21:55\n" +"POT-Creation-Date: 2019-08-30 07:52+0200\n" +"PO-Revision-Date: 2020-03-10 10:57\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/po/zh_CN/processcore.po new/libksysguard-5.18.3/po/zh_CN/processcore.po --- old/libksysguard-5.18.2/po/zh_CN/processcore.po 2020-02-25 14:16:48.000000000 +0100 +++ new/libksysguard-5.18.3/po/zh_CN/processcore.po 2020-03-10 14:08:37.000000000 +0100 @@ -5,7 +5,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-14 03:29+0200\n" -"PO-Revision-Date: 2020-01-20 21:55\n" +"PO-Revision-Date: 2020-03-10 10:58\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/po/zh_CN/processui.po new/libksysguard-5.18.3/po/zh_CN/processui.po --- old/libksysguard-5.18.2/po/zh_CN/processui.po 2020-02-25 14:16:48.000000000 +0100 +++ new/libksysguard-5.18.3/po/zh_CN/processui.po 2020-03-10 14:08:37.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-28 03:23+0200\n" -"PO-Revision-Date: 2020-01-20 21:55\n" +"PO-Revision-Date: 2020-03-10 10:58\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -691,8 +691,8 @@ "*/io and is documented further in Documentation/accounting and Documentation/" "filesystems/proc.txt in the kernel source." msgstr "" -"此栏目显示的是每个进程的 IO 状态，它提供以下的信息。<br><table><tr><td>读取字" -"符数</td><td>此任务从存储介质上读取到的字符数，这个数据是相应进程流经过 " +"<qt>此栏目显示的是每个进程的 IO 状态，它提供以下的信息。<br><table><tr><td>读" +"取字符数</td><td>此任务从存储介质上读取到的字符数，这个数据是相应进程流经过 " "read() 和 pread() 系统调用的所有字节数的简单相加和，其中也包括终端 IO 和其它" "不涉及真实磁盘读写的内容(如页面缓存字节)。</td></tr><tr><td>写入字符数</" "td><td>此任务向存储介质上已写入的字符数，数据来源和读取字符数类似。</td></" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/processui/CMakeLists.txt new/libksysguard-5.18.3/processui/CMakeLists.txt --- old/libksysguard-5.18.2/processui/CMakeLists.txt 2020-02-25 14:15:59.000000000 +0100 +++ new/libksysguard-5.18.3/processui/CMakeLists.txt 2020-03-10 14:07:57.000000000 +0100 @@ -37,7 +37,6 @@ KF5::ConfigCore PRIVATE Qt5::DBus - Qt5::WebChannel KF5::I18n KF5::WindowSystem KF5::AuthCore @@ -59,8 +58,8 @@ target_link_libraries(processui PRIVATE Qt5::X11Extras KF5::WindowSystem) endif() -if(Qt5WebEngineWidgets_FOUND) - target_link_libraries(processui PRIVATE Qt5::WebEngineWidgets) +if(WEBENGINE_SCRIPTING_ENABLED) + target_link_libraries(processui PRIVATE Qt5::WebEngineWidgets Qt5::WebChannel) endif() if(NOT HAVE_CLOCK_GETTIME_C) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/processui/scripting.cpp new/libksysguard-5.18.3/processui/scripting.cpp --- old/libksysguard-5.18.2/processui/scripting.cpp 2020-02-25 14:15:59.000000000 +0100 +++ new/libksysguard-5.18.3/processui/scripting.cpp 2020-03-10 14:07:57.000000000 +0100 @@ -43,7 +43,7 @@ #include <QMessageBox> #include <QDialogButtonBox> -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED #include <QWebChannel> #include <QWebEngineSettings> #include <QWebEngineView> @@ -53,7 +53,7 @@ #include <qtwebenginewidgetsversion.h> #endif -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED class RemoteUrlInterceptor : public QWebEngineUrlRequestInterceptor { public: RemoteUrlInterceptor(QObject *parent) : QWebEngineUrlRequestInterceptor(parent) {} @@ -81,7 +81,7 @@ connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED QVBoxLayout *layout = new QVBoxLayout; layout->addWidget(&m_webView); layout->addWidget(buttonBox); @@ -95,7 +95,7 @@ #endif #endif } -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED QWebEngineView *webView() { return &m_webView; } @@ -134,7 +134,7 @@ mScriptPath = path; mScriptName = name; -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED QUrl fileName = QUrl::fromLocalFile(path + QStringLiteral("index.html")); if(!mScriptingHtmlDialog) { mScriptingHtmlDialog = new ScriptingHtmlDialog(this); @@ -250,7 +250,7 @@ i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); #endif } -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED void Scripting::zoomIn() { QWebEngineView *webView = mScriptingHtmlDialog->webView(); webView->setZoomFactor( webView->zoomFactor() * 1.1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksysguard-5.18.2/processui/scripting.h new/libksysguard-5.18.3/processui/scripting.h --- old/libksysguard-5.18.2/processui/scripting.h 2020-02-25 14:15:59.000000000 +0100 +++ new/libksysguard-5.18.3/processui/scripting.h 2020-03-10 14:07:57.000000000 +0100 @@ -56,7 +56,7 @@ private Q_SLOTS: /** Run the script associated with the QAction that called this slot */ void runScriptSlot(); -#if HAVE_QTWEBENGINEWIDGETS +#if WEBENGINE_SCRIPTING_ENABLED void setupJavascriptObjects(); void refreshScript(); void zoomIn();
