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 C0968139694 for ; Sat, 10 Jun 2017 16:12:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A2C5E0ED0; Sat, 10 Jun 2017 16:12:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6400AE0ED0 for ; Sat, 10 Jun 2017 16:12:35 +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 00E75341A0F for ; Sat, 10 Jun 2017 16:12:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D69D1745D for ; Sat, 10 Jun 2017 16:12:31 +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: <1497111039.35c1419142a37a2be44c1a66d91f57b9b84382b8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch kde-plasma/kwin/kwin-5.10.1.ebuild kde-plasma/kwin/kwin-5.8.7.ebuild kde-plasma/kwin/kwin-5.9.5.ebuild X-VCS-Directories: kde-plasma/kwin/files/ kde-plasma/kwin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 35c1419142a37a2be44c1a66d91f57b9b84382b8 X-VCS-Branch: master Date: Sat, 10 Jun 2017 16:12:31 +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: 1682af16-3213-4499-b2fe-e0c49600a6c1 X-Archives-Hash: 52ae5db42e7f133ff4a71154cec14ad8 commit: 35c1419142a37a2be44c1a66d91f57b9b84382b8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 10 16:10:39 2017 +0000 Commit: Andreas Sturmlechner gentoo 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 +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.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"