Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-kwin for openSUSE:Factory checked in at 2023-04-24 22:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-kwin (Old) and /work/SRC/openSUSE:Factory/.deepin-kwin.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-kwin" Mon Apr 24 22:30:58 2023 rev:9 rq:1082385 version:5.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-kwin/deepin-kwin.changes 2022-09-10 20:17:58.148933538 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-kwin.new.1533/deepin-kwin.changes 2023-04-24 22:31:02.079446944 +0200 @@ -1,0 +2,24 @@ +Tue Apr 18 14:59:39 UTC 2023 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.25.0 + * Merge dde-kwin and deepin-kwin +- Drop deepin-kwin-tabbox-chameleon-rename.patch, drop-nonexistent-translations.patch + and fix-library-links.patch +- Add 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch + +------------------------------------------------------------------- +Tue Jan 17 07:37:36 UTC 2023 - Hillwood Yang <hillw...@opensuse.org> + +- Update fix-library-links.patch, fix build on new dtk + +------------------------------------------------------------------- +Fri Oct 28 13:45:40 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.5.24 + * Add split screen menu + * Add decoration property interface + * Add watermark feature and support super+s + * Fix bugs +- Drop fix-build-on-5_25_3.patch + +------------------------------------------------------------------- Old: ---- dde-kwin-5.5.11.tar.gz deepin-kwin-tabbox-chameleon-rename.patch drop-nonexistent-translations.patch fix-build-on-5_25_3.patch fix-library-links.patch New: ---- 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch deepin-kwin-5.25.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-kwin.spec ++++++ --- /var/tmp/diff_new_pack.iqTqYD/_old 2023-04-24 22:31:02.771451058 +0200 +++ /var/tmp/diff_new_pack.iqTqYD/_new 2023-04-24 22:31:02.779451105 +0200 @@ -1,8 +1,7 @@ # # spec file for package deepin-kwin # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2021 Hillwood Yang <hillw...@opensuse.org> +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,166 +12,276 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define _name dde-kwin -%define sover 0 -%define kwin_version %(rpm -q --queryformat '%%{VERSION}' kwin5) -%define kwin_max 5.25.1 +%global __requires_exclude qmlimport\\((org\\.kde\\.private\\.kcms\\.kwin\\.effects|org\\.kde\\.kcms\\.kwinrules|org\\.kde\\.kwin\\.private\\.overview|org\\.kde.kwin\\.private\\.desktopgrid|org\\.kde\\.KWin\\.Effect\\.WindowView|org\\.kde\\.kwin\\.kwinxwaylandsettings).* + +%global kf5_version 5.90.0 +%global qt5_version 5.15.0 +%global wayland (0%{?suse_version} >= 1330) Name: deepin-kwin -Version: 5.5.11 +Version: 5.25.0 Release: 0 -Summary: KWin configures/plugins on the DDE +# Full Plasma 5 version (e.g. 5.8.95) +%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} +# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.95 in KUF) +%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} +Summary: Deepin Window Manager License: GPL-3.0-or-later -Group: System/GUI/Other -Url: https://github.com/linuxdeepin/dde-kwin -Source0: https://github.com/linuxdeepin/dde-kwin/archive/%{version}/%{_name}-%{version}.tar.gz -Patch0: %{name}-tabbox-chameleon-rename.patch -# Patch1: fix-build-on-5_18_6.patch -Patch2: fix-build-on-5_25_3.patch -# PATCH-FIX-UPSTRAM fix-library-links.patch hillw...@opensuse.org - Fix build on Tumbleweed -# https://github.com/linuxdeepin/dde-kwin/pull/154 -Patch3: fix-library-links.patch -Patch4: drop-nonexistent-translations.patch +Group: System/GUI/Deepin +Url: https://github.com/linuxdeepin/deepin-kwin/ +Source0: https://github.com/linuxdeepin/deepin-kwin//archive/%{version}/%{name}-%{version}.tar.gz +# PATCH-FEATURE-OPENSUSE +Patch101: 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes -BuildRequires: gtest -BuildRequires: libqt5-linguist -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5XmlPatterns) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(dtkcore) -BuildRequires: pkgconfig(dtkgui) >= 5.0.0 -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: cmake(KF5GlobalAccel) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: kwin5-devel +%if 0%{?suse_version} < 1550 +BuildRequires: gcc10-PIE +BuildRequires: gcc10-c++ +%endif +BuildRequires: kf5-filesystem +BuildRequires: libQt5Core-private-headers-devel >= %{qt5_version} +BuildRequires: libQt5Gui-private-headers-devel >= %{qt5_version} +BuildRequires: libQt5PlatformSupport-private-headers-devel >= %{qt5_version} +BuildRequires: libcap-devel +BuildRequires: libcap-progs BuildRequires: libepoxy-devel -BuildRequires: plasma5-workspace-devel -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5Core-private-headers-devel -BuildRequires: libQt5PlatformSupport-devel-static -Requires: deepin-wallpapers -Requires: dbus-1 -Requires: kwin5 +BuildRequires: hicolor-icon-theme +BuildRequires: hwdata +BuildRequires: pkgconfig +BuildRequires: systemd-rpm-macros +BuildRequires: xz +BuildRequires: cmake(Breeze) >= 5.9.0 +BuildRequires: cmake(DWayland) +BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} +BuildRequires: cmake(KF5Activities) >= %{kf5_version} +BuildRequires: cmake(KF5Completion) >= %{kf5_version} +BuildRequires: cmake(KF5Config) >= %{kf5_version} +BuildRequires: cmake(KF5ConfigWidgets) >= %{kf5_version} +BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version} +BuildRequires: cmake(KF5Crash) >= %{kf5_version} +BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version} +BuildRequires: cmake(KF5Declarative) >= %{kf5_version} +BuildRequires: cmake(KF5DocTools) >= %{kf5_version} +BuildRequires: cmake(KF5GlobalAccel) >= %{kf5_version} +BuildRequires: cmake(KF5I18n) >= %{kf5_version} +BuildRequires: cmake(KF5IconThemes) >= %{kf5_version} +BuildRequires: cmake(KF5IdleTime) >= %{kf5_version} +BuildRequires: cmake(KF5Init) >= %{kf5_version} +BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} +BuildRequires: cmake(KF5KIO) >= %{kf5_version} +BuildRequires: cmake(KF5NewStuff) >= %{kf5_version} +BuildRequires: cmake(KF5Notifications) >= %{kf5_version} +BuildRequires: cmake(KF5Package) >= %{kf5_version} +BuildRequires: cmake(KF5Plasma) >= %{kf5_version} +BuildRequires: cmake(KF5Runner) >= %{kf5_version} +BuildRequires: cmake(KF5Service) >= %{kf5_version} +BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version} +BuildRequires: cmake(KF5Wayland) >= %{kf5_version} +BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version} +BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version} +BuildRequires: cmake(KF5XmlGui) >= %{kf5_version} +BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version} +BuildRequires: cmake(PlasmaWaylandProtocols) +BuildRequires: cmake(QAccessibilityClient) +BuildRequires: cmake(Qt5Concurrent) >= %{qt5_version} +BuildRequires: cmake(Qt5Core) >= %{qt5_version} +BuildRequires: cmake(Qt5DBus) >= %{qt5_version} +BuildRequires: cmake(Qt5Quick) >= %{qt5_version} +BuildRequires: cmake(Qt5QuickWidgets) >= %{qt5_version} +BuildRequires: cmake(Qt5Script) >= %{qt5_version} +BuildRequires: cmake(Qt5Sensors) >= %{qt5_version} +BuildRequires: cmake(Qt5UiTools) >= %{qt5_version} +BuildRequires: cmake(Qt5WaylandClient) >= %{qt5_version} +BuildRequires: cmake(Qt5Widgets) >= %{qt5_version} +BuildRequires: cmake(Qt5X11Extras) >= %{qt5_version} +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libxcvt) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(wayland-cursor) >= 1.2.0 +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcb) >= 1.10 +BuildRequires: pkgconfig(xcb-composite) >= 1.10 +BuildRequires: pkgconfig(xcb-cursor) +BuildRequires: pkgconfig(xcb-damage) >= 1.10 +BuildRequires: pkgconfig(xcb-glx) >= 1.10 +BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcb-randr) >= 1.10 +BuildRequires: pkgconfig(xcb-render) >= 1.10 +BuildRequires: pkgconfig(xcb-shape) >= 1.10 +BuildRequires: pkgconfig(xcb-shm) >= 1.10 +BuildRequires: pkgconfig(xcb-sync) >= 1.10 +BuildRequires: pkgconfig(xcb-util) +BuildRequires: pkgconfig(xcb-xfixes) >= 1.10 +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xkbcommon) >= 0.7.0 +BuildRequires: pkgconfig(xtst) +%if %{wayland} +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(libdrm) >= 2.4.62 +BuildRequires: pkgconfig(libinput) >= 1.14 +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(xwayland) +# Don't use pkgconfig here as that would cause unresolvables on 0.1 -> 0.2 -> 0.3 bumps +BuildRequires: pipewire-devel >= 0.3.29 +# xorg-x11-server-wayland is required by plasma5-session-wayland and kwin5 can run with just X11 +Recommends: xorg-x11-server-wayland +%endif +# new default decoration +Requires: breeze5-decoration >= %{_plasma5_version} +# Needed to show dialogs +Requires: kdialog +# Needed for effects KCM at runtime +Requires: libQt5Multimedia5 +# Needed for the virtual desktop KCM +Requires: kirigami2 +Requires: kitemmodels-imports +%requires_eq libQt5Core5 +%requires_eq libQt5Gui5 +Provides: windowmanager Provides: deepin-kwin5 +# For post and verifyscript +Requires(post): permissions +Requires(verify):permissions +%requires_ge Mesa-libEGL1 +%requires_ge libKF5WindowSystem5 +%requires_ge plasma-framework +# For displaying full monitor vendor names +Recommends: hwdata %description -KWin configures/plugins on the DDE -Let kwin work well in the Deepin Desktop Environment. - -%package -n libkwin-xcb%{sover} -Summary: Deepin Kwin libraries -Group: System/Libraries - -%description -n libkwin-xcb%{sover} -KWin configures/plugins on the DDE -Let kwin work well in the Deepin Desktop Environment. +deepin-kWin is the window manager of the Deepin desktop environment. %package devel -Summary: Development tools for deepin-plugin-kwin +Summary: Development tools for deepin-kwin Group: Development/Libraries/C and C++ -Requires: libkwin-xcb%{sover} +Requires: %{name} = %{version} %description devel -The deepin-plugin-kwin-devel package contains the header files and developer -docs for deepin-plugin-kwin. +The deepin-kwin is the window manager of the Deepin desktop environment. +This package provides development files. %lang_package %prep -%autosetup -p1 -n %{_name}-%{version} -sed -i 's|backgrounds/default_background.jpg|wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|g' \ -deepin-wm-dbus/deepinwmfaker.cpp plugins/kwineffects/multitasking/background.cpp -sed -i 's/lrelease/lrelease-qt5/g' plugins/platforms/plugin/translate_generation.sh -sed -i 's|/usr/lib|%{_libdir}|g' plugins/platforms/plugin/{main.cpp,main_wayland.cpp} - -%if "%{kwin_version}" >= "%{kwin_max}" -# Workaround issue#3246 (https://github.com/linuxdeepin/developer-center/issues/3246) -# sed -i 's|GLRenderTarget|GLFramebuffer|g' plugins/kwineffects/scissor-window/scissorwindow.cpp -# sed -i '/(!w->isPaintingEnabled() || (mask & PAINT_WINDOW_LANCZOS)/,+2d' plugins/kwineffects/scissor-window/scissorwindow.cpp -sed -i '/add_subdirectory(kdecoration)/d' plugins/CMakeLists.txt -%endif +%autosetup -p1 -n %{name}-%{version} %build -mkdir build -cd build -cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DUSE_WINDOW_TOOL=OFF \ - -DENABLE_BUILTIN_BLUR=OFF \ - -DENABLE_KDECORATION=ON \ - -DENABLE_BUILTIN_MULTITASKING=OFF \ - -DENABLE_BUILTIN_BLACK_SCREEN=OFF \ -%if "%{kwin_version}" >= "%{kwin_max}" - -DENABLE_BUILTIN_SCISSOR_WINDOW=OFF \ +%if 0%{?suse_version} < 1550 + export CXX=g++-10 %endif - -DUSE_DEEPIN_WAYLAND=OFF +%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} -DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} %cmake_build %install -%cmake_install +%kf5_makeinstall -C build +%if !%{wayland} + rm %{buildroot}%{_kf5_bindir}/%{name}_wayland +%endif -rm -rf %{buildroot}%{_datadir}/kwin/*/*/LICENSE +sed -i 's#/usr/bin/env python3#/usr/bin/python3#' %{buildroot}%{_kf5_sharedir}/kconf_update/*.py -rm -rf \ - %{buildroot}%{_sysconfdir}/xdg/kwinrc \ - %{buildroot}%{_sysconfdir}/xdg/kdeglobals +%kf5_find_lang +%kf5_find_htmldocs -rm -rf %{buildroot}%{_libdir}/libkwin.so +%fdupes %{buildroot}%{_kf5_libdir} +%fdupes %{buildroot}%{_datadir} -%fdupes %{buildroot} +%preun +%{systemd_user_preun %{name}_x11.service %{name}_wayland.service} -%post -n libkwin-xcb%{sover} -p /sbin/ldconfig +%post +/sbin/ldconfig +%if %{wayland} +%set_permissions %{_kf5_bindir}/%{name}_wayland +%endif +%{systemd_user_post %{name}_x11.service %{name}_wayland.service} -%postun -n libkwin-xcb%{sover} -p /sbin/ldconfig +%postun +/sbin/ldconfig +%{systemd_user_postun %{name}_x11.service %{name}_wayland.service} %files %defattr(-,root,root,-) -%doc CHANGELOG.md -%license LICENSE -%config %{_sysconfdir}/xdg/* -%{_bindir}/kwin_no_scale -%dir %{_datadir}/kwin -%dir %{_datadir}/kwin/scripts -%dir %{_datadir}/kwin/tabbox -%{_datadir}/kwin/scripts/* -%{_datadir}/kwin/tabbox/* -%{_bindir}/deepin-wm-dbus -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/dbus-1/services/com.deepin.wm.service -%{_kf5_plugindir}/platforms/libdde-kwin-xcb.so -%if "%{kwin_version}" <= "%{kwin_max}" -%{_kf5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so -%dir %{_kf5_plugindir}/kwin/effects/plugins/ -#%{_kf5_plugindir}/kwin/effects/plugins/libblur.so -# %{_kf5_plugindir}/kwin/effects/plugins/libmultitasking.so -%{_kf5_plugindir}/kwin/effects/plugins/libscissor-window.so -%else -# %{_libdir}/libkwin.so +#%doc CHANGELOG.md +#%license LICENSE +%config %{_sysconfdir}/deepin-* +%if %{wayland} +%verify(not caps) %{_kf5_bindir}/%{name}_wayland +%{_kf5_bindir}/%{name}_wayland_wrapper %endif -%{_kf5_plugindir}/platforms/libdde-kwin-wayland.so - -%files -n libkwin-xcb%{sover} -%defattr(-,root,root,-) -%{_libdir}/libkwin-xcb.so.* +%{_kf5_applicationsdir}/*.desktop +%{_kf5_bindir}/%{name}_x11 +%{_kf5_debugdir}/org_kde_%{name}.categories +%{_kf5_knsrcfilesdir}/*.knsrc +%{_kf5_libdir}/kconf_update_bin/ +%{_kf5_libdir}/lib%{name}*.so.* +%{_kf5_libdir}/libdeepin-kcmkwincommon.so.* +%{_kf5_plugindir}/%{name} +%{_kf5_plugindir}/kcms +%{_kf5_plugindir}/*.so +%dir %{_kf5_plugindir}/kpackage/ +%dir %{_kf5_plugindir}/kpackage/packagestructure/ +%{_kf5_plugindir}/kpackage/packagestructure/*.so +%dir %{_kf5_sharedir}/kpackage +%dir %{_kf5_sharedir}/kpackage/kcms +%{_kf5_sharedir}/kpackage/kcms/deepin-* +%{_kf5_plugindir}/org.kde.* +%{_libexecdir}/%{name}_* +%{_libexecdir}/%{name}-applywindowdecoration +%{_kf5_sharedir}/config.kcfg/ +%{_kf5_sharedir}/%{name} +%{_kf5_sharedir}/icons/hicolor/*/apps/%{name}.* +%{_kf5_sharedir}/kconf_update/ +%{_kf5_sharedir}/kservices5 +%{_kf5_sharedir}/kservicetypes5 +%{_kf5_sharedir}/knotifications5 +%dir %{_datadir}/dsg +%dir %{_datadir}/dsg/configs +%dir %{_datadir}/dsg/configs/org.deepin.kwin +%{_datadir}/dsg/configs/org.deepin.kwin/org.deepin.kwin.splitmenu.display.json +%dir %{_kf5_sharedir}/krunner +%dir %{_kf5_sharedir}/krunner/dbusplugins +%{_kf5_sharedir}/krunner/dbusplugins/%{name}-runner-windows.desktop +%dir %{_kf5_qmldir}/org/ +%dir %{_kf5_qmldir}/org/deepin +%dir %{_kf5_qmldir}/org/deepin/kwin +%dir %{_kf5_qmldir}/org/deepin/kwin/decoration +%{_kf5_qmldir}/org/deepin/kwin/decoration/*.qml +%{_kf5_qmldir}/org/deepin/kwin/decoration/libdecorationplugin.so +%{_kf5_qmldir}/org/deepin/kwin/decoration/qmldir +%dir %{_kf5_qmldir}/org/kde/ +%{_kf5_qmldir}/org/kde/%{name} +%{_userunitdir}/%{name}_wayland.service +%{_userunitdir}/%{name}_x11.service + +%dir %{_datadir}/doc/HTML +%dir %{_datadir}/doc/HTML/en +%dir %{_datadir}/doc/HTML/en/dcontrol +%{_datadir}/doc/HTML/en/dcontrol/* -%files lang +%files lang -f %{name}.lang %defattr(-,root,root,-) -%{_datadir}/dde-kwin-xcb +%dir %{_datadir}/translations +%{_datadir}/translations/popupmenu %files devel %defattr(-,root,root,-) -%{_libdir}/libkwin-xcb.so -%{_includedir}/%{_name} -%{_libdir}/pkgconfig/dde-kwin.pc +%{_kf5_libdir}/lib%{name}*.so +%{_kf5_libdir}/cmake/DeepinKWinEffects +%{_kf5_libdir}/cmake/DeepinKWinDBusInterface +%{_includedir}/%{name} +%{_kf5_sharedir}/dbus-1/interfaces/ %changelog ++++++ 0001-Export-consistent-hostname-as-XAUTHLOCALHOSTNAME.patch ++++++ diff -Nurp deepin-kwin-5.25.0/src/helpers/wayland_wrapper/kwin_wrapper.cpp deepin-kwin-5.25.0-new/src/helpers/wayland_wrapper/kwin_wrapper.cpp --- deepin-kwin-5.25.0/src/helpers/wayland_wrapper/kwin_wrapper.cpp 2023-03-30 08:55:43.000000000 +0800 +++ deepin-kwin-5.25.0-new/src/helpers/wayland_wrapper/kwin_wrapper.cpp 2023-04-18 22:51:13.352318847 +0800 @@ -22,6 +22,7 @@ #include <QCoreApplication> #include <QDebug> +#include <QHostInfo> #include <QProcess> #include <QTemporaryFile> #include <QDBusConnection> @@ -70,8 +71,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 -Nurp deepin-kwin-5.25.0/src/xwl/lib/xauthority.cpp deepin-kwin-5.25.0-new/src/xwl/lib/xauthority.cpp --- deepin-kwin-5.25.0/src/xwl/lib/xauthority.cpp 2023-03-30 08:55:43.000000000 +0800 +++ deepin-kwin-5.25.0-new/src/xwl/lib/xauthority.cpp 2023-04-18 22:52:58.253169705 +0800 @@ -45,7 +45,7 @@ static QByteArray generateXauthorityCook return cookie; } -bool generateXauthorityFile(int display, QTemporaryFile *authorityFile) +bool generateXauthorityFile(int display, QTemporaryFile *authorityFile, const QByteArray &hostname) { const QString runtimeDirectory = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); @@ -54,7 +54,6 @@ bool generateXauthorityFile(int display, return false; } - const QByteArray hostname = QHostInfo::localHostName().toUtf8(); const QByteArray displayName = QByteArray::number(display); const QByteArray name = QByteArrayLiteral("MIT-MAGIC-COOKIE-1"); const QByteArray cookie = generateXauthorityCookie(); diff -Nurp deepin-kwin-5.25.0/src/xwl/lib/xauthority.h deepin-kwin-5.25.0-new/src/xwl/lib/xauthority.h --- deepin-kwin-5.25.0/src/xwl/lib/xauthority.h 2023-03-30 08:55:43.000000000 +0800 +++ deepin-kwin-5.25.0-new/src/xwl/lib/xauthority.h 2023-04-18 22:53:42.849531429 +0800 @@ -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);
