* Re: [PR PATCH] [Updated] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
@ 2023-01-24 15:35 ` motorto
2023-02-06 15:01 ` vincele
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: motorto @ 2023-01-24 15:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages xinit-1.4.2
https://github.com/void-linux/void-packages/pull/41838
xinit: update to 1.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, x86_64
Removed the fs25361.patch, for my use case it works properly without it. (Saw that arch uses it, but alpine doesn't...)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
```
SUMMARY
pkg:xinit host:x86_64 target:x86_64 cross:n result:OK
pkg:xinit host:x86_64 target:aarch64-musl cross:y result:OK
```
A patch file from https://github.com/void-linux/void-packages/pull/41838.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinit-1.4.2-41838.patch --]
[-- Type: text/x-diff, Size: 3254 bytes --]
From ad68f35e107fdb7b80687cb5cda644639a5779f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 12:01:12 +0000
Subject: [PATCH] xinit: update to 1.4.2.
---
.../xinit/patches/06_move_serverauthfile_into_tmp.diff | 8 +++++---
srcpkgs/xinit/patches/fs25361.patch | 7 ++++---
srcpkgs/xinit/template | 8 ++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
index 8d810c7da0ba..48daba4dcba1 100644
--- a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
+++ b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
@@ -5,16 +5,18 @@ The trap patch didn't seem to work on reboot.
startx.cpp | 2 +-
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
+++ b/startx.cpp
-@@ -273,7 +273,7 @@
+@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$
+ 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
add :$dummy . $mcookie
diff --git a/srcpkgs/xinit/patches/fs25361.patch b/srcpkgs/xinit/patches/fs25361.patch
index 56dfcc9916d9..f2cefb1f1514 100644
--- a/srcpkgs/xinit/patches/fs25361.patch
+++ b/srcpkgs/xinit/patches/fs25361.patch
@@ -1,6 +1,7 @@
---- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100
-+++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100
-@@ -296,9 +296,9 @@
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
++++ 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 if '$displayname' already exists do not overwrite it as another
XCOMM server may need it. Add them to the '$xserverauthfile' instead.
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index b687c0ccd2c4..88b19c2f3cef 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
# Template file for 'xinit'
pkgname=xinit
-version=1.4.1
-revision=3
+version=1.4.2
+revision=1
build_style=gnu-configure
configure_args="--with-xinitdir=/etc/X11/xinit"
hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="X init program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xorgwiki.freedesktop.org/xorg"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
+distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
+checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23
conf_files="
/etc/X11/xinit/xinitrc
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
2023-01-24 15:35 ` [PR PATCH] [Updated] " motorto
@ 2023-02-06 15:01 ` vincele
2023-02-06 21:29 ` [PR REVIEW] " kruceter
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: vincele @ 2023-02-06 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by vincele on void-packages repository
https://github.com/void-linux/void-packages/pull/41838#issuecomment-1419221921
Comment:
Tested OK on x86_64-musl (with dwm)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
2023-01-24 15:35 ` [PR PATCH] [Updated] " motorto
2023-02-06 15:01 ` vincele
@ 2023-02-06 21:29 ` kruceter
2023-02-06 21:29 ` kruceter
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: kruceter @ 2023-02-06 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41838#discussion_r1097896574
Comment:
Please revert changes made to the selected lines.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
` (2 preceding siblings ...)
2023-02-06 21:29 ` [PR REVIEW] " kruceter
@ 2023-02-06 21:29 ` kruceter
2023-02-11 5:24 ` classabbyamp
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: kruceter @ 2023-02-06 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41838#discussion_r1097938146
Comment:
Revert changes made to the selected lines.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
` (3 preceding siblings ...)
2023-02-06 21:29 ` kruceter
@ 2023-02-11 5:24 ` classabbyamp
2023-02-11 15:18 ` [PR PATCH] [Updated] " motorto
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2023-02-11 5:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41838#discussion_r1103529152
Comment:
```suggestion
homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
```
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
` (4 preceding siblings ...)
2023-02-11 5:24 ` classabbyamp
@ 2023-02-11 15:18 ` motorto
2023-02-11 15:18 ` [PR REVIEW] " motorto
2023-02-11 15:41 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: motorto @ 2023-02-11 15:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages xinit-1.4.2
https://github.com/void-linux/void-packages/pull/41838
xinit: update to 1.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, x86_64
#### Local build testing
- I built this PR locally for my native architecture, x86_64
```
SUMMARY
pkg:xinit host:x86_64 target:x86_64 cross:n result:OK
pkg:xinit host:x86_64 target:aarch64-musl cross:y result:OK
```
A patch file from https://github.com/void-linux/void-packages/pull/41838.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinit-1.4.2-41838.patch --]
[-- Type: text/x-diff, Size: 3334 bytes --]
From 04385721e4f441ee9a7d773eaf2f7cae97ae19be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 12:01:12 +0000
Subject: [PATCH] xinit: update to 1.4.2.
---
.../xinit/patches/06_move_serverauthfile_into_tmp.diff | 8 +++++---
srcpkgs/xinit/patches/fs25361.patch | 7 ++++---
srcpkgs/xinit/template | 10 +++++-----
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
index 8d810c7da0ba..48daba4dcba1 100644
--- a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
+++ b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
@@ -5,16 +5,18 @@ The trap patch didn't seem to work on reboot.
startx.cpp | 2 +-
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
+++ b/startx.cpp
-@@ -273,7 +273,7 @@
+@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$
+ 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
add :$dummy . $mcookie
diff --git a/srcpkgs/xinit/patches/fs25361.patch b/srcpkgs/xinit/patches/fs25361.patch
index 56dfcc9916d9..f2cefb1f1514 100644
--- a/srcpkgs/xinit/patches/fs25361.patch
+++ b/srcpkgs/xinit/patches/fs25361.patch
@@ -1,6 +1,7 @@
---- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100
-+++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100
-@@ -296,9 +296,9 @@
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
++++ 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 if '$displayname' already exists do not overwrite it as another
XCOMM server may need it. Add them to the '$xserverauthfile' instead.
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index b687c0ccd2c4..899cbc7695b7 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
# Template file for 'xinit'
pkgname=xinit
-version=1.4.1
-revision=3
+version=1.4.2
+revision=1
build_style=gnu-configure
configure_args="--with-xinitdir=/etc/X11/xinit"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="libX11-devel"
short_desc="X init program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://xorgwiki.freedesktop.org/xorg"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
+homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
+distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
+checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23
conf_files="
/etc/X11/xinit/xinitrc
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
` (5 preceding siblings ...)
2023-02-11 15:18 ` [PR PATCH] [Updated] " motorto
@ 2023-02-11 15:18 ` motorto
2023-02-11 15:41 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: motorto @ 2023-02-11 15:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/41838#discussion_r1103644279
Comment:
Thanks, solved this.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: xinit: update to 1.4.2.
2023-01-24 12:06 [PR PATCH] xinit: update to 1.4.2 motorto
` (6 preceding siblings ...)
2023-02-11 15:18 ` [PR REVIEW] " motorto
@ 2023-02-11 15:41 ` classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2023-02-11 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
There's a merged pull request on the void-packages repository
xinit: update to 1.4.2.
https://github.com/void-linux/void-packages/pull/41838
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, x86_64
#### Local build testing
- I built this PR locally for my native architecture, x86_64
```
SUMMARY
pkg:xinit host:x86_64 target:x86_64 cross:n result:OK
pkg:xinit host:x86_64 target:aarch64-musl cross:y result:OK
```
^ permalink raw reply [flat|nested] 9+ messages in thread