kde-plasma/kwin: Fix build with future glibc

Gentoo-bug: 603138

Package-Manager: Portage-2.3.5, Repoman-2.3.1

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
new file mode 100644 (file)
index 0000000..61c07fe
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
@@ -0,0 +1,38 @@
+commit 8efef12eeb377e9087551e333d65631968c80e5f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Jun 10 17:00:25 2017 +0200
+
+    Fix build with future glibc (major/minor macros), BSD compatible
+    
+    Summary:
+    Also adding sys/types.h which is not implicitly included from all over.
+    
+    Thanks-to: [ade] in #kde-devel
+    
+    See also:
+    https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html
+    https://git.reviewboard.kde.org/r/127662/
+    
+    Reviewers: #plasma
+    
+    Subscribers: plasma-devel, kwin, #kwin, adridg
+    
+    Tags: #kwin
+    
+    Differential Revision: https://phabricator.kde.org/D6175
+
+diff --git a/logind.cpp b/logind.cpp
+index fee0f2ff4..bb84af4f9 100644
+--- a/logind.cpp
++++ b/logind.cpp
+@@ -29,6 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <QDBusMetaType>
+ 
+ #include <sys/stat.h>
++#include <sys/types.h>
++#ifndef major
++#include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include "utils.h"
+ 

diff --git a/kde-plasma/kwin/kwin-5.10.1.ebuild b/kde-plasma/kwin/kwin-5.10.1.ebuild
index 3566ab51d844f937b2a09cd7b1085949d0d6222e..30a4b71b6a2331ffd9113321d9aee29fd9e212da 100644 (file)
--- a/kde-plasma/kwin/kwin-5.10.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.10.1.ebuild
@@ -87,6 +87,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
 src_prepare() {
        kde5_src_prepare
        use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"

diff --git a/kde-plasma/kwin/kwin-5.8.7.ebuild b/kde-plasma/kwin/kwin-5.8.7.ebuild
index bfbefa0351d923b61f61cb67c34f7c18abefd460..aba9f3344deb2972d0837f34886fd35d478494bc 100644 (file)
--- a/kde-plasma/kwin/kwin-5.8.7.ebuild
+++ b/kde-plasma/kwin/kwin-5.8.7.ebuild
@@ -89,6 +89,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-glibc-sysmacros.patch" )
+
 src_prepare() {
        kde5_src_prepare
        use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"

diff --git a/kde-plasma/kwin/kwin-5.9.5.ebuild b/kde-plasma/kwin/kwin-5.9.5.ebuild
index 77c9c31ad8b8290c64a28b4862630171827eb999..222df722d24fd0c11ac822d837a76b18cb376e5f 100644 (file)
--- a/kde-plasma/kwin/kwin-5.9.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.9.5.ebuild
@@ -88,6 +88,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
 src_prepare() {
        kde5_src_prepare
        use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"