Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2020-12-15 12:29:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Tue Dec 15 12:29:39 2020 rev:89 rq:855466 version:5.77.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2020-11-23 10:33:22.017550469 +0100 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new.2328/kwindowsystem.changes 2020-12-15 12:31:57.776076618 +0100 @@ -1,0 +2,12 @@ +Mon Dec 7 17:14:49 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.77.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.77.0 +- Changes since 5.76.0: + * Pass parent to Q*Layout ctor instead of calling setLayout() + * Load statically linked integration plugins + * Portaway from pid() to processId() + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.76.0.tar.xz kwindowsystem-5.76.0.tar.xz.sig New: ---- kwindowsystem-5.77.0.tar.xz kwindowsystem-5.77.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.VqjjIj/_old 2020-12-15 12:31:58.516077215 +0100 +++ /var/tmp/diff_new_pack.VqjjIj/_new 2020-12-15 12:31:58.520077218 +0100 @@ -17,14 +17,14 @@ %define lname libKF5WindowSystem5 -%define _tar_path 5.76 +%define _tar_path 5.77 # 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 Name: kwindowsystem -Version: 5.76.0 +Version: 5.77.0 Release: 0 Summary: KDE Access to window manager License: LGPL-2.1-or-later @@ -40,16 +40,16 @@ BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Test) >= 5.12.0 -BuildRequires: cmake(Qt5Widgets) >= 5.12.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.12.0 +BuildRequires: cmake(Qt5Test) >= 5.13.0 +BuildRequires: cmake(Qt5Widgets) >= 5.13.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.13.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xrender) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.12.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.13.0 %endif %description @@ -80,8 +80,8 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.12.0 -Requires: cmake(Qt5Widgets) >= 5.12.0 +Requires: cmake(Qt5Core) >= 5.13.0 +Requires: cmake(Qt5Widgets) >= 5.13.0 Requires: pkgconfig(x11) Requires: pkgconfig(xcb) ++++++ kwindowsystem-5.76.0.tar.xz -> kwindowsystem-5.77.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/CMakeLists.txt new/kwindowsystem-5.77.0/CMakeLists.txt --- old/kwindowsystem-5.76.0/CMakeLists.txt 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/CMakeLists.txt 2020-12-05 13:59:19.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.76.0") # handled by release scripts +set(KF5_VERSION "5.77.0") # handled by release scripts project(KWindowSystem VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.76.0 NO_MODULE) +find_package(ECM 5.77.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) @@ -46,7 +46,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.12.0) +set(REQUIRED_QT_VERSION 5.13.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets) if (APPLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/autotests/netwininfotestclient.cpp new/kwindowsystem-5.77.0/autotests/netwininfotestclient.cpp --- old/kwindowsystem-5.76.0/autotests/netwininfotestclient.cpp 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/autotests/netwininfotestclient.cpp 2020-12-05 13:59:19.000000000 +0100 @@ -367,17 +367,17 @@ INFO QCOMPARE(info.pid(), 0); - info.setPid(m_xvfb->pid()); - QCOMPARE(info.pid(), m_xvfb->pid()); + info.setPid(m_xvfb->processId()); + QCOMPARE(info.pid(), m_xvfb->processId()); // compare with the X property QVERIFY(atom != XCB_ATOM_NONE); GETPROP(XCB_ATOM_CARDINAL, 1, 32) - QCOMPARE(reinterpret_cast<uint32_t *>(xcb_get_property_value(reply.data()))[0], uint32_t(m_xvfb->pid())); + QCOMPARE(reinterpret_cast<uint32_t *>(xcb_get_property_value(reply.data()))[0], uint32_t(m_xvfb->processId())); // and wait for our event waitForPropertyChange(&info, atom, NET::WMPid); - QCOMPARE(info.pid(), m_xvfb->pid()); + QCOMPARE(info.pid(), m_xvfb->processId()); } void NetWinInfoTestClient::performNameTest(xcb_atom_t atom, const char *(NETWinInfo:: *getter)(void)const, void (NETWinInfo:: *setter)(const char *), NET::Property property) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/po/ml/kwindowsystem5_qt.po new/kwindowsystem-5.77.0/po/ml/kwindowsystem5_qt.po --- old/kwindowsystem-5.76.0/po/ml/kwindowsystem5_qt.po 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/po/ml/kwindowsystem5_qt.po 2020-12-05 13:59:19.000000000 +0100 @@ -20,8 +20,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -"X-Poedit-Country: INDIA\n" "X-Qt-Contexts: true\n" #: platforms/osx/kwindowsystem.cpp:567 platforms/windows/kwindowsystem.cpp:619 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.77.0/po/zh_CN/kwindowsystem5_qt.po --- old/kwindowsystem-5.76.0/po/zh_CN/kwindowsystem5_qt.po 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/po/zh_CN/kwindowsystem5_qt.po 2020-12-05 13:59:19.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-10-08 19:21\n" +"PO-Revision-Date: 2020-11-10 15:01\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/kwindowsystem-5.76.0/src/kwindowsystemplugininterface_p.h new/kwindowsystem-5.77.0/src/kwindowsystemplugininterface_p.h --- old/kwindowsystem-5.76.0/src/kwindowsystemplugininterface_p.h 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/src/kwindowsystemplugininterface_p.h 2020-12-05 13:59:19.000000000 +0100 @@ -17,6 +17,8 @@ class KWindowShadowTilePrivate; class KWindowSystemPrivate; +#define KWindowSystemPluginInterface_iid "org.kde.kwindowsystem.KWindowSystemPluginInterface" + class KWINDOWSYSTEM_EXPORT KWindowSystemPluginInterface : public QObject { Q_OBJECT @@ -31,6 +33,6 @@ virtual KWindowShadowTilePrivate *createWindowShadowTile(); }; -Q_DECLARE_INTERFACE(KWindowSystemPluginInterface, "org.kde.kwindowsystem.KWindowSystemPluginInterface") +Q_DECLARE_INTERFACE(KWindowSystemPluginInterface, KWindowSystemPluginInterface_iid) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/src/pluginwrapper.cpp new/kwindowsystem-5.77.0/src/pluginwrapper.cpp --- old/kwindowsystem-5.76.0/src/pluginwrapper.cpp 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/src/pluginwrapper.cpp 2020-12-05 13:59:19.000000000 +0100 @@ -44,6 +44,15 @@ return ret; } +static bool checkPlatform(const QJsonObject &metadata, const QString &platformName) +{ + const QJsonArray platforms = metadata.value(QStringLiteral("MetaData")) + .toObject().value(QStringLiteral("platforms")).toArray(); + return std::any_of(platforms.begin(), platforms.end(), [&platformName](const QJsonValue &value) { + return QString::compare(platformName, value.toString(), Qt::CaseInsensitive) == 0; + }); +} + static KWindowSystemPluginInterface *loadPlugin() { if (!qobject_cast<QGuiApplication *>(QCoreApplication::instance())) { @@ -59,24 +68,37 @@ platformName = flatpakPlatform; } } + + const QVector<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins(); + for (const QStaticPlugin &staticPlugin : staticPlugins) { + const QJsonObject metadata = staticPlugin.metaData(); + if (metadata.value(QLatin1String("IID")) != QLatin1String(KWindowSystemPluginInterface_iid)) { + continue; + } + if (checkPlatform(metadata, platformName)) { + KWindowSystemPluginInterface *interface = qobject_cast<KWindowSystemPluginInterface *>(staticPlugin.instance()); + if (interface) { + qCDebug(LOG_KWINDOWSYSTEM) << "Loaded a static plugin for platform" << platformName; + return interface; + } + } + } + const auto candidates = pluginCandidates(); for (const QString &candidate : candidates) { if (!QLibrary::isLibrary(candidate)) { continue; } QPluginLoader loader(candidate); - QJsonObject metaData = loader.metaData(); - const QJsonArray platforms = metaData.value(QStringLiteral("MetaData")).toObject().value(QStringLiteral("platforms")).toArray(); - for (auto it = platforms.begin(); it != platforms.end(); ++it) { - if (QString::compare(platformName, (*it).toString(), Qt::CaseInsensitive) == 0) { - KWindowSystemPluginInterface *interface = qobject_cast< KWindowSystemPluginInterface* >(loader.instance()); - if (interface) { - qCDebug(LOG_KWINDOWSYSTEM) << "Loaded plugin" << candidate << "for platform" << platformName; - return interface; - } + if (checkPlatform(loader.metaData(), platformName)) { + KWindowSystemPluginInterface *interface = qobject_cast<KWindowSystemPluginInterface *>(loader.instance()); + if (interface) { + qCDebug(LOG_KWINDOWSYSTEM) << "Loaded plugin" << candidate << "for platform" << platformName; + return interface; } } } + qCWarning(LOG_KWINDOWSYSTEM) << "Could not find any platform plugin"; return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/tests/backgroundcontrasttest.cpp new/kwindowsystem-5.77.0/tests/backgroundcontrasttest.cpp --- old/kwindowsystem-5.76.0/tests/backgroundcontrasttest.cpp 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/tests/backgroundcontrasttest.cpp 2020-12-05 13:59:19.000000000 +0100 @@ -92,7 +92,7 @@ connect(m_intSlider, &QSlider::valueChanged, this, &ContrastTestWindow::updateIntensity); connect(m_satSlider, &QSlider::valueChanged, this, &ContrastTestWindow::updateSaturation); - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(m_btnNothing); layout->addWidget(m_btnFullWindow); layout->addWidget(m_btnRect); @@ -101,7 +101,6 @@ layout->addWidget(m_intSlider); layout->addWidget(m_satSlider); layout->addWidget(m_area); - setLayout(layout); } void ContrastTestWindow::disableContrast() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/tests/blurbehindtest.cpp new/kwindowsystem-5.77.0/tests/blurbehindtest.cpp --- old/kwindowsystem-5.76.0/tests/blurbehindtest.cpp 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/tests/blurbehindtest.cpp 2020-12-05 13:59:19.000000000 +0100 @@ -58,13 +58,12 @@ connect(m_btnRect, &QPushButton::clicked, this, &BlurTestWindow::enableBlurRect); connect(m_btnEllipse, &QPushButton::clicked, this, &BlurTestWindow::enableBlurEllipse); - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(m_btnNothing); layout->addWidget(m_btnFullWindow); layout->addWidget(m_btnRect); layout->addWidget(m_btnEllipse); layout->addWidget(m_area); - setLayout(layout); } void BlurTestWindow::disableBlur() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.76.0/tests/icontest.cpp new/kwindowsystem-5.77.0/tests/icontest.cpp --- old/kwindowsystem-5.76.0/tests/icontest.cpp 2020-11-07 13:19:21.000000000 +0100 +++ new/kwindowsystem-5.77.0/tests/icontest.cpp 2020-12-05 13:59:19.000000000 +0100 @@ -89,7 +89,6 @@ addIcons(QStringLiteral("ClassHint"), KWindowSystem::ClassHint); addIcons(QStringLiteral("XApp"), KWindowSystem::XApp); - window.setLayout(vbox); window.show(); return app.exec(); _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
