From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 11 Jan 2017 21:41:57 +0000 (+0100)
Subject: - up to 1.19.1
X-Git-Tag: auto/th/xorg-xserver-server-1.19.1-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=7702f2b18abc42f7a5fafd517c31aedecd6570fc;hp=52bb339e7f11b7b8f6de94107ba7b9cad01da9b1;p=packages%2Fxorg-xserver-server.git

- up to 1.19.1
---

diff --git a/dtrace-link.patch b/dtrace-link.patch
deleted file mode 100644
index a65f91c..0000000
--- a/dtrace-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xorg-server-1.16.3/os/Makefile.am~	2015-01-04 14:05:54.000000000 +0000
-+++ xorg-server-1.16.3/os/Makefile.am	2015-01-04 14:23:50.646159253 +0000
-@@ -52,12 +52,12 @@
- 
- if SPECIAL_DTRACE_OBJECTS
- # Generate dtrace object code for probes in libos & libdix
--dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
-+dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) $(LIBOBJS)
- 	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
- 
- noinst_PROGRAMS = os.O
- 
- os_O_SOURCES =
--os.O: dtrace.o $(am_libos_la_OBJECTS)
-+os.O: dtrace.o $(am_libos_la_OBJECTS) $(LIBOBJS)
- 	$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
- endif
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index eabf053..7b12e3b 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -34,19 +34,18 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.19.0
-Release:	2
+Version:	1.19.1
+Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	6a4d01e4e5047ab8f556960424ba1fa9
+# Source0-md5:	caa8ee7b2950abbf734347d137529fb6
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
 Source11:	%{name}-Xvfb.sysconfig
 Source12:	xvfb-run.sh
 Patch1:		%{name}-xwrapper-pam.patch
-Patch2:		dtrace-link.patch
 
 Patch4:		%{name}-builtin-SHA1.patch
 
@@ -430,7 +429,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %prep
 %setup -q -n xorg-server-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %patch4 -p1