From 0be8d38e75623c906ab746b3ba4cff521085f0360390a6df34ad00ecd9fe7557 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 4 Apr 2018 14:40:10 +0000 Subject: [PATCH] - Update to version 1.4.0 * autogen.sh: use quoted string variables * Remove SCO support for SHELL_CMD and startx man page. * Remove support for ancient A/UX 3.0 support * Remove left over $(launchagents_DATA) in CLEANFILES * startx: Pass -keeptty when telling the server to start on the current tty * startx: Fix startx picking an already used display number when -nolock is used * remove bogus \/ escapes * launchd: Install binaries into libexecdir * startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz * startx: Add support for enabling IGLX for XQuartz * startx: Don't use GNU expr extensions * autogen: add default patch prefix * startx: fix comment typo * startx: don't init defaultdisplay to :0 * autogen.sh: use exec instead of waiting for configure to finish * xinit: check for correct fork error code OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=38 --- xinit-1.3.4.tar.bz2 | 3 --- xinit-1.4.0.tar.bz2 | 3 +++ xinit-suse.patch | 22 +++++++++++----------- xinit.changes | 21 +++++++++++++++++++++ xinit.spec | 4 ++-- 5 files changed, 37 insertions(+), 16 deletions(-) delete mode 100644 xinit-1.3.4.tar.bz2 create mode 100644 xinit-1.4.0.tar.bz2 diff --git a/xinit-1.3.4.tar.bz2 b/xinit-1.3.4.tar.bz2 deleted file mode 100644 index ab2c8db..0000000 --- a/xinit-1.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 -size 165881 diff --git a/xinit-1.4.0.tar.bz2 b/xinit-1.4.0.tar.bz2 new file mode 100644 index 0000000..4d2f592 --- /dev/null +++ b/xinit-1.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef +size 174491 diff --git a/xinit-suse.patch b/xinit-suse.patch index c0bf66b..fdfa301 100644 --- a/xinit-suse.patch +++ b/xinit-suse.patch @@ -1,7 +1,7 @@ -Index: xinit-1.3.4/startx.cpp +Index: xinit-1.4.0/startx.cpp =================================================================== ---- xinit-1.3.4.orig/startx.cpp -+++ xinit-1.3.4/startx.cpp +--- xinit-1.4.0.orig/startx.cpp ++++ xinit-1.4.0/startx.cpp @@ -50,10 +50,114 @@ export PATH userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc @@ -42,7 +42,7 @@ Index: xinit-1.3.4/startx.cpp +XCOMM + +for WM in $WMLIST $WINDOWMANAGERLIST -+do ++do + test "$WM" = "$WANTEDWM" && { +XCOMM +XCOMM is it reachable via $PATH? @@ -50,7 +50,7 @@ Index: xinit-1.3.4/startx.cpp + type $WM >/dev/null 2>&1 || { + + echo "`basename $0`: error: the requested window manager '$1' could not be found!" -+ echo "Window manager must be one of (currently installed window amangers):" ++ echo "Window manager must be one of (currently installed window amangers):" + for i in $WMLIST; do echo $i; done + exit 1 + } @@ -116,8 +116,8 @@ Index: xinit-1.3.4/startx.cpp +test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER defaultclientargs="" defaultserverargs="" - defaultdisplay=":0" -@@ -300,6 +404,9 @@ EOF + defaultdisplay="" +@@ -312,6 +416,9 @@ EOF fi done fi @@ -127,7 +127,7 @@ Index: xinit-1.3.4/startx.cpp #if defined(__APPLE__) || defined(__CYGWIN__) eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -308,6 +415,12 @@ XINIT "$client" $clientargs -- "$server" +@@ -320,6 +427,12 @@ XINIT "$client" $clientargs -- "$server" #endif retval=$? @@ -140,10 +140,10 @@ Index: xinit-1.3.4/startx.cpp if [ x"$enable_xauth" = x1 ] ; then if [ x"$removelist" != x ]; then XAUTH remove $removelist -Index: xinit-1.3.4/xinitrc.cpp +Index: xinit-1.4.0/xinitrc.cpp =================================================================== ---- xinit-1.3.4.orig/xinitrc.cpp -+++ xinit-1.3.4/xinitrc.cpp +--- xinit-1.4.0.orig/xinitrc.cpp ++++ xinit-1.4.0/xinitrc.cpp @@ -48,8 +48,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then unset f fi diff --git a/xinit.changes b/xinit.changes index 8faffa4..29e1a1c 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Apr 4 14:27:04 UTC 2018 - sndirsch@suse.com + +- Update to version 1.4.0 + * autogen.sh: use quoted string variables + * Remove SCO support for SHELL_CMD and startx man page. + * Remove support for ancient A/UX 3.0 support + * Remove left over $(launchagents_DATA) in CLEANFILES + * startx: Pass -keeptty when telling the server to start on the current tty + * startx: Fix startx picking an already used display number when -nolock is used + * remove bogus \/ escapes + * launchd: Install binaries into libexecdir + * startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz + * startx: Add support for enabling IGLX for XQuartz + * startx: Don't use GNU expr extensions + * autogen: add default patch prefix + * startx: fix comment typo + * startx: don't init defaultdisplay to :0 + * autogen.sh: use exec instead of waiting for configure to finish + * xinit: check for correct fork error code + ------------------------------------------------------------------- Wed Jun 1 12:37:18 UTC 2016 - mstaudt@suse.com diff --git a/xinit.spec b/xinit.spec index 9fd55ef..c463880 100644 --- a/xinit.spec +++ b/xinit.spec @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xinit -Version: 1.3.4 +Version: 1.4.0 Release: 0 Summary: X Window System initializer License: MIT