1
0
forked from pool/kwindowsystem
Hrvoje Senjan 2014-11-02 18:09:15 +00:00 committed by Git OBS Bridge
parent 7a2d933fc5
commit 4e5002a0c8
5 changed files with 14 additions and 53 deletions

View File

@ -1,44 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8670f95e87569152631977407b763e33e3d28191ab2d43e2e6072591bde5264
size 157816

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ebbfdfa6533bab6144bbb6d012dcbd84c00628fcc45a1e89270cbb6b8dcbf02
size 157836

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Nov 2 17:47:38 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 5.4.0
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.4.0.php
- Drop 0001-Fix-incorrect-count-of-netwm-atoms.patch, merged upstream
-------------------------------------------------------------------
Fri Oct 10 16:26:27 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -18,10 +18,10 @@
%define lname libKF5WindowSystem5
Name: kwindowsystem
Version: 5.3.0
Version: 5.4.0
Release: 0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 1.3.0
BuildRequires: extra-cmake-modules >= 1.4.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: libqt5-linguist-devel >= 5.2.0
@ -37,10 +37,8 @@ Summary: KDE Access to window manager
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
Source: http://download.kde.org/stable/frameworks/5.4/%{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
@ -83,7 +81,6 @@ Development files.
%lang_package -n %lname
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert