[SCM] kwindowsystem packaging branch, kubuntu_utopic_next, updated. dab9510bcbcbaf086b650205d408c684243b1111

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=e7a16b1

The following commit has been merged in the kubuntu_utopic_next branch:
commit e7a16b19f0dc5c5e6fa226ffcb0ea070003603b8
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 10 17:02:00 2014 +0200

    releasing package kwindowsystem version 5.3.0-0ubuntu2
---
 debian/patches/series                              |  1 +
 ...pstream_fix-incorrect-count-of-netwm-atoms.diff | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3bf2c96
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix-incorrect-count-of-netwm-atoms.diff
diff --git a/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff b/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff
new file mode 100644
index 0000000..aacef8e
--- /dev/null
+++ b/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff
@@ -0,0 +1,30 @@
+Description: Fix incorrect count of netwm atoms
+ 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.
+Author: Martin Gräßlin
+Origin: upstream, https://git.reviewboard.kde.org/r/120539
+Bug: https://bugs.kde.org/show_bug.cgi?id=339771
+Last-Update: 2014-10-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/netwm.cpp b/src/netwm.cpp
+index 3107a2388c2fb3f1a8ad97e466be40e6977e064b..7b398d46e9da2c85a96ab67b6c0f97b22ceae4a3 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];

-- 
kwindowsystem packaging