From c233760a1e3a8303febaf595cf3e19f0a1a982f7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 8 Sep 2021 13:32:34 -0500 Subject: [PATCH 1/8] rebuild --- kwin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kwin.spec b/kwin.spec index 9546a31..017315d 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.22.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Wed Sep 08 2021 Rex Dieter - 5.22.5-2 +- rebuild + * Tue Aug 31 2021 Jan Grulich - 5.22.5-1 - 5.22.5 From 053a8742a188f716b69d16db71efb887a49474ce Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Sep 2021 08:53:56 -0500 Subject: [PATCH 2/8] pull in proposed libglvnd-1.3.4 FTBFS fix (kde#440372, rh#2002431) --- ...-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch | 30 +++++++++++++++++++ kwin.spec | 6 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch diff --git a/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch b/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch new file mode 100644 index 0000000..4c0a435 --- /dev/null +++ b/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch @@ -0,0 +1,30 @@ +From b6b310d0168b210d0dd3b3703d570b5f8b3d1dfb Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii +Date: Fri, 10 Sep 2021 13:36:04 +0300 +Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES + +eglCreateWindowSurface() wants a Window/xcb_window_t, but with +EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an +opaque pointer, i.e. void*. + +BUG: 440372 +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index c62ec170d..da4c27c8e 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -221,7 +221,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + // cannot be an xcb_window_t. + surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr); + } else { +- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr); ++ surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast(window), nullptr); + } + + return surface; +-- +2.31.1 + diff --git a/kwin.spec b/kwin.spec index 017315d..4a7e524 100644 --- a/kwin.spec +++ b/kwin.spec @@ -39,6 +39,8 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## upstream patches ## proposed patches +# https://invent.kde.org/plasma/kwin/-/merge_requests/1404 +Patch100: 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch # Base BuildRequires: extra-cmake-modules @@ -361,8 +363,8 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog -* Wed Sep 08 2021 Rex Dieter - 5.22.5-2 -- rebuild +* Fri Sep 10 2021 Rex Dieter - 5.22.5-2 +- pull in proposed libglvnd-1.3.4 FTBFS fix (kde#440372, rh#2002431) * Tue Aug 31 2021 Jan Grulich - 5.22.5-1 - 5.22.5 From 1c286bf4f9735dceeb692ab15bd8797da5c8048e Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 17 Sep 2021 09:41:46 +0200 Subject: [PATCH 3/8] 5.22.90 --- .gitignore | 1 + kwin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bd18d25..e101732 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /kwin-5.22.3.tar.xz /kwin-5.22.4.tar.xz /kwin-5.22.5.tar.xz +/kwin-5.22.90.tar.xz diff --git a/kwin.spec b/kwin.spec index 4a7e524..c48509b 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.22.5 -Release: 2%{?dist} +Version: 5.22.90 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -363,6 +363,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Fri Sep 17 2021 Marc Deop - 5.22.90-1 +- 5.22.90 + * Fri Sep 10 2021 Rex Dieter - 5.22.5-2 - pull in proposed libglvnd-1.3.4 FTBFS fix (kde#440372, rh#2002431) diff --git a/sources b/sources index fd00088..f2255f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.22.5.tar.xz) = 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2 +SHA512 (kwin-5.22.90.tar.xz) = 89dcb08f00a130ff5498f641993aec3997b9ff95ffcc8749cd4d3bfacc204ac9e83f6a9653f14fa0743276cefc02220ac96e898c653c2f18261a2a5a0e3fffea From 94c523372a0ac0893fc1c468ae164204fa00ec2a Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Mon, 20 Sep 2021 09:06:14 +0200 Subject: [PATCH 4/8] feat: remove patch applied upstream and adjust files section --- ...-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch | 30 ------------------- kwin.spec | 18 ++++++++--- 2 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch diff --git a/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch b/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch deleted file mode 100644 index 4c0a435..0000000 --- a/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b6b310d0168b210d0dd3b3703d570b5f8b3d1dfb Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -Date: Fri, 10 Sep 2021 13:36:04 +0300 -Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES - -eglCreateWindowSurface() wants a Window/xcb_window_t, but with -EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an -opaque pointer, i.e. void*. - -BUG: 440372 ---- - src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp -index c62ec170d..da4c27c8e 100644 ---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp -+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp -@@ -221,7 +221,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) - // cannot be an xcb_window_t. - surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr); - } else { -- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr); -+ surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast(window), nullptr); - } - - return surface; --- -2.31.1 - diff --git a/kwin.spec b/kwin.spec index c48509b..5f9162d 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.22.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -39,8 +39,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## upstream patches ## proposed patches -# https://invent.kde.org/plasma/kwin/-/merge_requests/1404 -Patch100: 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch # Base BuildRequires: extra-cmake-modules @@ -120,6 +118,7 @@ BuildRequires: kf5-krunner-devel BuildRequires: kdecoration-devel >= %{majmin_ver} BuildRequires: kscreenlocker-devel >= %{majmin_ver} BuildRequires: plasma-breeze-devel >= %{majmin_ver} +BuildRequires: plasma-wayland-protocols-devel BuildRequires: kwayland-server-devel >= %{majmin_ver} %if 0%{?tests} @@ -292,9 +291,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/kwin/ %{_kf5_qtplugindir}/kcms/ +%{_kf5_qtplugindir}/kpackage/packagestructure/ %{_kf5_qtplugindir}/org.kde.kdecoration2/*.so %dir %{_kf5_qtplugindir}/org.kde.kwin.platforms -%{_kf5_qtplugindir}/kpackage/packagestructure/kwin_packagestructure*.so %{_kf5_qtplugindir}/org.kde.kwin.scenes/*.so %{_qt5_qmldir}/org/kde/kwin %{_kf5_libdir}/kconf_update_bin/kwin5_update_default_rules @@ -306,6 +305,12 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %{_datadir}/kconf_update/kwin-5.18-move-animspeed.py %{_datadir}/kconf_update/kwin-5.21-desktop-grid-click-behavior.py %{_datadir}/kconf_update/kwin-5.21-no-swap-encourage.py +%{_datadir}/kconf_update/kwin-5.23-disable-translucency-effect.sh +%{_datadir}/kconf_update/kwin-5.23-remove-cover-switch.py +%{_datadir}/kconf_update/kwin-5.23-remove-cubeslide.py +%{_datadir}/kconf_update/kwin-5.23-remove-flip-switch.py +%{_datadir}/kconf_update/kwin-5.23-remove-xrender-backend.py +%{_datadir}/kconf_update/kwinrules-5.23-virtual-desktop-ids.py %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservices5/kwin %{_kf5_datadir}/kservicetypes5/*.desktop @@ -363,6 +368,11 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Sun Sep 19 2021 Marc Deop - 5.22.90-2 +- Remove patch already applied upstream +- Add BuildRequires plasma-wayland-protocols-devel +- Adjust files section + * Fri Sep 17 2021 Marc Deop - 5.22.90-1 - 5.22.90 From 4a6a848a17888694a983b661d1ac6a51f46763ed Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 8 Oct 2021 12:44:39 +0200 Subject: [PATCH 5/8] 5.23.0 --- .gitignore | 1 + kwin.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e101732..87909e8 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /kwin-5.22.4.tar.xz /kwin-5.22.5.tar.xz /kwin-5.22.90.tar.xz +/kwin-5.23.0.tar.xz diff --git a/kwin.spec b/kwin.spec index 5f9162d..98faf42 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.22.90 -Release: 2%{?dist} +Version: 5.23.0 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -37,6 +37,8 @@ URL: https://userbase.kde.org/KWin Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## upstream patches +Patch101: f18bf757928ec41e0300d61d17a68c7d9033816e.patch +Patch102: 6e3c3936dc3924105c49f8e0b41bf789883d173b.patch ## proposed patches @@ -368,6 +370,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Fri Oct 08 2021 Marc Deop - 5.23.0-1 +- 5.23.0 + * Sun Sep 19 2021 Marc Deop - 5.22.90-2 - Remove patch already applied upstream - Add BuildRequires plasma-wayland-protocols-devel diff --git a/sources b/sources index f2255f1..2fefdba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.22.90.tar.xz) = 89dcb08f00a130ff5498f641993aec3997b9ff95ffcc8749cd4d3bfacc204ac9e83f6a9653f14fa0743276cefc02220ac96e898c653c2f18261a2a5a0e3fffea +SHA512 (kwin-5.23.0.tar.xz) = 46f6fe40d3d93fb0a8f7a2495e4fa3dbbfb9842a569def0227d49815b9af3853be76fd7bf56c77d42134d209d588f6d3ab7baf2dfb0cbed906372c368ae12bdb From d16a45ed4bb8ddfabdb41b3fdb7fe4a6a94ea485 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 8 Oct 2021 20:54:52 +0200 Subject: [PATCH 6/8] fix: remove wrongly added patches --- kwin.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/kwin.spec b/kwin.spec index 98faf42..416e11b 100644 --- a/kwin.spec +++ b/kwin.spec @@ -37,8 +37,6 @@ URL: https://userbase.kde.org/KWin Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## upstream patches -Patch101: f18bf757928ec41e0300d61d17a68c7d9033816e.patch -Patch102: 6e3c3936dc3924105c49f8e0b41bf789883d173b.patch ## proposed patches From 73a366bd1e0d2469e06d7dbd54e7582250df38b1 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Sun, 24 Oct 2021 09:45:05 +0200 Subject: [PATCH 7/8] feat: release 5.23.1 --- .gitignore | 1 + kwin.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 87909e8..f17aa7e 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /kwin-5.22.5.tar.xz /kwin-5.22.90.tar.xz /kwin-5.23.0.tar.xz +/kwin-5.23.1.tar.xz diff --git a/kwin.spec b/kwin.spec index 416e11b..cd776e2 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.23.0 +Version: 5.23.1 Release: 1%{?dist} Summary: KDE Window manager @@ -368,6 +368,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Sat Oct 23 2021 Marc Deop - 5.23.1-1 +- 5.23.1 + * Fri Oct 08 2021 Marc Deop - 5.23.0-1 - 5.23.0 diff --git a/sources b/sources index 2fefdba..6e7a42b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.23.0.tar.xz) = 46f6fe40d3d93fb0a8f7a2495e4fa3dbbfb9842a569def0227d49815b9af3853be76fd7bf56c77d42134d209d588f6d3ab7baf2dfb0cbed906372c368ae12bdb +SHA512 (kwin-5.23.1.tar.xz) = b3dd5585f2baed520474d12d301fb4d3d356fffac5f532dcd642d5413627f6c7f02ef6406da584db1cba99bc96e983d6ea5b4a2104d2f39ed219f25fed7d3a78 From 486291c53422615b06f37de19a6ddfd3850aa6e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Oct 2021 15:43:35 -0500 Subject: [PATCH 8/8] 5.23.2 --- .gitignore | 1 + kwin.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f17aa7e..ec458c7 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /kwin-5.22.90.tar.xz /kwin-5.23.0.tar.xz /kwin-5.23.1.tar.xz +/kwin-5.23.2.tar.xz diff --git a/kwin.spec b/kwin.spec index cd776e2..c01f1df 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.23.1 +Version: 5.23.2 Release: 1%{?dist} Summary: KDE Window manager @@ -368,6 +368,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Oct 26 2021 Rex Dieter - 5.23.2-1 +- 5.23.2 + * Sat Oct 23 2021 Marc Deop - 5.23.1-1 - 5.23.1 diff --git a/sources b/sources index 6e7a42b..00c3a69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.23.1.tar.xz) = b3dd5585f2baed520474d12d301fb4d3d356fffac5f532dcd642d5413627f6c7f02ef6406da584db1cba99bc96e983d6ea5b4a2104d2f39ed219f25fed7d3a78 +SHA512 (kwin-5.23.2.tar.xz) = d7062504d26a3fe6db5d8d34486d450035613a8d5f986a074aeda8e22acde06e2dbfde17daccd8199a2f3a7855d1e891c92af7478150e7f320b592143aca4ebd