From 693dc2ef23946a1b0d80f00c1fb41f3769c708b5 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 29 Mar 2024 18:52:32 +0100 Subject: [PATCH] automatic version update by autodist [release 6.0.2-1mamba;Wed Mar 13 2024] --- README.md | 2 +- kwin-5.22.5-libglvnd-1.3.4.patch | 13 -- ...26.2.1-revert-x11window-redraw-issue.patch | 35 ---- ...6.3-backport-reduce_baddamage_errors.patch | 25 --- kwin.spec | 181 ++++++++---------- 5 files changed, 79 insertions(+), 177 deletions(-) delete mode 100644 kwin-5.22.5-libglvnd-1.3.4.patch delete mode 100644 kwin-5.26.2.1-revert-x11window-redraw-issue.patch delete mode 100644 kwin-5.26.3-backport-reduce_baddamage_errors.patch diff --git a/README.md b/README.md index 986bbb6..ff890fc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # kwin -KDE Frameworks 5 window manager. +KDE Plasma window manager. diff --git a/kwin-5.22.5-libglvnd-1.3.4.patch b/kwin-5.22.5-libglvnd-1.3.4.patch deleted file mode 100644 index 23550ea..0000000 --- a/kwin-5.22.5-libglvnd-1.3.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp -index c62ec170d..33b75eee1 100644 ---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp -+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp -@@ -224,7 +224,7 @@ - // cannot be an xcb_window_t. - surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr); - } else { -- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr); -+ surface = eglCreateWindowSurface(eglDisplay(), config(), (void *) &window, nullptr); - } - - return surface; diff --git a/kwin-5.26.2.1-revert-x11window-redraw-issue.patch b/kwin-5.26.2.1-revert-x11window-redraw-issue.patch deleted file mode 100644 index 8a4de94..0000000 --- a/kwin-5.26.2.1-revert-x11window-redraw-issue.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl -Date: Wed, 26 Oct 2022 21:43:41 +0200 -Subject: [PATCH] x11window: revert more from 3a28c02f - -BUG: 461032 - - -(cherry picked from commit 2997fb24bb8171145ce1107df85eb3a3a4c0cf74) ---- - src/x11window.cpp | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/x11window.cpp b/src/x11window.cpp -index c02d33b338..b7a180d317 100644 ---- a/src/x11window.cpp -+++ b/src/x11window.cpp -@@ -4519,11 +4519,10 @@ void X11Window::changeMaximize(bool horizontal, bool vertical, bool adjust) - } - } - r.moveTopLeft(rules()->checkPosition(r.topLeft())); -- // The above code tries to center align the window followed by setting top and bottom -- // it's possible that we're in between two pixels -- r.setX(Xcb::nativeFloor(r.x())); -- r.setY(Xcb::nativeFloor(r.y())); - } -+ // The above code tries to center align the window followed by setting top and bottom -+ // it's possible that we're in between two pixels -+ r = Xcb::nativeFloor(r); - - moveResize(r); - if (options->electricBorderMaximize() && r.top() == clientArea.top()) { --- -GitLab - diff --git a/kwin-5.26.3-backport-reduce_baddamage_errors.patch b/kwin-5.26.3-backport-reduce_baddamage_errors.patch deleted file mode 100644 index d8c75a1..0000000 --- a/kwin-5.26.3-backport-reduce_baddamage_errors.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7eca5f44dbc2b094468e7430f784ff1e7f372989 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -Date: Wed, 5 Oct 2022 14:17:09 +0300 -Subject: [PATCH] x11: Reset SurfaceItemX11::m_isDamaged when the damage handle - is destroyed - ---- - src/surfaceitem_x11.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/surfaceitem_x11.cpp b/src/surfaceitem_x11.cpp -index fef00eb73e..a1a9d8410f 100644 ---- a/src/surfaceitem_x11.cpp -+++ b/src/surfaceitem_x11.cpp -@@ -110,6 +110,7 @@ void SurfaceItemX11::waitForDamage() - void SurfaceItemX11::destroyDamage() - { - if (m_damageHandle != XCB_NONE) { -+ m_isDamaged = false; - xcb_damage_destroy(kwinApp()->x11Connection(), m_damageHandle); - m_damageHandle = XCB_NONE; - } --- -GitLab - diff --git a/kwin.spec b/kwin.spec index a95eace..ff2b2cf 100644 --- a/kwin.spec +++ b/kwin.spec @@ -1,66 +1,60 @@ %define majver %(echo %version | cut -d. -f1-2) %define plasmaver %(echo %version | cut -d. -f1-3) Name: kwin -Version: 5.27.10 +Version: 6.0.2 Release: 1mamba -Summary: KDE Frameworks 5 window manager +Summary: KDE Plasma window manager Group: Graphical Desktop/Applications/Environment Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://kde.org/ -Source: http://download.kde.org/stable/plasma/%{plasmaver}/kwin-%{version}.tar.xz -Patch0: kwin-5.22.5-libglvnd-1.3.4.patch -Patch1: kwin-5.26.2.1-revert-x11window-redraw-issue.patch -Patch2: kwin-5.26.3-backport-reduce_baddamage_errors.patch +URL: https://kde.org/it/plasma-desktop/ +Source: https://download.kde.org/%{stable_kf6}/plasma/%{plasmaver}/kwin-%{version}.tar.xz License: GPL ## AUTOBUILDREQ-BEGIN -#libKF5GlobalAccelPrivate.so.5()(64bit): .so link not found +#libKGlobalAccelD.so.0()(64bit): .so link not found BuildRequires: glibc-devel BuildRequires: libICE-devel -BuildRequires: libQt5X11Extras-devel BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXi-devel -BuildRequires: libattica5-devel +BuildRequires: libdisplay-info-devel BuildRequires: libdrm-devel BuildRequires: libepoxy-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libglib-devel BuildRequires: libglvnd-devel BuildRequires: libinput-devel -BuildRequires: libkactivities-devel -BuildRequires: libkauth-devel -BuildRequires: libkcmutils-devel -BuildRequires: libkcodecs-devel -BuildRequires: libkconfig-devel -BuildRequires: libkconfigwidgets-devel -BuildRequires: libkcoreaddons-devel -BuildRequires: libkcrash-devel -BuildRequires: libkdbusaddons-devel -BuildRequires: libkdeclarative-devel BuildRequires: libkdecoration-devel -BuildRequires: libkglobalaccel-devel -BuildRequires: libki18n-devel -BuildRequires: libkidletime-devel -BuildRequires: libknewstuff-devel -BuildRequires: libknotifications-devel -BuildRequires: libkpackage-devel -BuildRequires: libkrunner-devel +BuildRequires: libkf6-attica-devel +BuildRequires: libkf6-kauth-devel +BuildRequires: libkf6-kcmutils-devel +BuildRequires: libkf6-kcolorscheme-devel +BuildRequires: libkf6-kconfig-devel +BuildRequires: libkf6-kconfigwidgets-devel +BuildRequires: libkf6-kcoreaddons-devel +BuildRequires: libkf6-kcrash-devel +BuildRequires: libkf6-kdbusaddons-devel +BuildRequires: libkf6-kglobalaccel-devel +BuildRequires: libkf6-kguiaddons-devel +BuildRequires: libkf6-ki18n-devel +BuildRequires: libkf6-kidletime-devel +BuildRequires: libkf6-knewstuff-devel +BuildRequires: libkf6-knotifications-devel +BuildRequires: libkf6-kpackage-devel +BuildRequires: libkf6-kservice-devel +BuildRequires: libkf6-ksvg-devel +BuildRequires: libkf6-kwidgetsaddons-devel +BuildRequires: libkf6-kwindowsystem-devel +BuildRequires: libkf6-kxmlgui-devel BuildRequires: libkscreenlocker-devel -BuildRequires: libkservice-devel BuildRequires: libkwayland-devel -BuildRequires: libkwidgetsaddons-devel -BuildRequires: libkwindowsystem-devel -BuildRequires: libkxmlgui-devel BuildRequires: liblcms2-devel BuildRequires: libmesa-devel BuildRequires: libpipewire-devel -BuildRequires: libplasma-framework-devel -BuildRequires: libqaccessibilityclient-devel +BuildRequires: libqaccessibilityclient-qt6-devel BuildRequires: libstdc++6-devel BuildRequires: libudev-devel BuildRequires: libwayland-devel @@ -70,21 +64,23 @@ BuildRequires: libxcb-util-cursor-devel BuildRequires: libxcb-util-wm-devel BuildRequires: libxcvt-devel BuildRequires: libxkbcommon-devel -BuildRequires: libz-devel -BuildRequires: perl-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtsensors-devel +BuildRequires: qt6-qttools-devel +BuildRequires: qt6-qtwayland-devel ## AUTOBUILDREQ-END BuildRequires: cmake -BuildRequires: rpm-macros-kde5 +BuildRequires: kf6-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: breeze BuildRequires: libqaccessibilityclient-devel +BuildRequires: libkglobalacceld-devel Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: dconf %description -KDE Frameworks 5 window manager. +KDE Plasma window manager. %package decorations-plastik Group: Graphical Desktop/Look 'n' feel @@ -114,30 +110,18 @@ This package contains libraries and header files for developing applications tha %setup -q #-D -T #:<< _EOF -#%patch0 -p1 -#%patch1 -p1 -b .revert-x11window-redraw-issue -#%patch2 -p1 -b .backport-reduce_baddamage_errors %build #:<< _EOF -# Workaround for qmlplugindump crashing -#export QV4_FORCE_INTERPRETER=1 +%cmake_kf6 -%cmake_kde5 -d build - -#%ifarch x86_64 -#sed -i "s|/usr/lib/lib|/usr/lib64/lib|g" \ -# plugins/kdecorations/aurorae/src/CMakeFiles/kwin5_aurorae.dir/link.txt \ -# scripting/CMakeFiles/kcm_kwin4_genericscripted.dir/link.txt -#%endif - -%make +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-html --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-html --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -146,7 +130,7 @@ This package contains libraries and header files for developing applications tha %postun -n lib%{name} -p /sbin/ldconfig -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %{_bindir}/kwin_wayland %{_bindir}/kwin_wayland_wrapper @@ -160,20 +144,11 @@ This package contains libraries and header files for developing applications tha %{_datadir}/icons/hicolor/*/apps/kwin.png %{_datadir}/icons/hicolor/scalable/apps/kwin.svgz %{_datadir}/kconf_update/* -%{_datadir}/knotifications5/kwin.notifyrc %{_datadir}/knsrcfiles/*.knsrc -%{_datadir}/kpackage/kcms/kcm_kwin_scripts/* -%dir %{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops -%{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/* -%dir %{_datadir}/kpackage/kcms/kcm_virtualkeyboard -%{_datadir}/kpackage/kcms/kcm_virtualkeyboard/* -%dir %{_datadir}/kpackage/kcms/kcm_kwin_effects -%{_datadir}/kpackage/kcms/kcm_kwin_effects/* -%dir %{_datadir}/kpackage/kcms/kcm_kwindecoration -%{_datadir}/kpackage/kcms/kcm_kwindecoration/* -%dir %{_datadir}/kpackage/kcms/kcm_kwinxwayland -%{_datadir}/kpackage/kcms/kcm_kwinxwayland/* -%{_kde5_servicetypesdir}/kwin*.desktop +%{_datadir}/knotifications6/kwin.notifyrc +%{_datadir}/kwin/tabbox/thumbnail_grid/contents/ui/main.qml +%{_datadir}/kwin/tabbox/thumbnail_grid/metadata.json +%{_datadir}/qlogging-categories6/org_kde_kwin.categories %{_datadir}/kwin/aurorae/* %dir %{_datadir}/kwin/builtin-effects %{_datadir}/kwin/builtin-effects/* @@ -185,10 +160,7 @@ This package contains libraries and header files for developing applications tha %{_datadir}/kwin/onscreennotification/plasma/main.qml %{_datadir}/kwin/outline/plasma/outline.qml %{_datadir}/kwin/scripts/* -%dir %{_datadir}/kpackage/kcms/kcm_kwinrules -%{_datadir}/kpackage/kcms/kcm_kwinrules/* %{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop -%{_datadir}/qlogging-categories5/org_kde_kwin.categories %files decorations-plastik %defattr(-,root,root) @@ -199,44 +171,47 @@ This package contains libraries and header files for developing applications tha %defattr(-,root,root) %{_libdir}/libkcmkwincommon.so.* %{_libdir}/libkwin.so.* -%{_libdir}/libkwineffects.so.* -%{_libdir}/libkwinglutils.so.* -#%{_libdir}/libkwinxrenderutils.so.* -%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/*.so -%{_libdir}/qt5/plugins/plasma/kcms/systemsettings_qwidgets/*.so -%dir %{_libdir}/qt5/plugins/kwin -%dir %{_libdir}/qt5/plugins/kwin/effects -%dir %{_libdir}/qt5/plugins/kwin/effects/configs -%{_libdir}/qt5/plugins/kwin/effects/configs/kcm_kwin4_genericscripted.so -%{_libdir}/qt5/plugins/kwin/effects/configs/kwin_*.so -%dir %{_libdir}/qt5/plugins/kwin/plugins -%{_libdir}/qt5/plugins/kwin/plugins/*.so -%dir %{_libdir}/qt5/plugins/org.kde.kdecoration2 -%{_libdir}/qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so -%dir %{_libdir}/qt5/plugins/kpackage/packagestructure -%{_libdir}/qt5/plugins/kpackage/packagestructure/kwin_*.so -%{_libdir}/qt5/qml/org/kde/kwin.2/* -%{_libdir}/qt5/qml/org/kde/kwin/decoration/* -%{_libdir}/qt5/qml/org/kde/kwin/decorations/plastik/* -%{_libdir}/qt5/qml/org/kde/kwin/private/* +%{_libdir}/kconf_update_bin/kwin-6.0-* +%{_libdir}/libkwin.so +%{_libdir}/kconf_update_bin/kwin5_update_default_rules +%dir %{_qt6_plugindir}/kwin/effects/configs +%{_qt6_plugindir}/kwin/effects/configs/*.so +%dir %{_qt6_plugindir}/kwin/plugins +%{_qt6_plugindir}/kwin/plugins/*.so +%dir %{_kf6_plugindir}/packagestructure +%{_kf6_plugindir}/packagestructure/kwin_*.so +%{_qt6_plugindir}/plasma/kcms/systemsettings_qwidgets/*.so +%{_qt6_plugindir}/org.kde.kdecoration2.kcm/kcm_auroraedecoration.so +%{_qt6_plugindir}/org.kde.kdecoration2/org.kde.kwin.aurorae.so +%{_qt6_plugindir}/plasma/kcms/systemsettings/*.so +%dir %{_qt6_qmldir}/org/kde/kwin +%{_qt6_qmldir}/org/kde/kwin/* %{_libexecdir}/kwin-applywindowdecoration %{_libexecdir}/kwin_killer_helper -%{_libexecdir}/kwin_rules_dialog %doc LICENSES %files -n lib%{name}-devel %defattr(-,root,root) -%{_includedir}/*.h -%{_libdir}/cmake/KWinDBusInterface/KWinDBusInterfaceConfig.cmake -%{_libdir}/kconf_update_bin/kwin5_update_default_rules -#%{_libdir}/libkwin4_effect_builtins.so -%{_libdir}/libkwineffects.so -%{_libdir}/libkwinglutils.so -#%{_libdir}/libkwinxrenderutils.so -%dir %{_libdir}/cmake/KWinEffects -%{_libdir}/cmake/KWinEffects/KWinEffects*.cmake +%dir %{_includedir}/kwin +%{_includedir}/kwin/* +%dir %{_libdir}/cmake/KWin +%{_libdir}/cmake/KWin/KWin*.cmake +%dir %{_libdir}/cmake/KWinDBusInterface +%{_libdir}/cmake/KWinDBusInterface/KWinDBusInterface*.cmake %changelog +* Wed Mar 13 2024 Automatic Build System 6.0.2-1mamba +- automatic version update by autodist + +* Thu Mar 07 2024 Automatic Build System 6.0.1-1mamba +- automatic version update by autodist + +* Sat Mar 02 2024 Automatic Build System 6.0.0-1mamba +- automatic version update by autodist + +* Tue Feb 06 2024 Automatic Build System 5.93.0-1mamba +- automatic version update by autodist + * Thu Dec 07 2023 Automatic Build System 5.27.10-1mamba - automatic version update by autodist