Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwin5 for openSUSE:Factory checked in at 2021-10-13 18:03:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwin5 (Old) and /work/SRC/openSUSE:Factory/.kwin5.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwin5" Wed Oct 13 18:03:31 2021 rev:150 rq:924707 version:5.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwin5/kwin5.changes 2021-09-04 22:33:14.291983119 +0200 +++ /work/SRC/openSUSE:Factory/.kwin5.new.2443/kwin5.changes 2021-10-13 18:05:30.811220698 +0200 @@ -1,0 +2,24 @@ +Thu Oct 7 13:50:07 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.23.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.23.0 +- Too many changes to list here +- Drop patches, now upstream: + * 0001-Fix-build-on-32bit-platforms.patch +- Add new key + signature to plasma.keyring + +------------------------------------------------------------------- +Thu Sep 16 13:04:54 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.22.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.90 +- Too many changes to list here +- Adjust 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch +- Add patch to fix build on 32bit: + * 0001-Fix-build-on-32bit-platforms.patch + +------------------------------------------------------------------- Old: ---- kwin-5.22.5.tar.xz kwin-5.22.5.tar.xz.sig New: ---- kwin-5.23.0.tar.xz kwin-5.23.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwin5.spec ++++++ --- /var/tmp/diff_new_pack.Yd2o7r/_old 2021-10-13 18:05:31.723222128 +0200 +++ /var/tmp/diff_new_pack.Yd2o7r/_new 2021-10-13 18:05:31.727222134 +0200 @@ -17,14 +17,14 @@ # Internal QML imports -%global __requires_exclude qmlimport\\((org\\.kde\\.private\\.kcms\\.kwin\\.effects|org\\.kde\\.kcms\\.kwinrules).* +%global __requires_exclude qmlimport\\((org\\.kde\\.private\\.kcms\\.kwin\\.effects|org\\.kde\\.kcms\\.kwinrules|org\\.kde\\.kwin\\.private\\.overview).* %global kf5_version 5.54.0 %global qt5_version 5.11.0 %global wayland (0%{?suse_version} >= 1330) %bcond_without lang Name: kwin5 -Version: 5.22.5 +Version: 5.23.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -34,9 +34,9 @@ License: GPL-2.0-or-later AND GPL-3.0-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/kwin-%{version}.tar.xz +Source: kwin-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/kwin-%{version}.tar.xz.sig +Source1: kwin-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FEATURE-OPENSUSE @@ -47,6 +47,9 @@ Patch103: 0001-Bypass-wayland-interface-blacklisting.patch BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes +%if 0%{?suse_version} < 1550 +BuildRequires: gcc10-c++ +%endif BuildRequires: kf5-filesystem BuildRequires: libQt5Core-private-headers-devel >= 5.5.0 BuildRequires: libQt5Gui-private-headers-devel >= 5.5.0 @@ -127,7 +130,7 @@ %if %{wayland} BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libdrm) >= 2.4.62 -BuildRequires: pkgconfig(libinput) >= 1.9 +BuildRequires: pkgconfig(libinput) >= 1.14 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(wayland-egl) # Don't use pkgconfig here as that would cause unresolvables on 0.1 -> 0.2 -> 0.3 bumps @@ -157,6 +160,7 @@ # For displaying full monitor vendor names Recommends: hwdata Provides: qt5qmlimport(org.kde.kwin.2) = 0 +Provides: qt5qmlimport(org.kde.kwin.3) = 0 %description KWin is the window manager of the K desktop environment. @@ -179,7 +183,11 @@ %autosetup -p1 -n kwin-%{version} %build +%if 0%{?suse_version} < 1550 + export CXX=g++-10 +%endif %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_build %install @@ -244,11 +252,11 @@ %{_kf5_plugindir}/kcms/kcm_virtualkeyboard.so %dir %{_kf5_plugindir}/kpackage/ %dir %{_kf5_plugindir}/kpackage/packagestructure/ -%{_kf5_plugindir}/kpackage/packagestructure/kwin_packagestructure_aurorae.so -%{_kf5_plugindir}/kpackage/packagestructure/kwin_packagestructure_decoration.so -%{_kf5_plugindir}/kpackage/packagestructure/kwin_packagestructure_effect.so -%{_kf5_plugindir}/kpackage/packagestructure/kwin_packagestructure_scripts.so -%{_kf5_plugindir}/kpackage/packagestructure/kwin_packagestructure_windowswitcher.so +%{_kf5_plugindir}/kpackage/packagestructure/kwin_aurorae.so +%{_kf5_plugindir}/kpackage/packagestructure/kwin_decoration.so +%{_kf5_plugindir}/kpackage/packagestructure/kwin_effect.so +%{_kf5_plugindir}/kpackage/packagestructure/kwin_script.so +%{_kf5_plugindir}/kpackage/packagestructure/kwin_windowswitcher.so %dir %{_kf5_plugindir}/kwin/ %dir %{_kf5_plugindir}/kwin/effects/ %dir %{_kf5_plugindir}/kwin/effects/configs/ @@ -261,12 +269,8 @@ %{_kf5_plugindir}/kwin/plugins/libKWinNightColorPlugin.so %{_kf5_plugindir}/kwin/effects/configs/kcm_kwin4_genericscripted.so %{_kf5_plugindir}/kwin/effects/configs/kwin_blur_config.so -%{_kf5_plugindir}/kwin/effects/configs/kwin_coverswitch_config.so -%{_kf5_plugindir}/kwin/effects/configs/kwin_cube_config.so -%{_kf5_plugindir}/kwin/effects/configs/kwin_cubeslide_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_desktopgrid_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_diminactive_config.so -%{_kf5_plugindir}/kwin/effects/configs/kwin_flipswitch_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_glide_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_invert_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_lookingglass_config.so @@ -284,6 +288,7 @@ %{_kf5_plugindir}/kwin/effects/configs/kwin_windowgeometry_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_wobblywindows_config.so %{_kf5_plugindir}/kwin/effects/configs/kwin_zoom_config.so +%{_kf5_plugindir}/kwin/effects/configs/kwin_overview_config.so %{_kf5_plugindir}/kwincompositing.so %dir %{_kf5_plugindir}/org.kde.kdecoration2/ %{_kf5_plugindir}/org.kde.kdecoration2/kwin5_aurorae.so @@ -292,7 +297,6 @@ %dir %{_kf5_plugindir}/org.kde.kwin.scenes/ %{_kf5_plugindir}/org.kde.kwin.scenes/KWinSceneOpenGL.so %{_kf5_plugindir}/org.kde.kwin.scenes/KWinSceneQPainter.so -%{_kf5_plugindir}/org.kde.kwin.scenes/KWinSceneXRender.so %dir %{_kf5_plugindir}/org.kde.kwin.waylandbackends/ %{_kf5_plugindir}/org.kde.kwin.waylandbackends/KWinWaylandDrmBackend.so %{_kf5_plugindir}/org.kde.kwin.waylandbackends/KWinWaylandFbdevBackend.so ++++++ 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch ++++++ --- /var/tmp/diff_new_pack.Yd2o7r/_old 2021-10-13 18:05:31.747222165 +0200 +++ /var/tmp/diff_new_pack.Yd2o7r/_new 2021-10-13 18:05:31.747222165 +0200 @@ -1,38 +1,56 @@ -From 6c3999f106a66563e32352efc3ae483745c7d09c Mon Sep 17 00:00:00 2001 +From 6166db42a61d80a3d8202162c598d1476572f5a1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> -Date: Wed, 10 Feb 2021 21:23:40 +0100 +Date: Wed, 18 Aug 2021 18:38:18 +0200 Subject: [PATCH] Export consistent hostname as XAUTHLOCALHOSTNAME To deal with hostname changes, FamilyWild is used for Xauthority, but for Xsm XAUTHLOCALHOSTNAME is also set (boo#1177835, downstream patch in xtrans). The hostname is read once on startup and then used consistently. --- - src/xwl/xwayland.cpp | 8 +++++--- - src/xwl/xwayland.h | 1 + - 2 files changed, 6 insertions(+), 3 deletions(-) + src/helpers/wayland_wrapper/kwin_wrapper.cpp | 6 +++++- + src/xwl/lib/xauthority.cpp | 3 +-- + src/xwl/lib/xauthority.h | 3 ++- + 3 files changed, 8 insertions(+), 4 deletions(-) -Index: kwin-5.17.80git.20210329T113728~72cc1daf2/src/xwl/xwayland.cpp -=================================================================== ---- kwin-5.17.80git.20210329T113728~72cc1daf2.orig/src/xwl/xwayland.cpp 2021-03-30 07:04:25.529356779 +0200 -+++ kwin-5.17.80git.20210329T113728~72cc1daf2/src/xwl/xwayland.cpp 2021-03-30 07:07:32.663603468 +0200 -@@ -52,6 +52,7 @@ - Xwayland::Xwayland(ApplicationWaylandAbstract *app, QObject *parent) - : XwaylandInterface(parent) - , m_app(app) -+ , m_hostname(QHostInfo::localHostName().toUtf8()) - { - m_resetCrashCountTimer = new QTimer(this); - m_resetCrashCountTimer->setSingleShot(true); -@@ -97,7 +98,7 @@ +diff --git a/src/helpers/wayland_wrapper/kwin_wrapper.cpp b/src/helpers/wayland_wrapper/kwin_wrapper.cpp +index 6ec91383e..722bdaed3 100644 +--- a/src/helpers/wayland_wrapper/kwin_wrapper.cpp ++++ b/src/helpers/wayland_wrapper/kwin_wrapper.cpp +@@ -22,6 +22,7 @@ + + #include <QCoreApplication> + #include <QDebug> ++#include <QHostInfo> + #include <QProcess> + + #include <QTemporaryFile> +@@ -68,8 +69,11 @@ KWinWrapper::KWinWrapper(QObject *parent) + } + if (m_xwlSocket) { + if (!qEnvironmentVariableIsSet("KWIN_WAYLAND_NO_XAUTHORITY")) { +- if (!generateXauthorityFile(m_xwlSocket->display(), &m_xauthorityFile)) { ++ const QByteArray hostname = QHostInfo::localHostName().toUtf8(); ++ if (!generateXauthorityFile(m_xwlSocket->display(), &m_xauthorityFile, hostname)) { + qCWarning(KWIN_WRAPPER) << "Failed to create an Xauthority file"; ++ } else { ++ qputenv("XAUTHLOCALHOSTNAME", hostname); + } + } + } +diff --git a/src/xwl/lib/xauthority.cpp b/src/xwl/lib/xauthority.cpp +index a7b61843f..de6b87616 100644 +--- a/src/xwl/lib/xauthority.cpp ++++ b/src/xwl/lib/xauthority.cpp +@@ -45,7 +45,7 @@ static QByteArray generateXauthorityCookie() return cookie; } --static bool generateXauthorityFile(int display, QTemporaryFile *authorityFile) -+static bool generateXauthorityFile(int display, QTemporaryFile *authorityFile, const QByteArray &hostname) +-bool generateXauthorityFile(int display, QTemporaryFile *authorityFile) ++bool generateXauthorityFile(int display, QTemporaryFile *authorityFile, const QByteArray &hostname) { const QString runtimeDirectory = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); -@@ -106,7 +107,6 @@ +@@ -54,7 +54,6 @@ bool generateXauthorityFile(int display, QTemporaryFile *authorityFile) return false; } @@ -40,32 +58,19 @@ const QByteArray displayName = QByteArray::number(display); const QByteArray name = QByteArrayLiteral("MIT-MAGIC-COOKIE-1"); const QByteArray cookie = generateXauthorityCookie(); -@@ -142,7 +142,7 @@ - } - - if (!qEnvironmentVariableIsSet("KWIN_WAYLAND_NO_XAUTHORITY")) { -- if (!generateXauthorityFile(socket->display(), &m_authorityFile)) { -+ if (!generateXauthorityFile(socket->display(), &m_authorityFile, m_hostname)) { - qCWarning(KWIN_XWL) << "Failed to create an Xauthority file"; - emit errorOccurred(); - return; -@@ -441,6 +441,7 @@ - qputenv("DISPLAY", displayName); - if (m_authorityFile.isOpen()) { - qputenv("XAUTHORITY", m_authorityFile.fileName().toUtf8()); -+ qputenv("XAUTHLOCALHOSTNAME", m_hostname); - } - - // create selection owner for WM_S0 - magic X display number expected by XWayland -Index: kwin-5.17.80git.20210329T113728~72cc1daf2/src/xwl/xwayland.h -=================================================================== ---- kwin-5.17.80git.20210329T113728~72cc1daf2.orig/src/xwl/xwayland.h 2021-03-30 07:04:25.529356779 +0200 -+++ kwin-5.17.80git.20210329T113728~72cc1daf2/src/xwl/xwayland.h 2021-03-30 07:04:28.752150965 +0200 -@@ -113,6 +113,7 @@ - QScopedPointer<KSelectionOwner> m_selectionOwner; - QTemporaryFile m_authorityFile; - QScopedPointer<XwaylandSocket> m_socket; -+ QByteArray m_hostname; - int m_crashCount = 0; - - Q_DISABLE_COPY(Xwayland) +diff --git a/src/xwl/lib/xauthority.h b/src/xwl/lib/xauthority.h +index 7ba232be0..ecf43e9f5 100644 +--- a/src/xwl/lib/xauthority.h ++++ b/src/xwl/lib/xauthority.h +@@ -9,6 +9,7 @@ + + #pragma once + ++class QByteArray; + class QTemporaryFile; + +-bool generateXauthorityFile(int display, QTemporaryFile *authorityFile); ++bool generateXauthorityFile(int display, QTemporaryFile *authorityFile, const QByteArray &hostname); +-- +2.32.0 + ++++++ kwin-5.22.5.tar.xz -> kwin-5.23.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kwin5/kwin-5.22.5.tar.xz /work/SRC/openSUSE:Factory/.kwin5.new.2443/kwin-5.23.0.tar.xz differ: char 26, line 1 ++++++ plasma.keyring ++++++ Binary files /var/tmp/diff_new_pack.Yd2o7r/_old and /var/tmp/diff_new_pack.Yd2o7r/_new differ
