Hello community, here is the log from the commit of package libkscreen2 for openSUSE:Factory checked in at 2017-10-09 19:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkscreen2 (Old) and /work/SRC/openSUSE:Factory/.libkscreen2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkscreen2" Mon Oct 9 19:38:45 2017 rev:54 rq:532033 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkscreen2/libkscreen2.changes 2017-08-24 18:09:07.279128795 +0200 +++ /work/SRC/openSUSE:Factory/.libkscreen2.new/libkscreen2.changes 2017-10-09 19:38:48.660399481 +0200 @@ -1,0 +2,26 @@ +Thu Oct 5 12:39:18 CEST 2017 - [email protected] + +- Update to 5.11.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.11.0.php +- Changes since 5.10.95: + * None + +------------------------------------------------------------------- +Thu Sep 14 14:29:05 CEST 2017 - [email protected] + +- Update to 5.10.95 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.10.95.php +- Changes since 5.10.5: + * When cloning a config also clone supportedFeatures + * warnings--; + * let's continue in debug code instead of returning from XRandRConfig::applyKScreenConfig + * Add setScale option to kscreendoctor + * USe Q_DECL_OVERRIDE + * Delete registry before connection + * Update unit test to match scaling + +------------------------------------------------------------------- Old: ---- libkscreen-5.10.5.tar.xz New: ---- libkscreen-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen2.spec ++++++ --- /var/tmp/diff_new_pack.kyW5B7/_old 2017-10-09 19:38:49.272372581 +0200 +++ /var/tmp/diff_new_pack.kyW5B7/_new 2017-10-09 19:38:49.276372405 +0200 @@ -18,7 +18,7 @@ %define lname libKF5Screen7 Name: libkscreen2 -Version: 5.10.5 +Version: 5.11.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -28,7 +28,7 @@ BuildRequires: extra-cmake-modules >= 5.14.0 BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} +BuildRequires: cmake(KF5Wayland) >= 5.14.0 BuildRequires: cmake(Qt5Core) >= 5.4.0 BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Gui) >= 5.4.0 @@ -40,7 +40,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/plasma/%{version}/libkscreen-%{version}.tar.xz +Source: libkscreen-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libkscreen-5.10.5.tar.xz -> libkscreen-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/CMakeLists.txt new/libkscreen-5.11.0/CMakeLists.txt --- old/libkscreen-5.10.5/CMakeLists.txt 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/CMakeLists.txt 2017-10-05 14:44:05.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12) project(libkscreen) -set(PROJECT_VERSION "5.10.5") +set(PROJECT_VERSION "5.11.0") 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.5/autotests/testkwaylanddpms.cpp new/libkscreen-5.11.0/autotests/testkwaylanddpms.cpp --- old/libkscreen-5.10.5/autotests/testkwaylanddpms.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/autotests/testkwaylanddpms.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -55,7 +55,7 @@ private: ConnectionThread *m_connection; QThread *m_thread; - Registry m_registry; + Registry *m_registry; KScreen::WaylandTestServer *m_server; }; @@ -89,10 +89,11 @@ m_connection->initConnection(); QVERIFY(connectedSpy.wait(100)); - m_registry.create(m_connection); - QObject::connect(&m_registry, &Registry::interfacesAnnounced, this, + m_registry = new KWayland::Client::Registry; + m_registry->create(m_connection); + QObject::connect(m_registry, &Registry::interfacesAnnounced, this, [this] { - const bool hasDpms = m_registry.hasInterface(Registry::Interface::Dpms); + const bool hasDpms = m_registry->hasInterface(Registry::Interface::Dpms); if (hasDpms) { qDebug() << QStringLiteral("Compositor provides a DpmsManager"); } else { @@ -100,7 +101,7 @@ } emit this->dpmsAnnounced(); }); - m_registry.setup(); + m_registry->setup(); QVERIFY(dpmsSpy.wait(100)); } @@ -109,13 +110,14 @@ { m_thread->exit(); m_thread->wait(); + delete m_registry; delete m_thread; delete m_connection; } void TestDpmsClient::testDpmsConnect() { - QVERIFY(m_registry.isValid()); + QVERIFY(m_registry->isValid()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/autotests/testlog.cpp new/libkscreen-5.11.0/autotests/testlog.cpp --- old/libkscreen-5.10.5/autotests/testlog.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/autotests/testlog.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -102,6 +102,7 @@ void TestLog::testLog() { auto log = Log::instance(); + Q_UNUSED(log); QFile lf(m_defaultLogFile); lf.remove(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/autotests/testscreenconfig.cpp new/libkscreen-5.11.0/autotests/testscreenconfig.cpp --- old/libkscreen-5.10.5/autotests/testscreenconfig.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/autotests/testscreenconfig.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -156,7 +156,7 @@ QCOMPARE(output->type(), Output::HDMI); QCOMPARE(output->modes().count(), 4); QCOMPARE(output->pos(), QPoint(1280, 0)); - QCOMPARE(output->geometry(), QRect(1280, 0, 1920, 1080)); + QCOMPARE(output->geometry(), QRect(1280, 0, 1920 / 1.4, 1080 / 1.4)); QCOMPARE(output->currentModeId(), QLatin1String("4")); QCOMPARE(output->preferredModeId(), QLatin1String("4")); QCOMPARE(output->rotation(), Output::None); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/backends/fake/fake.h new/libkscreen-5.11.0/backends/fake/fake.h --- old/libkscreen-5.10.5/backends/fake/fake.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/backends/fake/fake.h 2017-10-05 14:44:05.000000000 +0200 @@ -35,12 +35,12 @@ void init(const QVariantMap &arguments) Q_DECL_OVERRIDE; - QString name() const; - QString serviceName() const; - KScreen::ConfigPtr config() const; - void setConfig(const KScreen::ConfigPtr &config); - QByteArray edid(int outputId) const; - bool isValid() const; + QString name() const Q_DECL_OVERRIDE; + QString serviceName() const Q_DECL_OVERRIDE; + KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; + void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE; + QByteArray edid(int outputId) const Q_DECL_OVERRIDE; + bool isValid() const Q_DECL_OVERRIDE; void setConnected(int outputId, bool connected); void setEnabled(int outputId, bool enabled); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/backends/qscreen/qscreenbackend.h new/libkscreen-5.11.0/backends/qscreen/qscreenbackend.h --- old/libkscreen-5.10.5/backends/qscreen/qscreenbackend.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/backends/qscreen/qscreenbackend.h 2017-10-05 14:44:05.000000000 +0200 @@ -39,11 +39,11 @@ explicit QScreenBackend(); virtual ~QScreenBackend(); - virtual QString name() const; - virtual QString serviceName() const; - virtual KScreen::ConfigPtr config() const; - virtual void setConfig(const KScreen::ConfigPtr &config); - virtual bool isValid() const; + QString name() const Q_DECL_OVERRIDE; + QString serviceName() const Q_DECL_OVERRIDE; + KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; + void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE; + bool isValid() const Q_DECL_OVERRIDE; private: bool m_isValid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/backends/xrandr/xrandr.h new/libkscreen-5.11.0/backends/xrandr/xrandr.h --- old/libkscreen-5.10.5/backends/xrandr/xrandr.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/backends/xrandr/xrandr.h 2017-10-05 14:44:05.000000000 +0200 @@ -45,12 +45,12 @@ explicit XRandR(); virtual ~XRandR(); - virtual QString name() const; - virtual QString serviceName() const; - virtual KScreen::ConfigPtr config() const; - virtual void setConfig(const KScreen::ConfigPtr &config); - virtual bool isValid() const; - virtual QByteArray edid(int outputId) const; + QString name() const Q_DECL_OVERRIDE; + QString serviceName() const Q_DECL_OVERRIDE; + KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; + void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE; + bool isValid() const Q_DECL_OVERRIDE; + QByteArray edid(int outputId) const Q_DECL_OVERRIDE; static quint8 *outputEdid(xcb_randr_output_t outputId, size_t &len); static xcb_randr_get_screen_resources_reply_t* screenResources(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/backends/xrandr/xrandrconfig.cpp new/libkscreen-5.11.0/backends/xrandr/xrandrconfig.cpp --- old/libkscreen-5.10.5/backends/xrandr/xrandrconfig.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/backends/xrandr/xrandrconfig.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -200,7 +200,7 @@ // qDebug() << kRealBacktrace(256); printConfig(config); printInternalCond(); - continue; + return; } // If the output would not fit into new screen size, we need to disable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/backends/xrandr1.1/xrandr11.h new/libkscreen-5.11.0/backends/xrandr1.1/xrandr11.h --- old/libkscreen-5.10.5/backends/xrandr1.1/xrandr11.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/backends/xrandr1.1/xrandr11.h 2017-10-05 14:44:05.000000000 +0200 @@ -36,11 +36,11 @@ explicit XRandR11(); virtual ~XRandR11(); - virtual QString name() const; - virtual QString serviceName() const; - virtual KScreen::ConfigPtr config() const; - virtual void setConfig(const KScreen::ConfigPtr &config); - virtual bool isValid() const; + QString name() const Q_DECL_OVERRIDE; + QString serviceName() const Q_DECL_OVERRIDE; + KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; + void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE; + bool isValid() const Q_DECL_OVERRIDE; private Q_SLOTS: void updateConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/config.cpp new/libkscreen-5.11.0/src/config.cpp --- old/libkscreen-5.10.5/src/config.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/config.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -216,7 +216,7 @@ newConfig->addOutput(ourOutput->clone()); } newConfig->d->primaryOutput = newConfig->d->findPrimaryOutput(); - + newConfig->setSupportedFeatures(supportedFeatures()); return newConfig; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/doctor/doctor.cpp new/libkscreen-5.11.0/src/doctor/doctor.cpp --- old/libkscreen-5.10.5/src/doctor/doctor.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/doctor/doctor.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -223,17 +223,7 @@ 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) { @@ -396,25 +386,6 @@ 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.5/src/doctor/doctor.h new/libkscreen-5.11.0/src/doctor/doctor.h --- old/libkscreen-5.10.5/src/doctor/doctor.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/doctor/doctor.h 2017-10-05 14:44:05.000000000 +0200 @@ -51,7 +51,6 @@ 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: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/getconfigoperation.cpp new/libkscreen-5.11.0/src/getconfigoperation.cpp --- old/libkscreen-5.10.5/src/getconfigoperation.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/getconfigoperation.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -38,7 +38,7 @@ public: GetConfigOperationPrivate(GetConfigOperation::Options options, GetConfigOperation *qq); - virtual void backendReady(org::kde::kscreen::Backend* backend); + void backendReady(org::kde::kscreen::Backend* backend) Q_DECL_OVERRIDE; void onConfigReceived(QDBusPendingCallWatcher *watcher); void onEDIDReceived(QDBusPendingCallWatcher *watcher); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/getconfigoperation.h new/libkscreen-5.11.0/src/getconfigoperation.h --- old/libkscreen-5.10.5/src/getconfigoperation.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/getconfigoperation.h 2017-10-05 14:44:05.000000000 +0200 @@ -43,7 +43,7 @@ virtual KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; protected: - void start(); + void start() Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(GetConfigOperation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/setconfigoperation.cpp new/libkscreen-5.11.0/src/setconfigoperation.cpp --- old/libkscreen-5.10.5/src/setconfigoperation.cpp 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/setconfigoperation.cpp 2017-10-05 14:44:05.000000000 +0200 @@ -42,7 +42,7 @@ public: explicit SetConfigOperationPrivate(const KScreen::ConfigPtr &config, ConfigOperation* qq); - void backendReady(org::kde::kscreen::Backend* backend); + void backendReady(org::kde::kscreen::Backend* backend) Q_DECL_OVERRIDE; void onConfigSet(QDBusPendingCallWatcher *watcher); void normalizeOutputPositions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.10.5/src/setconfigoperation.h new/libkscreen-5.11.0/src/setconfigoperation.h --- old/libkscreen-5.10.5/src/setconfigoperation.h 2017-08-22 14:17:28.000000000 +0200 +++ new/libkscreen-5.11.0/src/setconfigoperation.h 2017-10-05 14:44:05.000000000 +0200 @@ -38,7 +38,7 @@ KScreen::ConfigPtr config() const Q_DECL_OVERRIDE; protected: - void start(); + void start() Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(SetConfigOperation)
