[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/

["Johannes Huber" <johu@gentoo.org>]

commit:     059c31670c57e299982d417b871026905d3cd2d4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 16:07:49 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 16:07:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=059c3167

kde-plasma/kwin: Fix build with future glibc

Patch by Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>,
https://git.reviewboard.kde.org/r/127662.

Gentoo-bug: 580042

Package-Manager: portage-2.2.28

 .../kwin/files/kwin-5.6.3-glibc-sysmacros.patch    | 24 ++++++++++++++++++++++
 kde-plasma/kwin/kwin-5.6.3.ebuild                  |  2 ++
 kde-plasma/kwin/kwin-5.6.49.9999.ebuild            |  2 ++
 kde-plasma/kwin/kwin-9999.ebuild                   |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
new file mode 100644
index 0000000..06016e0
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
@@ -0,0 +1,24 @@
+diff --git a/logind.cpp b/logind.cpp
+index 22a86cdfceaac3138a186cb2f7ab3eae674a1c77..7be9366614c0b70808c6944161a5801773f34a24 100644
+--- a/logind.cpp
++++ b/logind.cpp
+@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <QDBusUnixFileDescriptor>
+ 
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include "utils.h"
+ 
+diff --git a/virtual_terminal.cpp b/virtual_terminal.cpp
+index 40628315620e3d943b7ae0462c4415072fc256b8..8ceb74d3adaae610d99fa7e8349d93cea366d2e8 100644
+--- a/virtual_terminal.cpp
++++ b/virtual_terminal.cpp
+@@ -36,6 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <sys/ioctl.h>
+ #include <sys/signalfd.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #define RELEASE_SIGNAL SIGUSR1
+ #define ACQUISITION_SIGNAL SIGUSR2

diff --git a/kde-plasma/kwin/kwin-5.6.3.ebuild b/kde-plasma/kwin/kwin-5.6.3.ebuild
index 566e23a..401efc2 100644
--- a/kde-plasma/kwin/kwin-5.6.3.ebuild
+++ b/kde-plasma/kwin/kwin-5.6.3.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (	x11-libs/xcb-util-wm )
 "
 
+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.6.49.9999.ebuild b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
index e92ff08..40b5b4a 100644
--- a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (	x11-libs/xcb-util-wm )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index e92ff08..40b5b4a 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (	x11-libs/xcb-util-wm )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"