Attachment 106179 Details for Bug 83797 – 0001-Remove-remaining-SCO-support.patch

[patch] 0001-Remove-remaining-SCO-support.patch

0001-Remove-remaining-SCO-support.patch (text/plain), 2.35 KB, created by Laurent Bigonville on 2014-09-12 13:37:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent Bigonville

Created: 2014-09-12 13:37:14 UTC

Size: 2.35 KB

patch

obsolete

>From ff7c5390f6436abe468c5d1a60697dc946e142c6 Mon Sep 17 00:00:00 2001
>From: Laurent Bigonville <bigon@bigon.be>
>Date: Fri, 12 Sep 2014 15:23:54 +0200
>Subject: [PATCH 1/2] Remove remaining SCO support
>
>Remove remaining SCO support that is still present in the startx manpage
>
>https://bugs.freedesktop.org/show_bug.cgi?id=83797
>---
> configure.ac    |  5 -----
> man/Makefile.am |  1 -
> man/startx.man  | 30 ------------------------------
> 3 files changed, 36 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 18794b3..461648b 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -190,13 +190,8 @@ case $host_os in
>     *solaris*)
> 	SHELL_CMD="/bin/ksh"
> 	;;
>-    *sco*)
>-	SHELL_CMD="/bin/ksh"
>-	SCOMAN=1
>-	;;
> esac
> AC_SUBST(SHELL_CMD)
>-AC_SUBST(SCOMAN)
> AC_SUBST(XSERVERNAME)
> AC_SUBST(XCONFIGFILE)
> AC_SUBST(XCONFIGFILEMAN)
>diff --git a/man/Makefile.am b/man/Makefile.am
>index b24faca..9c6569f 100644
>--- a/man/Makefile.am
>+++ b/man/Makefile.am
>@@ -13,7 +13,6 @@ MAN_SUBSTS+=	-e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
> 		-e 's|__xinitdir__|$(XINITDIR)|g' \
> 		-e 's|__bindir__|$(bindir)|g' \
> 		-e 's|__libdir__|$(libdir)|g' \
>-		-e 's|__SCOMAN__|$(SCOMAN)|g' \
> 		-e 's|__configdir__|$(XINITDIR)|g'
> 
> 
>diff --git a/man/startx.man b/man/startx.man
>index 0405be0..af93300 100644
>--- a/man/startx.man
>+++ b/man/startx.man
>@@ -74,24 +74,6 @@ startx -- -dpi 100
> .PP
> startx -- -layout Multihead
> .RE
>-.if '__SCOMAN__'' .ig
>-.PP
>-To determine the client to run,
>-.B startx
>-looks for the following files, in order:
>-.RS
>-.PP
>-.I $(HOME)/.startxrc
>-.PP
>-.I __libdir__/sys.startxrc
>-.PP
>-.I $(HOME)/.xinitrc
>-.PP
>-.I __xinitdir__/xinitrc
>-.RE
>-.PP
>-..
>-.if !'x.__SCOMAN__'x.' .ig
> .PP
> To determine the client to run,
> .B startx
>@@ -103,7 +85,6 @@ the file
> in the
> .I xinit
> library directory.
>-..
> If command line client options are given, they override this
> behavior and revert to the
> .BR xinit (__appmansuffix__)
>@@ -187,17 +168,6 @@ and
> .IR Xsecurity (__miscmansuffix__)
> manual pages for more information on X client/server authentication.
> .SH FILES
>-.if '__SCOMAN__'' .ig
>-.TP 25
>-.I $(HOME)/.startxrc
>-Client to run.  Typically a shell script which runs many programs in
>-the background.
>-.TP 25
>-.I __libdir__/sys.startxrc
>-Client to use if the user has no
>-.I .startxrc
>-file.
>-..
> .TP 25
> .I $(HOME)/.xinitrc
> Client to run.  Typically a shell script which runs many programs in
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 83797: 106179 | 106180 | 106182

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.