summaryrefslogtreecommitdiffstats
path: root/patches/xorg-server-1.17.2
diff options
context:
space:
mode:
Diffstat (limited to 'patches/xorg-server-1.17.2')
-rw-r--r--patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch37
-rw-r--r--patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch34
-rw-r--r--patches/xorg-server-1.17.2/series5
3 files changed, 0 insertions, 76 deletions
diff --git a/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch b/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch
deleted file mode 100644
index 5792f3cd4..000000000
--- a/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 28 May 2015 23:47:37 +0200
-Subject: [PATCH] xf86bigfont: always include unistd.h
-
-Otherwise compiling can fail with:
-
-xf86bigfont.c: In function 'ProcXF86BigfontQueryVersion':
-xf86bigfont.c:287:9: error: implicit declaration of function 'geteuid' [-Werror=implicit-function-declaration]
-xf86bigfont.c:287:9: warning: nested extern declaration of 'geteuid' [-Wnested-externs]
-xf86bigfont.c:288:9: error: implicit declaration of function 'getegid' [-Werror=implicit-function-declaration]
-xf86bigfont.c:288:9: warning: nested extern declaration of 'getegid' [-Wnested-externs]
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Xext/xf86bigfont.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
-index 46b3242d1bc9..65df73449b4c 100644
---- a/Xext/xf86bigfont.c
-+++ b/Xext/xf86bigfont.c
-@@ -39,6 +39,7 @@
- #endif
-
- #include <sys/types.h>
-+#include <unistd.h>
- #ifdef HAS_SHM
- #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
- /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
-@@ -58,7 +59,6 @@
- #include <sys/shm.h>
- #include <sys/stat.h>
- #include <stdlib.h>
--#include <unistd.h>
- #include <time.h>
- #include <errno.h>
- #endif
diff --git a/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch b/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
deleted file mode 100644
index 3299f6fb1..000000000
--- a/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 24 May 2019 22:27:08 +0200
-Subject: [PATCH] fix building with glibc-2.28
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- hw/xfree86/common/xf86Xinput.c | 1 +
- hw/xfree86/os-support/linux/lnx_init.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 1fb5b1635e2c..24e0d3f68368 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -84,6 +84,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #ifdef HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h> /* for major() & minor() on Solaris */
- #endif
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
-index 94853070dc6a..3d89a9d117e6 100644
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -37,6 +37,7 @@
- #include "xf86_OSlib.h"
-
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
-
- #ifndef K_OFF
- #define K_OFF 0x4
diff --git a/patches/xorg-server-1.17.2/series b/patches/xorg-server-1.17.2/series
deleted file mode 100644
index a3e7a5cb5..000000000
--- a/patches/xorg-server-1.17.2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-xf86bigfont-always-include-unistd.h.patch
-0002-fix-building-with-glibc-2.28.patch
-# 220b45a212faa8cdb25392d7025c8b2c - git-ptx-patches magic