Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/
Date: Sat, 03 Feb 2018 19:47:40
Message-Id: 1517687244.01e476f91b42ffe55c8450490e7f3e88738d1410.asturm@gentoo
1 commit: 01e476f91b42ffe55c8450490e7f3e88738d1410
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 3 19:25:15 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 3 19:47:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e476f9
7
8 kde-plasma/kwin: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/7038
11
12 .../kwin/files/kwin-5.8.7-glibc-sysmacros.patch | 38 ----------------------
13 1 file changed, 38 deletions(-)
14
15 diff --git a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
16 deleted file mode 100644
17 index 61c07feaee3..00000000000
18 --- a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
19 +++ /dev/null
20 @@ -1,38 +0,0 @@
21 -commit 8efef12eeb377e9087551e333d65631968c80e5f
22 -Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
23 -Date: Sat Jun 10 17:00:25 2017 +0200
24 -
25 - Fix build with future glibc (major/minor macros), BSD compatible
26 -
27 - Summary:
28 - Also adding sys/types.h which is not implicitly included from all over.
29 -
30 - Thanks-to: [ade] in #kde-devel
31 -
32 - See also:
33 - https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html
34 - https://git.reviewboard.kde.org/r/127662/
35 -
36 - Reviewers: #plasma
37 -
38 - Subscribers: plasma-devel, kwin, #kwin, adridg
39 -
40 - Tags: #kwin
41 -
42 - Differential Revision: https://phabricator.kde.org/D6175
43 -
44 -diff --git a/logind.cpp b/logind.cpp
45 -index fee0f2ff4..bb84af4f9 100644
46 ---- a/logind.cpp
47 -+++ b/logind.cpp
48 -@@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
49 - #include <QDBusMetaType>
50 -
51 - #include <sys/stat.h>
52 -+#include <sys/types.h>
53 -+#ifndef major
54 -+#include <sys/sysmacros.h>
55 -+#endif
56 - #include <unistd.h>
57 - #include "utils.h"
58 -