commit: f72578ff6ad21268181d6d860a276850a81393b1 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Wed Dec 28 01:33:50 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Wed Dec 28 01:33:50 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72578ff
x11-base/xorg-server: fix build w/newer glibc #580044 .../files/xorg-server-1.18-sysmacros.patch | 59 ++++++++++++++++++++++ x11-base/xorg-server/xorg-server-1.18.4.ebuild | 1 + x11-base/xorg-server/xorg-server-1.19.0.ebuild | 1 + 3 files changed, 61 insertions(+) diff --git a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch new file mode 100644 index 00000000..5a3dea3 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch @@ -0,0 +1,59 @@ +From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pi...@atlas.cz> +Date: Sat, 16 Apr 2016 13:04:59 +0200 +Subject: [PATCH] Include sys/sysmacros.h for major(3) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GNU major(3) manual page prescribes <sys/types.h>, but that does not work with +sys-libs/glibc-2.23-r1. + +https://bugs.gentoo.org/show_bug.cgi?id=580044 +Signed-off-by: Petr Písař <petr.pi...@atlas.cz> +--- + config/udev.c | 1 + + hw/xfree86/common/xf86Xinput.c | 2 ++ + hw/xfree86/os-support/linux/lnx_init.c | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/config/udev.c b/config/udev.c +index 28c2658..62908f4 100644 +--- a/config/udev.c ++++ b/config/udev.c +@@ -30,6 +30,7 @@ + #include <libudev.h> + #include <ctype.h> + #include <unistd.h> ++#include <sys/sysmacros.h> + + #include "input.h" + #include "inputstr.h" +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index c56a2b9..d33c165 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -86,6 +86,8 @@ + #include <unistd.h> + #ifdef HAVE_SYS_MKDEV_H + #include <sys/mkdev.h> /* for major() & minor() on Solaris */ ++#else ++#include <sys/sysmacros.h> + #endif + + #include "mi.h" +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 1ed213c..6caf531 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c +@@ -38,6 +38,7 @@ + #include "xf86_OSlib.h" + + #include <sys/stat.h> ++#include <sys/sysmacros.h> + + #ifndef K_OFF + #define K_OFF 0x4 +-- +2.8.1 + diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild index 2c6bbb1..35971b9 100644 --- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch # needed for new eselect-opengl, bug #541232 "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 ) pkg_pretend() { diff --git a/x11-base/xorg-server/xorg-server-1.19.0.ebuild b/x11-base/xorg-server/xorg-server-1.19.0.ebuild index 41d4b14..ad88bd3 100644 --- a/x11-base/xorg-server/xorg-server-1.19.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.0.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch # needed for new eselect-opengl, bug #541232 "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 ) pkg_pretend() {
