kwin: update to 5.21.2.
This commit is contained in:
parent
88ed250e72
commit
d694aee3b4
3 changed files with 3 additions and 58 deletions
|
@ -1,36 +0,0 @@
|
||||||
--- src/ftrace.h
|
|
||||||
+++ src/ftrace.h
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
|
|
||||||
#include <kwinglobals.h>
|
|
||||||
|
|
||||||
+#include <type_traits>
|
|
||||||
#include <QFile>
|
|
||||||
#include <QMutex>
|
|
||||||
#include <QMutexLocker>
|
|
||||||
@@ -70,10 +71,15 @@ private:
|
|
||||||
|
|
||||||
class KWIN_EXPORT FTraceDuration
|
|
||||||
{
|
|
||||||
+ using ftrace_context_t = std::conditional<
|
|
||||||
+ QAtomicOpsSupport<sizeof(qulonglong)>::IsSupported,
|
|
||||||
+ qulonglong,
|
|
||||||
+ ulong>::type;
|
|
||||||
+
|
|
||||||
public:
|
|
||||||
template<typename... Args> FTraceDuration(Args... args)
|
|
||||||
{
|
|
||||||
- static QAtomicInteger<qulonglong> s_context = 0;
|
|
||||||
+ static QAtomicInteger<ftrace_context_t> s_context = 0;
|
|
||||||
QTextStream stream(&m_message);
|
|
||||||
(stream << ... << args);
|
|
||||||
stream.flush();
|
|
||||||
@@ -85,7 +91,7 @@ public:
|
|
||||||
|
|
||||||
private:
|
|
||||||
QByteArray m_message;
|
|
||||||
- qulonglong m_context;
|
|
||||||
+ ftrace_context_t m_context;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace KWin
|
|
|
@ -1,19 +0,0 @@
|
||||||
--- src/helpers/wayland_wrapper/wl-socket.c
|
|
||||||
+++ src/helpers/wayland_wrapper/wl-socket.c
|
|
||||||
@@ -8,6 +8,7 @@
|
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#define _BSD_SOURCE
|
|
||||||
#include <assert.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
@@ -155,7 +156,7 @@ struct wl_socket *wl_socket_create()
|
|
||||||
s->fd = socket(PF_LOCAL, SOCK_STREAM, 0);
|
|
||||||
|
|
||||||
int size = SUN_LEN(&s->addr);
|
|
||||||
- int ret = bind(s->fd, &s->addr, size);
|
|
||||||
+ int ret = bind(s->fd, (struct sockaddr*)&s->addr, size);
|
|
||||||
if (ret < 0) {
|
|
||||||
goto fail;
|
|
||||||
}
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'kwin'
|
# Template file for 'kwin'
|
||||||
pkgname=kwin
|
pkgname=kwin
|
||||||
version=5.21.1
|
version=5.21.2
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DBUILD_TESTING=OFF"
|
configure_args="-DBUILD_TESTING=OFF"
|
||||||
hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
|
hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
|
||||||
|
@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://invent.kde.org/plasma/kwin"
|
homepage="https://invent.kde.org/plasma/kwin"
|
||||||
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
|
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=5a044450ffdc1610a73d5db3f3f50d2513de930f4be5c167da703cc7d23abc0c
|
checksum=14896e98e5600eba7c3aa7f18168bec697ba1670c012a560b33302075bb0465a
|
||||||
patch_args=-Np1
|
patch_args=-Np1
|
||||||
|
|
||||||
build_options="pipewire"
|
build_options="pipewire"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue