summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-06-10 18:10:39 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-06-10 18:10:39 +0200
commit35c1419142a37a2be44c1a66d91f57b9b84382b8 (patch)
treea252382f4380b22e1efa50a7eb2191111905b705
parentsci-geosciences/gpscorrelate: Add missing media-gfx/exiv2 subslot op (diff)
downloadgentoo-35c1419142a37a2be44c1a66d91f57b9b84382b8.tar.gz
gentoo-35c1419142a37a2be44c1a66d91f57b9b84382b8.tar.bz2
gentoo-35c1419142a37a2be44c1a66d91f57b9b84382b8.zip
kde-plasma/kwin: Fix build with future glibc
Gentoo-bug: 603138 Package-Manager: Portage-2.3.5, Repoman-2.3.1
-rw-r--r--kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch38
-rw-r--r--kde-plasma/kwin/kwin-5.10.1.ebuild2
-rw-r--r--kde-plasma/kwin/kwin-5.8.7.ebuild2
-rw-r--r--kde-plasma/kwin/kwin-5.9.5.ebuild2
4 files changed, 44 insertions, 0 deletions
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
index 000000000000..61c07feaee35
--- /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 3566ab51d844..30a4b71b6a23 100644
--- 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 bfbefa0351d9..aba9f3344deb 100644
--- 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 77c9c31ad8b8..222df722d24f 100644
--- 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"