diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2017-07-08 20:36:32 +0800 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2017-07-08 20:36:32 +0800 |
commit | 49e8c0410b5639024fc5d1b0f5d4ef865262f86f (patch) | |
tree | 98fa72c5980cab82e182887c84cddbcd7646ccd1 /x11-servers | |
parent | 770ebfbd439880d418e3b9b3913a87dc0b56222c (diff) | |
download | freebsd-ports-gnome-49e8c0410b5639024fc5d1b0f5d4ef865262f86f.tar.gz freebsd-ports-gnome-49e8c0410b5639024fc5d1b0f5d4ef865262f86f.tar.zst freebsd-ports-gnome-49e8c0410b5639024fc5d1b0f5d4ef865262f86f.zip |
x11-servers/xorg-server: back out r445076
Requested by: x11 (rezny)
Diffstat (limited to 'x11-servers')
-rw-r--r-- | x11-servers/xorg-nestserver/files/patch-Xext_shm.c | 14 | ||||
-rw-r--r-- | x11-servers/xorg-nestserver/files/patch-configure | 10 | ||||
-rw-r--r-- | x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in | 12 | ||||
-rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/patch-Xext_shm.c | 14 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/patch-configure | 8 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/patch-include_dix-config.h.in | 12 | ||||
-rw-r--r-- | x11-servers/xorg-vfbserver/files/patch-Xext_shm.c | 14 | ||||
-rw-r--r-- | x11-servers/xorg-vfbserver/files/patch-configure | 10 | ||||
-rw-r--r-- | x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in | 12 | ||||
-rw-r--r-- | x11-servers/xwayland/files/patch-Xext_shm.c | 14 | ||||
-rw-r--r-- | x11-servers/xwayland/files/patch-configure | 10 | ||||
-rw-r--r-- | x11-servers/xwayland/files/patch-include_dix-config.h.in | 12 |
13 files changed, 1 insertions, 143 deletions
diff --git a/x11-servers/xorg-nestserver/files/patch-Xext_shm.c b/x11-servers/xorg-nestserver/files/patch-Xext_shm.c deleted file mode 100644 index 04106a049ab7..000000000000 --- a/x11-servers/xorg-nestserver/files/patch-Xext_shm.c +++ /dev/null @@ -1,14 +0,0 @@ ---- Xext/shm.c.orig 2016-07-19 17:14:21 UTC -+++ Xext/shm.c -@@ -1210,7 +1210,11 @@ shm_tmpfile(void) - } - ErrorF ("Not using O_TMPFILE\n"); - #endif -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp(template, O_CLOEXEC); -+#else - fd = mkstemp(template); -+#endif - if (fd < 0) - return -1; - unlink(template); diff --git a/x11-servers/xorg-nestserver/files/patch-configure b/x11-servers/xorg-nestserver/files/patch-configure deleted file mode 100644 index f59122539cd9..000000000000 --- a/x11-servers/xorg-nestserver/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2017-01-11 21:16:40 UTC -+++ configure -@@ -22758,6 +22758,7 @@ fi - for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ -+ mkostemp \ - walkcontext setitimer poll epoll_create1 - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in deleted file mode 100644 index 270890f9bcbc..000000000000 --- a/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC -+++ include/dix-config.h.in -@@ -140,6 +140,9 @@ - /* Define to 1 if you have the <linux/fb.h> header file. */ - #undef HAVE_LINUX_FB_H - -+/* Define to 1 if you have the `mkostemp' function. */ -+#undef HAVE_MKOSTEMP -+ - /* Define to 1 if you have the `mmap' function. */ - #undef HAVE_MMAP - diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 9070971962ea..d24217b0bb26 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/patch-Xext_shm.c b/x11-servers/xorg-server/files/patch-Xext_shm.c deleted file mode 100644 index 04106a049ab7..000000000000 --- a/x11-servers/xorg-server/files/patch-Xext_shm.c +++ /dev/null @@ -1,14 +0,0 @@ ---- Xext/shm.c.orig 2016-07-19 17:14:21 UTC -+++ Xext/shm.c -@@ -1210,7 +1210,11 @@ shm_tmpfile(void) - } - ErrorF ("Not using O_TMPFILE\n"); - #endif -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp(template, O_CLOEXEC); -+#else - fd = mkstemp(template); -+#endif - if (fd < 0) - return -1; - unlink(template); diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure index af362d5653c4..10674bc6034d 100644 --- a/x11-servers/xorg-server/files/patch-configure +++ b/x11-servers/xorg-server/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig 2016-07-19 17:27:31 UTC +++ configure -@@ -22742,6 +22742,7 @@ fi - for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ -+ mkostemp \ - walkcontext - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con esac GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" diff --git a/x11-servers/xorg-server/files/patch-include_dix-config.h.in b/x11-servers/xorg-server/files/patch-include_dix-config.h.in deleted file mode 100644 index 270890f9bcbc..000000000000 --- a/x11-servers/xorg-server/files/patch-include_dix-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC -+++ include/dix-config.h.in -@@ -140,6 +140,9 @@ - /* Define to 1 if you have the <linux/fb.h> header file. */ - #undef HAVE_LINUX_FB_H - -+/* Define to 1 if you have the `mkostemp' function. */ -+#undef HAVE_MKOSTEMP -+ - /* Define to 1 if you have the `mmap' function. */ - #undef HAVE_MMAP - diff --git a/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c b/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c deleted file mode 100644 index 04106a049ab7..000000000000 --- a/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c +++ /dev/null @@ -1,14 +0,0 @@ ---- Xext/shm.c.orig 2016-07-19 17:14:21 UTC -+++ Xext/shm.c -@@ -1210,7 +1210,11 @@ shm_tmpfile(void) - } - ErrorF ("Not using O_TMPFILE\n"); - #endif -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp(template, O_CLOEXEC); -+#else - fd = mkstemp(template); -+#endif - if (fd < 0) - return -1; - unlink(template); diff --git a/x11-servers/xorg-vfbserver/files/patch-configure b/x11-servers/xorg-vfbserver/files/patch-configure deleted file mode 100644 index f59122539cd9..000000000000 --- a/x11-servers/xorg-vfbserver/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2017-01-11 21:16:40 UTC -+++ configure -@@ -22758,6 +22758,7 @@ fi - for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ -+ mkostemp \ - walkcontext setitimer poll epoll_create1 - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in deleted file mode 100644 index 270890f9bcbc..000000000000 --- a/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC -+++ include/dix-config.h.in -@@ -140,6 +140,9 @@ - /* Define to 1 if you have the <linux/fb.h> header file. */ - #undef HAVE_LINUX_FB_H - -+/* Define to 1 if you have the `mkostemp' function. */ -+#undef HAVE_MKOSTEMP -+ - /* Define to 1 if you have the `mmap' function. */ - #undef HAVE_MMAP - diff --git a/x11-servers/xwayland/files/patch-Xext_shm.c b/x11-servers/xwayland/files/patch-Xext_shm.c deleted file mode 100644 index 04106a049ab7..000000000000 --- a/x11-servers/xwayland/files/patch-Xext_shm.c +++ /dev/null @@ -1,14 +0,0 @@ ---- Xext/shm.c.orig 2016-07-19 17:14:21 UTC -+++ Xext/shm.c -@@ -1210,7 +1210,11 @@ shm_tmpfile(void) - } - ErrorF ("Not using O_TMPFILE\n"); - #endif -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp(template, O_CLOEXEC); -+#else - fd = mkstemp(template); -+#endif - if (fd < 0) - return -1; - unlink(template); diff --git a/x11-servers/xwayland/files/patch-configure b/x11-servers/xwayland/files/patch-configure deleted file mode 100644 index f59122539cd9..000000000000 --- a/x11-servers/xwayland/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2017-01-11 21:16:40 UTC -+++ configure -@@ -22758,6 +22758,7 @@ fi - for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ -+ mkostemp \ - walkcontext setitimer poll epoll_create1 - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xwayland/files/patch-include_dix-config.h.in b/x11-servers/xwayland/files/patch-include_dix-config.h.in deleted file mode 100644 index 270890f9bcbc..000000000000 --- a/x11-servers/xwayland/files/patch-include_dix-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC -+++ include/dix-config.h.in -@@ -140,6 +140,9 @@ - /* Define to 1 if you have the <linux/fb.h> header file. */ - #undef HAVE_LINUX_FB_H - -+/* Define to 1 if you have the `mkostemp' function. */ -+#undef HAVE_MKOSTEMP -+ - /* Define to 1 if you have the `mmap' function. */ - #undef HAVE_MMAP - |