From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3144139694 for ; Tue, 13 Jun 2017 21:09:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AC75E0DC8; Tue, 13 Jun 2017 21:09:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0224E0DC8 for ; Tue, 13 Jun 2017 21:09:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 686B934198B for ; Tue, 13 Jun 2017 21:09:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D9E773E0 for ; Tue, 13 Jun 2017 21:09:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1497385364.c3e6e6bdcd1108209df98de131a49bf6cf86c86d.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch kde-plasma/kwin/kwin-5.10.49.9999.ebuild kde-plasma/kwin/kwin-5.8.49.9999.ebuild X-VCS-Directories: kde-plasma/kwin/ kde-plasma/kwin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c3e6e6bdcd1108209df98de131a49bf6cf86c86d X-VCS-Branch: master Date: Tue, 13 Jun 2017 21:09:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f398162-2625-44e5-8d1d-d57bce9f0b1c X-Archives-Hash: 84f28592bf71fb7b94ecaff880924342 commit: c3e6e6bdcd1108209df98de131a49bf6cf86c86d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 13 20:19:33 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 13 20:22:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3e6e6bd 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.49.9999.ebuild | 2 ++ kde-plasma/kwin/kwin-5.8.49.9999.ebuild | 2 ++ 3 files changed, 42 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 0000000000..61c07feaee --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch @@ -0,0 +1,38 @@ +commit 8efef12eeb377e9087551e333d65631968c80e5f +Author: Andreas Sturmlechner +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 . + #include + + #include ++#include ++#ifndef major ++#include ++#endif + #include + #include "utils.h" + diff --git a/kde-plasma/kwin/kwin-5.10.49.9999.ebuild b/kde-plasma/kwin/kwin-5.10.49.9999.ebuild index 2c30350ef7..a66b73c17a 100644 --- a/kde-plasma/kwin/kwin-5.10.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.10.49.9999.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.49.9999.ebuild b/kde-plasma/kwin/kwin-5.8.49.9999.ebuild index b80a548d23..f02dc903ec 100644 --- a/kde-plasma/kwin/kwin-5.8.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.8.49.9999.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"