wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xinit: update to 1.4.2.

Browse source
This commit is contained in:
André Cerqueira 2023-01-24 12:01:12 +00:00 • committed by classabbyamp
parent ff518865cf
commit d030bfa0c3
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
View file

@ -5,16 +5,18 @@ The trap patch didn't seem to work on reboot.
startx.cpp | 2 +- startx.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: startx.cpp.orig Index: xinit/startx.cpp
=================================================================== ===================================================================
diff --git a/startx.cpp b/startx.cpp
index dfbebe1..63f9ac6 100644
--- a/startx.cpp --- a/startx.cpp
+++ b/startx.cpp +++ b/startx.cpp
@@ -273,7 +273,7 @@ @@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then
dummy=0 dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy. XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$ - xserverauthfile=$HOME/.serverauth.$$
+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` + xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
xauth -q -f "$xserverauthfile" << EOF xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie add :$dummy . $mcookie

7
srcpkgs/xinit/patches/fs25361.patch
View file

@ -1,6 +1,7 @@
--- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100 diff -u xinit.orig/startx.cpp xinit/startx.cpp
+++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100 --- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
@@ -296,9 +296,9 @@ +++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
@@ -290,9 +290,9 @@
XCOMM now add the same credentials to the client authority file XCOMM now add the same credentials to the client authority file
XCOMM if '$displayname' already exists do not overwrite it as another XCOMM if '$displayname' already exists do not overwrite it as another
XCOMM server may need it. Add them to the '$xserverauthfile' instead. XCOMM server may need it. Add them to the '$xserverauthfile' instead.

10
srcpkgs/xinit/template
View file

@ -1,7 +1,7 @@
# Template file for 'xinit' # Template file for 'xinit'
pkgname=xinit pkgname=xinit
version=1.4.1 version=1.4.2
revision=3 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-xinitdir=/etc/X11/xinit" configure_args="--with-xinitdir=/etc/X11/xinit"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -9,9 +9,9 @@ makedepends="libX11-devel"
short_desc="X init program" short_desc="X init program"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT" license="MIT"
homepage="https://xorgwiki.freedesktop.org/xorg" homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23
conf_files=" conf_files="
/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc