$ git show --format=fuller --patch-with-stat --summary fbf98ececf09a293a1e157b24b9e38abdba4a313
commit fbf98ececf09a293a1e157b24b9e38abdba4a313
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Thu Oct 31 20:48:53 2019 +0100
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Thu Oct 31 20:48:53 2019 +0100
5.17.2
---
.abf.yml | 2 +-
kwin-5.17.0-libglvnd.patch | 72 ----------------------------------------------
kwin.spec | 3 +-
3 files changed, 2 insertions(+), 75 deletions(-)
delete mode 100644 kwin-5.17.0-libglvnd.patch
diff --git a/.abf.yml b/.abf.yml
index 49362a1..082f1a6 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- kwin-5.17.1.tar.xz: 4421c6fa002496b27417e3b5a3364340bd2dc120
+ kwin-5.17.2.tar.xz: 3920c518bc6061240c554d95e0b233575cf263d3
diff --git a/kwin-5.17.0-libglvnd.patch b/kwin-5.17.0-libglvnd.patch
deleted file mode 100644
index 1d92165..0000000
--- a/kwin-5.17.0-libglvnd.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up kwin-5.17.0/plugins/qpa/eglhelpers.cpp.omv~ kwin-5.17.0/plugins/qpa/eglhelpers.cpp
---- kwin-5.17.0/plugins/qpa/eglhelpers.cpp.omv~ 2019-10-10 21:39:15.923492930 +0200
-+++ kwin-5.17.0/plugins/qpa/eglhelpers.cpp 2019-10-10 21:48:43.385553399 +0200
-@@ -19,10 +19,10 @@ You should have received a copy of the G
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
-
--#include "eglhelpers.h"
--
- #include <logging.h>
-
-+#include "eglhelpers.h"
-+
- #include <QOpenGLContext>
-
- namespace KWin
-diff -up kwin-5.17.0/plugins/qpa/eglhelpers.h.omv~ kwin-5.17.0/plugins/qpa/eglhelpers.h
---- kwin-5.17.0/plugins/qpa/eglhelpers.h.omv~ 2019-10-10 21:47:10.821104187 +0200
-+++ kwin-5.17.0/plugins/qpa/eglhelpers.h 2019-10-10 21:48:21.763449653 +0200
-@@ -24,6 +24,11 @@ along with this program. If not, see <h
- #include <epoxy/egl.h>
- #include "fixqopengl.h"
-
-+// Fun with defines from X11 headers #define-ing stuff
-+// that Qt uses as enum members...
-+#undef None
-+#undef CursorShape
-+
- #include <QSurfaceFormat>
-
- namespace KWin
-diff -up kwin-5.17.0/plugins/qpa/offscreensurface.cpp.omv~ kwin-5.17.0/plugins/qpa/offscreensurface.cpp
---- kwin-5.17.0/plugins/qpa/offscreensurface.cpp.omv~ 2019-10-10 21:51:20.418288355 +0200
-+++ kwin-5.17.0/plugins/qpa/offscreensurface.cpp 2019-10-10 21:53:52.682975860 +0200
-@@ -18,13 +18,14 @@ You should have received a copy of the G
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
-
-+#include <QOffscreenSurface>
-+#include <QDataStream>
-+
- #include "offscreensurface.h"
- #include "eglhelpers.h"
- #include "main.h"
- #include "platform.h"
-
--#include <QOffscreenSurface>
--
- namespace KWin
- {
- namespace QPA
-diff -up kwin-5.17.0/plugins/qpa/offscreensurface.h.omv~ kwin-5.17.0/plugins/qpa/offscreensurface.h
---- kwin-5.17.0/plugins/qpa/offscreensurface.h.omv~ 2019-10-10 21:49:44.061841036 +0200
-+++ kwin-5.17.0/plugins/qpa/offscreensurface.h 2019-10-10 21:54:24.870118662 +0200
-@@ -24,6 +24,17 @@ along with this program. If not, see <h
- #include <epoxy/egl.h>
- #include "fixqopengl.h"
-
-+// fun with X11 headers #define-ing stuff Qt uses as enum members
-+#undef FontChange
-+#undef CursorShape
-+#undef Expose
-+#undef KeyPress
-+#undef KeyRelease
-+#undef FocusIn
-+#undef FocusOut
-+#undef Bool
-+#undef Always
-+
- #include <qpa/qplatformoffscreensurface.h>
-
- namespace KWin
diff --git a/kwin.spec b/kwin.spec
index 38f1d10..02cc9b6 100644
--- a/kwin.spec
+++ b/kwin.spec
@@ -27,7 +27,7 @@
%global optflags %{optflags} -O3
Name: kwin
-Version: 5.17.1
+Version: 5.17.2
Release: 1
Source0: http://download.kde.org/%{stable}/plasma/%{plasmaver}/%{name}-%{version}.tar.xz
Source1000: %{name}.rpmlintrc
@@ -35,7 +35,6 @@ Source1000: %{name}.rpmlintrc
# (tpg) is it still needed ?
#Patch1: kwin-5.3.0-enable-minimizeall.patch
Patch2: kwin-5.10.5-aarch64-compile.patch
-Patch3: kwin-5.17.0-libglvnd.patch
Summary: The KWin window manager
URL: http://kde.org/
License: GPL