Hello community, here is the log from the commit of package libkscreen2 for openSUSE:Factory checked in at 2017-06-10 17:55:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkscreen2 (Old) and /work/SRC/openSUSE:Factory/.libkscreen2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkscreen2" Sat Jun 10 17:55:19 2017 rev:49 rq:501486 version:5.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libkscreen2/libkscreen2.changes 2017-06-01 16:26:11.638457556 +0200 +++ /work/SRC/openSUSE:Factory/.libkscreen2.new/libkscreen2.changes 2017-06-10 17:55:23.678604308 +0200 @@ -1,0 +2,10 @@ +Tue Jun 6 17:19:56 CEST 2017 - fab...@ritter-vogt.de + +- Update to 5.10.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.10.1.php +- Changes since 5.10.0: + * Add setScale option to kscreendoctor + +------------------------------------------------------------------- Old: ---- libkscreen-5.10.0.tar.xz New: ---- libkscreen-5.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen2.spec ++++++ --- /var/tmp/diff_new_pack.7Sq4Mc/_old 2017-06-10 17:55:25.150396489 +0200 +++ /var/tmp/diff_new_pack.7Sq4Mc/_new 2017-06-10 17:55:25.154395924 +0200 @@ -18,7 +18,7 @@ %define lname libKF5Screen7 Name: libkscreen2 -Version: 5.10.0 +Version: 5.10.1 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -40,7 +40,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: libkscreen-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/libkscreen-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libkscreen-5.10.0.tar.xz -> libkscreen-5.10.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.0/CMakeLists.txt new/libkscreen-5.10.1/CMakeLists.txt --- old/libkscreen-5.10.0/CMakeLists.txt 2017-05-26 10:55:40.000000000 +0200 +++ new/libkscreen-5.10.1/CMakeLists.txt 2017-06-06 13:38:49.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12) project(libkscreen) -set(PROJECT_VERSION "5.10.0") +set(PROJECT_VERSION "5.10.1") find_package(ECM 5.14.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.0/src/doctor/doctor.cpp new/libkscreen-5.10.1/src/doctor/doctor.cpp --- old/libkscreen-5.10.0/src/doctor/doctor.cpp 2017-05-26 10:55:40.000000000 +0200 +++ new/libkscreen-5.10.1/src/doctor/doctor.cpp 2017-06-06 13:38:49.000000000 +0200 @@ -223,7 +223,17 @@ return; } qCDebug(KSCREEN_DOCTOR) << "Output" << output_id << "set mode" << mode_id; - + } else if (ops.count() == 4 && ops[2] == QStringLiteral("scale")) { + int scale = ops[3].toInt(&ok); + if (!ok || scale < 1) { + cerr << "Unable to parse scale" << ops[3] << endl; + qApp->exit(5); + return; + } + if (!setScale(output_id, scale)) { + qApp->exit(1); + return; + } } else if (ops.count() == 4 && ops[2] == QStringLiteral("position")) { QStringList _pos = ops[3].split(','); if (_pos.count() != 2) { @@ -386,6 +396,25 @@ m_changed = true; return true; } + } + cout << "Output with id " << id << " not found." << endl; + return false; +} + +bool Doctor::setScale(int id, const int scale) +{ + if (!m_config) { + qCWarning(KSCREEN_DOCTOR) << "Invalid config."; + return false; + } + + Q_FOREACH (const auto &output, m_config->outputs()) { + if (output->id() == id) { + qCDebug(KSCREEN_DOCTOR) << "Set scale position" << scale; + output->setScale(scale); + m_changed = true; + return true; + } } cout << "Output with id " << id << " not found." << endl; return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.0/src/doctor/doctor.h new/libkscreen-5.10.1/src/doctor/doctor.h --- old/libkscreen-5.10.0/src/doctor/doctor.h 2017-05-26 10:55:40.000000000 +0200 +++ new/libkscreen-5.10.1/src/doctor/doctor.h 2017-06-06 13:38:49.000000000 +0200 @@ -51,6 +51,7 @@ bool setEnabled(int id, bool enabled); bool setPosition(int id, const QPoint &pos); + bool setScale(int id, int scale); bool setMode(int id, const QString &mode_id); Q_SIGNALS:
