commit: 35c1419142a37a2be44c1a66d91f57b9b84382b8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 10 16:10:39 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 10 16:10:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c14191
kde-plasma/kwin: Fix build with future glibc Gentoo-bug: 603138 Package-Manager: Portage-2.3.5, Repoman-2.3.1 .../kwin/files/kwin-5.8.7-glibc-sysmacros.patch | 38 ++++++++++++++++++++++ kde-plasma/kwin/kwin-5.10.1.ebuild | 2 ++ kde-plasma/kwin/kwin-5.8.7.ebuild | 2 ++ kde-plasma/kwin/kwin-5.9.5.ebuild | 2 ++ 4 files changed, 44 insertions(+) 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 00000000000..61c07feaee3 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch @@ -0,0 +1,38 @@ +commit 8efef12eeb377e9087551e333d65631968c80e5f +Author: Andreas Sturmlechner <andreas.sturmlech...@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 3566ab51d84..30a4b71b6a2 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 bfbefa0351d..aba9f3344de 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 77c9c31ad8b..222df722d24 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"
