rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

print newline after printing $DISPLAY to -displayfd (#824594)

Browse Source
This commit is contained in:
Peter Hutterer 2012-06-21 14:45:13 +10:00
parent 5e785a7c6a
commit beaa2767e8
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-server.spec
View File

@ -48,7 +48,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.12.2 Version: 1.12.2
Release: 2%{?gitdate:.%{gitdate}}%{dist} Release: 3%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -106,6 +106,9 @@ Patch7016: xserver-1.12-modesetting-fallback.patch
# needed when building without xorg (aka s390x) # needed when building without xorg (aka s390x)
Patch7017: xserver-1.12.2-xorg-touch-test.patch Patch7017: xserver-1.12.2-xorg-touch-test.patch
# print newline on -displayfd (824594)
Patch7018: xserver-1.12-os-print-newline-after-printing-display-name.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg %define sdkdir %{_includedir}/xorg
@ -575,6 +578,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Thu Jun 21 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-3
- print newline after printing $DISPLAY to -displayfd (#824594)
* Fri Jun 15 2012 Dan Horák <dan[at]danny.cz> 1.12.2-2 * Fri Jun 15 2012 Dan Horák <dan[at]danny.cz> 1.12.2-2
- fix build without xorg (aka s390x) - fix build without xorg (aka s390x)

30
xserver-1.12-os-print-newline-after-printing-display-name.patch Normal file
View File

@ -0,0 +1,30 @@
From 9d1c39b2115d3e7a403715083a584818f10feba2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 21 Jun 2012 14:26:15 +1000
Subject: [PATCH] os: print newline after printing display name
Much easier for scripts that try to read the display value off the file
descriptor. Plus, this restores the behaviour we had for this patch in
Fedora since server 1.6 (April 2009).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
os/connection.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/os/connection.c b/os/connection.c
index 039942f..5144d16 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -423,7 +423,7 @@ CreateWellKnownSockets(void)
}
if (!found)
FatalError("Failed to find a socket to listen on");
- snprintf(dynamic_display, sizeof(dynamic_display), "%d", i);
+ snprintf(dynamic_display, sizeof(dynamic_display), "%d\n", i);
display = dynamic_display;
}
--
1.7.10.2