[packages/xorg-xserver-server] - up to 1.18.1

[arekm]

commit 35ee67ed03c0c847959c66daffc13dd294095bd4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Feb 9 07:01:20 2016 +0100

    - up to 1.18.1

 xorg-xserver-server-include-defs.patch | 10 ----------
 xorg-xserver-server.spec               |  8 +++-----
 2 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index f4e6263..c4c2bb5 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -33,12 +33,12 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.18.0
-Release:	2
+Version:	1.18.1
+Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	3c1c1057d3ad27380d8dd87ffcc182cd
+# Source0-md5:	1b9e85420c3790dd487addd50313f4da
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -50,7 +50,6 @@ Patch2:		dtrace-link.patch
 Patch4:		%{name}-builtin-SHA1.patch
 
 Patch6:		110_nvidia_slowdow_fix.patch
-Patch7:		%{name}-include-defs.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 %{?with_dri2:BuildRequires:	Mesa-libGL-devel >= 9.2.0}
@@ -435,7 +434,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch4 -p1
 
 %patch6 -p1
-%patch7 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
diff --git a/xorg-xserver-server-include-defs.patch b/xorg-xserver-server-include-defs.patch
deleted file mode 100644
index 2667852..0000000
--- a/xorg-xserver-server-include-defs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c~	2015-11-10 19:37:11.000000000 +0100
-+++ xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c	2015-11-10 19:37:18.640853466 +0100
-@@ -24,6 +24,7 @@
-  */
- 
- #include "dix-config.h"
-+#include "xorg-config.h"
- 
- #include <errno.h>
- #include <fcntl.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/35ee67ed03c0c847959c66daffc13dd294095bd4