automatic version update by autodist [release 6.0.2-1mamba;Wed Mar 13 2024]

This commit is contained in:
Automatic Build System 2024-03-29 18:52:32 +01:00
parent c40a301bb4
commit 693dc2ef23
5 changed files with 79 additions and 177 deletions

View File

@ -1,4 +1,4 @@
# kwin # kwin
KDE Frameworks 5 window manager. KDE Plasma window manager.

View File

@ -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;

View File

@ -1,35 +0,0 @@
From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
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

View File

@ -1,25 +0,0 @@
From 7eca5f44dbc2b094468e7430f784ff1e7f372989 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
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

181
kwin.spec
View File

@ -1,66 +1,60 @@
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
%define plasmaver %(echo %version | cut -d. -f1-3) %define plasmaver %(echo %version | cut -d. -f1-3)
Name: kwin Name: kwin
Version: 5.27.10 Version: 6.0.2
Release: 1mamba Release: 1mamba
Summary: KDE Frameworks 5 window manager Summary: KDE Plasma window manager
Group: Graphical Desktop/Applications/Environment Group: Graphical Desktop/Applications/Environment
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://kde.org/ URL: https://kde.org/it/plasma-desktop/
Source: http://download.kde.org/stable/plasma/%{plasmaver}/kwin-%{version}.tar.xz Source: https://download.kde.org/%{stable_kf6}/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
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
#libKF5GlobalAccelPrivate.so.5()(64bit): .so link not found #libKGlobalAccelD.so.0()(64bit): .so link not found
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libICE-devel BuildRequires: libICE-devel
BuildRequires: libQt5X11Extras-devel
BuildRequires: libSM-devel BuildRequires: libSM-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: libXi-devel BuildRequires: libXi-devel
BuildRequires: libattica5-devel BuildRequires: libdisplay-info-devel
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: libepoxy-devel BuildRequires: libepoxy-devel
BuildRequires: libfontconfig-devel BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libglib-devel
BuildRequires: libglvnd-devel BuildRequires: libglvnd-devel
BuildRequires: libinput-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: libkdecoration-devel
BuildRequires: libkglobalaccel-devel BuildRequires: libkf6-attica-devel
BuildRequires: libki18n-devel BuildRequires: libkf6-kauth-devel
BuildRequires: libkidletime-devel BuildRequires: libkf6-kcmutils-devel
BuildRequires: libknewstuff-devel BuildRequires: libkf6-kcolorscheme-devel
BuildRequires: libknotifications-devel BuildRequires: libkf6-kconfig-devel
BuildRequires: libkpackage-devel BuildRequires: libkf6-kconfigwidgets-devel
BuildRequires: libkrunner-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: libkscreenlocker-devel
BuildRequires: libkservice-devel
BuildRequires: libkwayland-devel BuildRequires: libkwayland-devel
BuildRequires: libkwidgetsaddons-devel
BuildRequires: libkwindowsystem-devel
BuildRequires: libkxmlgui-devel
BuildRequires: liblcms2-devel BuildRequires: liblcms2-devel
BuildRequires: libmesa-devel BuildRequires: libmesa-devel
BuildRequires: libpipewire-devel BuildRequires: libpipewire-devel
BuildRequires: libplasma-framework-devel BuildRequires: libqaccessibilityclient-qt6-devel
BuildRequires: libqaccessibilityclient-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libwayland-devel BuildRequires: libwayland-devel
@ -70,21 +64,23 @@ BuildRequires: libxcb-util-cursor-devel
BuildRequires: libxcb-util-wm-devel BuildRequires: libxcb-util-wm-devel
BuildRequires: libxcvt-devel BuildRequires: libxcvt-devel
BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-devel
BuildRequires: libz-devel BuildRequires: qt6-qtbase-devel
BuildRequires: perl-devel BuildRequires: qt6-qtdeclarative-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt6-qtsensors-devel
BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt6-qttools-devel
BuildRequires: qt6-qtwayland-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: cmake BuildRequires: cmake
BuildRequires: rpm-macros-kde5 BuildRequires: kf6-rpm-macros
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: breeze BuildRequires: breeze
BuildRequires: libqaccessibilityclient-devel BuildRequires: libqaccessibilityclient-devel
BuildRequires: libkglobalacceld-devel
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: dconf Requires: dconf
%description %description
KDE Frameworks 5 window manager. KDE Plasma window manager.
%package decorations-plastik %package decorations-plastik
Group: Graphical Desktop/Look 'n' feel Group: Graphical Desktop/Look 'n' feel
@ -114,30 +110,18 @@ This package contains libraries and header files for developing applications tha
%setup -q %setup -q
#-D -T #-D -T
#:<< _EOF #:<< _EOF
#%patch0 -p1
#%patch1 -p1 -b .revert-x11window-redraw-issue
#%patch2 -p1 -b .backport-reduce_baddamage_errors
%build %build
#:<< _EOF #:<< _EOF
# Workaround for qmlplugindump crashing %cmake_kf6
#export QV4_FORCE_INTERPRETER=1
%cmake_kde5 -d build %cmake_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
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{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 %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{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 %postun -n lib%{name} -p /sbin/ldconfig
%files -f %{name}5_qt.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/kwin_wayland %{_bindir}/kwin_wayland
%{_bindir}/kwin_wayland_wrapper %{_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/*/apps/kwin.png
%{_datadir}/icons/hicolor/scalable/apps/kwin.svgz %{_datadir}/icons/hicolor/scalable/apps/kwin.svgz
%{_datadir}/kconf_update/* %{_datadir}/kconf_update/*
%{_datadir}/knotifications5/kwin.notifyrc
%{_datadir}/knsrcfiles/*.knsrc %{_datadir}/knsrcfiles/*.knsrc
%{_datadir}/kpackage/kcms/kcm_kwin_scripts/* %{_datadir}/knotifications6/kwin.notifyrc
%dir %{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops %{_datadir}/kwin/tabbox/thumbnail_grid/contents/ui/main.qml
%{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/* %{_datadir}/kwin/tabbox/thumbnail_grid/metadata.json
%dir %{_datadir}/kpackage/kcms/kcm_virtualkeyboard %{_datadir}/qlogging-categories6/org_kde_kwin.categories
%{_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}/kwin/aurorae/* %{_datadir}/kwin/aurorae/*
%dir %{_datadir}/kwin/builtin-effects %dir %{_datadir}/kwin/builtin-effects
%{_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/onscreennotification/plasma/main.qml
%{_datadir}/kwin/outline/plasma/outline.qml %{_datadir}/kwin/outline/plasma/outline.qml
%{_datadir}/kwin/scripts/* %{_datadir}/kwin/scripts/*
%dir %{_datadir}/kpackage/kcms/kcm_kwinrules
%{_datadir}/kpackage/kcms/kcm_kwinrules/*
%{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop %{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop
%{_datadir}/qlogging-categories5/org_kde_kwin.categories
%files decorations-plastik %files decorations-plastik
%defattr(-,root,root) %defattr(-,root,root)
@ -199,44 +171,47 @@ This package contains libraries and header files for developing applications tha
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libkcmkwincommon.so.* %{_libdir}/libkcmkwincommon.so.*
%{_libdir}/libkwin.so.* %{_libdir}/libkwin.so.*
%{_libdir}/libkwineffects.so.* %{_libdir}/kconf_update_bin/kwin-6.0-*
%{_libdir}/libkwinglutils.so.* %{_libdir}/libkwin.so
#%{_libdir}/libkwinxrenderutils.so.* %{_libdir}/kconf_update_bin/kwin5_update_default_rules
%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/*.so %dir %{_qt6_plugindir}/kwin/effects/configs
%{_libdir}/qt5/plugins/plasma/kcms/systemsettings_qwidgets/*.so %{_qt6_plugindir}/kwin/effects/configs/*.so
%dir %{_libdir}/qt5/plugins/kwin %dir %{_qt6_plugindir}/kwin/plugins
%dir %{_libdir}/qt5/plugins/kwin/effects %{_qt6_plugindir}/kwin/plugins/*.so
%dir %{_libdir}/qt5/plugins/kwin/effects/configs %dir %{_kf6_plugindir}/packagestructure
%{_libdir}/qt5/plugins/kwin/effects/configs/kcm_kwin4_genericscripted.so %{_kf6_plugindir}/packagestructure/kwin_*.so
%{_libdir}/qt5/plugins/kwin/effects/configs/kwin_*.so %{_qt6_plugindir}/plasma/kcms/systemsettings_qwidgets/*.so
%dir %{_libdir}/qt5/plugins/kwin/plugins %{_qt6_plugindir}/org.kde.kdecoration2.kcm/kcm_auroraedecoration.so
%{_libdir}/qt5/plugins/kwin/plugins/*.so %{_qt6_plugindir}/org.kde.kdecoration2/org.kde.kwin.aurorae.so
%dir %{_libdir}/qt5/plugins/org.kde.kdecoration2 %{_qt6_plugindir}/plasma/kcms/systemsettings/*.so
%{_libdir}/qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so %dir %{_qt6_qmldir}/org/kde/kwin
%dir %{_libdir}/qt5/plugins/kpackage/packagestructure %{_qt6_qmldir}/org/kde/kwin/*
%{_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/*
%{_libexecdir}/kwin-applywindowdecoration %{_libexecdir}/kwin-applywindowdecoration
%{_libexecdir}/kwin_killer_helper %{_libexecdir}/kwin_killer_helper
%{_libexecdir}/kwin_rules_dialog
%doc LICENSES %doc LICENSES
%files -n lib%{name}-devel %files -n lib%{name}-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/*.h %dir %{_includedir}/kwin
%{_libdir}/cmake/KWinDBusInterface/KWinDBusInterfaceConfig.cmake %{_includedir}/kwin/*
%{_libdir}/kconf_update_bin/kwin5_update_default_rules %dir %{_libdir}/cmake/KWin
#%{_libdir}/libkwin4_effect_builtins.so %{_libdir}/cmake/KWin/KWin*.cmake
%{_libdir}/libkwineffects.so %dir %{_libdir}/cmake/KWinDBusInterface
%{_libdir}/libkwinglutils.so %{_libdir}/cmake/KWinDBusInterface/KWinDBusInterface*.cmake
#%{_libdir}/libkwinxrenderutils.so
%dir %{_libdir}/cmake/KWinEffects
%{_libdir}/cmake/KWinEffects/KWinEffects*.cmake
%changelog %changelog
* Wed Mar 13 2024 Automatic Build System <autodist@openmamba.org> 6.0.2-1mamba
- automatic version update by autodist
* Thu Mar 07 2024 Automatic Build System <autodist@openmamba.org> 6.0.1-1mamba
- automatic version update by autodist
* Sat Mar 02 2024 Automatic Build System <autodist@openmamba.org> 6.0.0-1mamba
- automatic version update by autodist
* Tue Feb 06 2024 Automatic Build System <autodist@openmamba.org> 5.93.0-1mamba
- automatic version update by autodist
* Thu Dec 07 2023 Automatic Build System <autodist@mambasoft.it> 5.27.10-1mamba * Thu Dec 07 2023 Automatic Build System <autodist@mambasoft.it> 5.27.10-1mamba
- automatic version update by autodist - automatic version update by autodist