diff options
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch | 59 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch | 36 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.4-r1710.ebuild (renamed from x11-base/xorg-server/xorg-server-1.19.3-r1708.ebuild) | 9 |
4 files changed, 42 insertions, 64 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 2021b405..7e0ac736 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079 +DIST xorg-server-1.19.4.tar.bz2 5962834 SHA256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 SHA512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b WHIRLPOOL 75d82daf7fa87b70182ed5d81fe785b4909b82f838530c0318444bc05ccb2a4073f4bebb2a8dd0d283dfbb5d1498dc98a9098176eff16c7a31b801bd179e3c00 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 deleted file mode 100644 index 5a3dea36..00000000 --- a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@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.pisar@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/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 <leio@gentoo.org> +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 <leio@gentoo.org> +--- +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 <libudev.h> + #include <ctype.h> + #include <unistd.h> ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> ++#endif + + #include "input.h" + #include "inputstr.h" +-- +2.10.2 + diff --git a/x11-base/xorg-server/xorg-server-1.19.3-r1708.ebuild b/x11-base/xorg-server/xorg-server-1.19.4-r1710.ebuild index 598f394d..edeee84e 100644 --- a/x11-base/xorg-server/xorg-server-1.19.3-r1708.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.4-r1710.ebuild @@ -5,14 +5,14 @@ EAPI=5 XORG_DOC=doc inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" -KEYWORDS="amd64 x86" +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" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid 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}"/${PN}-1.18-sysmacros.patch #580044 + "${FILESDIR}"/${P}-sysmacros.patch #633530 ) pkg_pretend() { @@ -184,6 +184,7 @@ src_configure() { $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal glx) + $(use_enable xcsecurity) $(use_enable xephyr) $(use_enable xnest) $(use_enable xorg) |