From b243d715a0527d268e76f57a0f8dc496b30a515a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Oct 2017 21:10:38 +0100 Subject: x11-base/xorg-server : resync with gentoo changes --- .../files/xorg-server-1.19.4-sysmacros.patch | 36 ++++++++++++++++++++++ .../files/xorg-server-1.19.5-sysmacros.patch | 36 ---------------------- .../xorg-server/xorg-server-1.19.5-r1710.ebuild | 8 ++--- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch delete mode 100644 x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch new file mode 100644 index 00000000..8a3cb769 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch @@ -0,0 +1,36 @@ +From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 11 Oct 2017 16:11:49 +0300 +Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor + functions for new glibc + +Commits d732c36597fa and 84e3b96b5313 added the include to some files, but +missed config/udev.c, where the major and minor functions are used as well. +This should be Linux-only, so we don't need the sys/mkdev.h case here for +Solaris. + +Signed-off-by: Mart Raudsepp +--- +https://bugs.gentoo.org/633530 +https://patchwork.freedesktop.org/patch/181800/ + + config/udev.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/config/udev.c b/config/udev.c +index 932f230..b3b8d0f 100644 +--- a/config/udev.c ++++ b/config/udev.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "input.h" + #include "inputstr.h" +-- +2.10.2 + diff --git a/x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch deleted file mode 100644 index 8a3cb769..00000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Wed, 11 Oct 2017 16:11:49 +0300 -Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor - functions for new glibc - -Commits d732c36597fa and 84e3b96b5313 added the include to some files, but -missed config/udev.c, where the major and minor functions are used as well. -This should be Linux-only, so we don't need the sys/mkdev.h case here for -Solaris. - -Signed-off-by: Mart Raudsepp ---- -https://bugs.gentoo.org/633530 -https://patchwork.freedesktop.org/patch/181800/ - - config/udev.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/config/udev.c b/config/udev.c -index 932f230..b3b8d0f 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -30,6 +30,9 @@ - #include - #include - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "input.h" - #include "inputstr.h" --- -2.10.2 - diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild index edeee84e..596d09b8 100644 --- a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild @@ -9,10 +9,10 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -144,7 +144,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}"/${P}-sysmacros.patch #633530 + "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 ) pkg_pretend() { @@ -175,7 +175,6 @@ src_configure() { $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) $(use_enable tslib) $(use_enable unwind libunwind) $(use_enable wayland xwayland) @@ -195,6 +194,7 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) --enable-libdrm + --enable-suid-wrapper --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var --with-fontrootdir="${EPREFIX}"/usr/share/fonts -- cgit v1.2.3