OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kwindowsystem?expand=0&rev=42

0001-Fix-incorrect-count-of-netwm-atoms.patch

@@ -0,0 +1,44 @@
+From 3576df163c8c64ebba74fc51c95de900dbf0220e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
+Date: Thu, 9 Oct 2014 11:06:54 +0200
+Subject: [PATCH 1/1] Fix incorrect count of netwm atoms
+
+This fixes a regression introduced with
+59cb063b99e6ec13c0bc3cf3fd95a01258184e86.
+
+The commit added 4 new atoms but only incremented the atom count by 3.
+Which can cause a crash as soon as the NET classes are used.
+
+To ensure that such an error is not introduced again, an assert is
+added.
+
+BUG: 339771
+REVIEW: 120539
+---
+ src/netwm.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/netwm.cpp b/src/netwm.cpp
+index 3107a23..7b398d4 100644
+--- a/src/netwm.cpp
++++ b/src/netwm.cpp
+@@ -386,7 +386,7 @@ static QByteArray get_atom_name(xcb_connection_t *c, xcb_atom_t atom)
+ }
+ #endif
+ 
+-static const int netAtomCount = 91;
++static const int netAtomCount = 92;
+ 
+ static void create_netwm_atoms(xcb_connection_t *c)
+ {
+@@ -498,6 +498,7 @@ static void create_netwm_atoms(xcb_connection_t *c)
+     };
+ 
+     assert(!netwm_atoms_created);
++    assert(sizeof(atoms)/sizeof(atoms[0]) == netAtomCount + 1);
+ 
+     // Send the intern atom requests
+     xcb_intern_atom_cookie_t cookies[netAtomCount];
+-- 
+2.1.1
+

kwindowsystem.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 10 16:26:27 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Added 0001-Fix-incorrect-count-of-netwm-atoms.patch, kde#339771
+
 -------------------------------------------------------------------
 Sat Oct  4 17:59:57 UTC 2014 - hrvoje.senjan@gmail.com
 

kwindowsystem.spec

@@ -39,6 +39,8 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
+# PATCH-FIX-UPSTREAM 0001-Fix-incorrect-count-of-netwm-atoms.patch
+Patch0:         0001-Fix-incorrect-count-of-netwm-atoms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -81,6 +83,7 @@ Development files.
 %lang_package -n %lname
 %prep
 %setup -q
+%patch0 -p1
 
 %build
   %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert