diff --git a/srcpkgs/kwin/patches/atomic-type.patch b/srcpkgs/kwin/patches/atomic-type.patch
new file mode 100644
index 00000000000..39d3878a6d8
--- /dev/null
+++ b/srcpkgs/kwin/patches/atomic-type.patch
@@ -0,0 +1,36 @@
+--- 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
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 8228a742c82..4234b682a06 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -30,10 +30,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	broken="Q_STATIC_ASSERT_X(QAtomicOpsSupport<sizeof(T)>::IsSupported"
-fi
-
 post_extract() {
 	_qt5_dep_ver="${depends#*>=}"
 	_qt5_dep_ver="${_qt5_dep_ver%<*}"