Add upstream patch to fix regression that causes KWin crash (KDE#339771)

epel8
Dan Vrátil 10 years ago
parent 55e62b120d
commit 2018e00daa

@ -0,0 +1,39 @@
commit 3576df163c8c64ebba74fc51c95de900dbf0220e
Author: Martin Gräßlin <mgraesslin@kde.org>
Date: Thu Oct 9 11:06:54 2014 +0200
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
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];

@ -3,7 +3,7 @@
Name: kf5-%{framework}
Version: 5.3.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management
License: LGPLv2+ and MIT
@ -14,6 +14,9 @@ URL: http://www.kde.org
#Source0: %{name}-%{version}-%{snapshot}git.tar.bz2
Source0: http://download.kde.org/stable/frameworks/%{version}/%{framework}-%{version}.tar.xz
# Upstream fix for KDE#339771
Patch10: kf5-kwindowsystem-5.3.0-kde#339771.patch
BuildRequires: kf5-rpm-macros
BuildRequires: extra-cmake-modules
BuildRequires: qt5-qtbase-devel
@ -42,6 +45,8 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
%patch10 -p1 -b .kde339771
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@ -72,6 +77,9 @@ make %{?_smp_mflags} -C %{_target_platform}
%changelog
* Mon Oct 13 2014 Daniel Vrátil <dvratil@redhat.com> - 5.3.0-2
- Add upstream patch for KDE#339771 (fixes crash in KWin on startup)
* Tue Oct 07 2014 Daniel Vrátil <dvratil@redhat.com> - 5.3.0-1
- KDE Frameworks 5.3.0

Loading…
Cancel
Save