epel9
Jan Grulich 5 years ago
parent 851bc9bab3
commit dc3dd45a24

1
.gitignore vendored

@ -58,3 +58,4 @@
/kwin-5.18.90.tar.xz /kwin-5.18.90.tar.xz
/kwin-5.19.0.tar.xz /kwin-5.19.0.tar.xz
/kwin-5.19.1.tar.xz /kwin-5.19.1.tar.xz
/kwin-5.19.2.tar.xz

@ -1,43 +0,0 @@
diff --git a/input.cpp b/input.cpp
index a0ba034ce..8c399af20 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1669,7 +1669,7 @@ public:
static const auto createDefaultCursor = [] {
WaylandCursorImage defaultCursor;
WaylandCursorImage::Image ret;
- defaultCursor.loadThemeCursor(CursorShape(Qt::CrossCursor), &ret);
+ defaultCursor.loadThemeCursor2(CursorShape(Qt::CrossCursor), &ret);
return ret;
};
static const auto defaultCursor = createDefaultCursor();
diff --git a/pointer_input.cpp b/pointer_input.cpp
index 55af1502a..9e96b7331 100644
--- a/pointer_input.cpp
+++ b/pointer_input.cpp
@@ -1270,6 +1270,12 @@ void CursorImage::loadThemeCursor(const QByteArray &shape, WaylandCursorImage::I
m_waylandImage.loadThemeCursor(shape, m_cursorsByName, image);
}
+void WaylandCursorImage::loadThemeCursor2(CursorShape shape, WaylandCursorImage::Image *image)
+{
+ loadThemeCursor(shape, image);
+}
+
+
template <typename T>
void WaylandCursorImage::loadThemeCursor(const T &shape, Image *image)
{
diff --git a/pointer_input.h b/pointer_input.h
index 1ae6a7505..386bc57f8 100644
--- a/pointer_input.h
+++ b/pointer_input.h
@@ -186,6 +186,9 @@ public:
QImage image;
QPoint hotspot;
};
+
+ void loadThemeCursor2(CursorShape shape, WaylandCursorImage::Image *image);
+
template <typename T>
void loadThemeCursor(const T &shape, Image *image);

@ -9,7 +9,7 @@
%endif %endif
Name: kwin Name: kwin
Version: 5.19.1 Version: 5.19.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: KDE Window manager Summary: KDE Window manager
@ -31,7 +31,6 @@ URL: https://userbase.kde.org/KWin
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
## upstream patches ## upstream patches
Patch0: kwin-s390x.patch
# Base # Base
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
@ -302,6 +301,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
%changelog %changelog
* Tue Jun 23 2020 Jan Grulich <jgrulich@redhat.com> - 5.19.2-1
- 5.19.2
* Wed Jun 17 2020 Martin Kyral <martin.kyral@gmail.com> - 5.19.1-1 * Wed Jun 17 2020 Martin Kyral <martin.kyral@gmail.com> - 5.19.1-1
- 5.19.1 - 5.19.1

@ -1 +1 @@
SHA512 (kwin-5.19.1.tar.xz) = 1e786227dd85b39b15c8522218b0431bfb161845148c2e398a9149aed3ef501e38b91e1f9e4048b208243629bd09e58f57d228b88e63b3c1a9566c910c81397b SHA512 (kwin-5.19.2.tar.xz) = 60d1c3abb49d7d30dc6cbfc005f2bba45b5b4688ef2ff34f6e926e2ee3936272dc4257306969a3b0546d947f4a9635ac29a3c04de954b994df93ab63c7694ac4

Loading…
Cancel
Save