[packages/xorg-app-xinit] - updated to 1.4.3

[qboosh]

commit 575acc8b2ae26a7fa3007ee0c71718694caaf87a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 11 15:10:51 2025 +0100

    - updated to 1.4.3

 xorg-app-xinit-consolekit-support.patch | 40 +++++++++++----------------------
 xorg-app-xinit-xwrapper.patch           | 22 +++++++++---------
 xorg-app-xinit.spec                     |  8 +++----
 3 files changed, 28 insertions(+), 42 deletions(-)
---
diff --git a/xorg-app-xinit.spec b/xorg-app-xinit.spec
index a7f9ad1..976840f 100644
--- a/xorg-app-xinit.spec
+++ b/xorg-app-xinit.spec
@@ -1,12 +1,12 @@
 Summary:	xinit application - X Window System initializer
 Summary(pl.UTF-8):	Aplikacja xinit do uruchamiania X Window System
 Name:		xorg-app-xinit
-Version:	1.4.2
+Version:	1.4.3
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	https://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.xz
-# Source0-md5:	0e9a1b9a82b84ab229c709c0f939c113
+# Source0-md5:	2f82c02a9408cbb5a6191c4b62763438
 Source1:	startx.1x.it
 Source2:	startx.1x.pl
 Source3:	xinit.1x.it
@@ -44,8 +44,8 @@ kończy działanie.
 
 %prep
 %setup -q -n xinit-%{version}
-%patch0 -p1
-%patch1 -p1
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__aclocal}
diff --git a/xorg-app-xinit-consolekit-support.patch b/xorg-app-xinit-consolekit-support.patch
index aa8c97b..d8f4480 100644
--- a/xorg-app-xinit-consolekit-support.patch
+++ b/xorg-app-xinit-consolekit-support.patch
@@ -33,26 +33,20 @@ index 1aee1d2..5775db3 100644
  AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
  
-diff --git a/startx.cpp b/startx.cpp
-index 42421ef..998c7f8 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -301,6 +301,12 @@
+--- xinit-1.4.3/startx.cpp.orig	2025-01-11 14:45:20.903603656 +0100
++++ xinit-1.4.3/startx.cpp	2025-01-11 15:07:03.739878920 +0100
+@@ -317,6 +317,8 @@ EOF
      done
  fi
  
-+if [ x"$display" != x ]; then
-+    export DISPLAY=$display
-+else
-+    export DISPLAY=:0
-+fi
++export DISPLAY=${display:-:0}
 +
- #if defined(__APPLE__) || defined(__CYGWIN__)
- eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
- #else
---- xinit-1.3.3/xinit.c.orig	2013-09-10 21:39:35.624565251 +0200
-+++ xinit-1.3.3/xinit.c	2013-09-10 21:44:42.254552405 +0200
-@@ -41,6 +41,12 @@ in this Software without prior written a
+ case "$(uname -s)" in
+ CYGWIN_NT*|Darwin)
+     eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs
+--- xinit-1.4.3/xinit.c.orig	2025-01-11 14:45:20.893603711 +0100
++++ xinit-1.4.3/xinit.c	2025-01-11 14:45:20.906936972 +0100
+@@ -43,6 +43,12 @@ in this Software without prior written a
  #include <setjmp.h>
  #include <stdarg.h>
  
@@ -65,7 +59,7 @@ index 42421ef..998c7f8 100644
  #ifdef __APPLE__
  #include <AvailabilityMacros.h>
  #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-@@ -559,6 +565,37 @@ setWindowPath(void)
+@@ -569,6 +575,37 @@ setWindowPath(void)
      free(newwindowpath);
  }
  
@@ -103,7 +97,7 @@ index 42421ef..998c7f8 100644
  static pid_t
  startClient(char *client_argv[])
  {
-@@ -566,6 +603,9 @@ startClient(char *client[])
+@@ -576,6 +613,9 @@ startClient(char *client_argv[])
      if (clientpid == 0) {
          set_environment();
          setWindowPath();
@@ -113,15 +107,7 @@ index 42421ef..998c7f8 100644
  
          if (setuid(getuid()) == -1) {
              Error("cannot change uid");
-@@ -586,6 +626,7 @@ startClient(char *client[])
- 
- static jmp_buf close_env;
- 
-+
- static int
- ignorexio(Display *dpy)
- {
-@@ -610,6 +651,13 @@ shutdown(void)
+@@ -620,6 +660,13 @@ shutdown(void)
              Error("can't send HUP to process group %d", clientpid);
      }
  
diff --git a/xorg-app-xinit-xwrapper.patch b/xorg-app-xinit-xwrapper.patch
index c28ade2..2f5e767 100644
--- a/xorg-app-xinit-xwrapper.patch
+++ b/xorg-app-xinit-xwrapper.patch
@@ -10,17 +10,17 @@ diff -urNp -x '*.orig' xinit-1.4.1.org/Makefile.am xinit-1.4.1/Makefile.am
  	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
  	-D__libexecdir__="$(libexecdir)" \
  	-D__bindir__="$(bindir)" \
---- xinit-1.4.2/startx.cpp.orig	2022-12-29 20:14:29.369817248 +0100
-+++ xinit-1.4.2/startx.cpp	2022-12-29 20:15:04.276294810 +0100
-@@ -55,7 +55,7 @@ userserverrc=$HOME/.xserverrc
- [ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}"
- sysserverrc=XINITDIR/xserverrc
- defaultclient=XTERM
--defaultserver=XSERVER
-+defaultserver=BINDIR/Xwrapper
- defaultclientargs=""
- defaultserverargs=""
- defaultdisplay=""
+--- xinit-1.4.3/startx.cpp.orig	2025-01-11 14:43:08.074323254 +0100
++++ xinit-1.4.3/startx.cpp	2025-01-11 14:44:52.763756103 +0100
+@@ -14,7 +14,7 @@ XCOMM
+ 
+ xinitdir=XINITDIR
+ xterm=XTERM
+-xserver=XSERVER
++xserver=BINDIR/Xwrapper
+ xinit=XINIT
+ bundle_id_prefix=BUNDLE_ID_PREFIX
+ xauth=XAUTH
 diff -urNp -x '*.orig' xinit-1.4.1.org/xinit.c xinit-1.4.1/xinit.c
 --- xinit-1.4.1.org/xinit.c	2019-03-03 19:58:11.000000000 +0000
 +++ xinit-1.4.1/xinit.c	2022-04-06 18:27:19.734543460 +0000
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xinit.git/commitdiff/575acc8b2ae26a7fa3007ee0c71718694caaf87a