From 28ec7a9b0a04a358af55170965759a6f966a617d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 7 Apr 2015 13:07:09 +0200 Subject: [PATCH] KDE Frameworks 5.9.0 --- .gitignore | 1 + kf5-kwindowsystem-5.3.0-kde#339771.patch | 39 ------------------------ kf5-kwindowsystem.spec | 5 ++- sources | 2 +- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 kf5-kwindowsystem-5.3.0-kde#339771.patch diff --git a/.gitignore b/.gitignore index 50eeb72..07c29b8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kwindowsystem-5.6.0.tar.xz /kwindowsystem-5.7.0.tar.xz /kwindowsystem-5.8.0.tar.xz +/kwindowsystem-5.9.0.tar.xz diff --git a/kf5-kwindowsystem-5.3.0-kde#339771.patch b/kf5-kwindowsystem-5.3.0-kde#339771.patch deleted file mode 100644 index 8cf3e53..0000000 --- a/kf5-kwindowsystem-5.3.0-kde#339771.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 3576df163c8c64ebba74fc51c95de900dbf0220e -Author: Martin Gräßlin -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]; diff --git a/kf5-kwindowsystem.spec b/kf5-kwindowsystem.spec index 1aa9523..df35a1c 100644 --- a/kf5-kwindowsystem.spec +++ b/kf5-kwindowsystem.spec @@ -1,7 +1,7 @@ %global framework kwindowsystem Name: kf5-%{framework} -Version: 5.8.0 +Version: 5.9.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management @@ -75,6 +75,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Tue Apr 07 2015 Daniel Vrátil - 5.9.0-1 +- KDE Frameworks 5.9.0 + * Mon Mar 16 2015 Daniel Vrátil - 5.8.0-1 - KDE Frameworks 5.8.0 diff --git a/sources b/sources index 1d39cb0..afc7910 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abc30887409acf05d1e6e22f1c3b98e8 kwindowsystem-5.8.0.tar.xz +f597ad61413165680448d200db92d041 kwindowsystem-5.9.0.tar.xz