[packages/xorg-xserver-server] - up to 1.19.1
arekm
arekm at pld-linux.org
Wed Jan 11 22:42:06 CET 2017
commit 7702f2b18abc42f7a5fafd517c31aedecd6570fc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jan 11 22:41:57 2017 +0100
- up to 1.19.1
dtrace-link.patch | 17 -----------------
xorg-xserver-server.spec | 8 +++-----
2 files changed, 3 insertions(+), 22 deletions(-)
---
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
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/7702f2b18abc42f7a5fafd517c31aedecd6570fc
More information about the pld-cvs-commit
mailing list