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

qboosh qboosh at pld-linux.org
Mon Mar 10 19:01:14 CET 2025


commit 8da6715aefd27cc907629647c75b9cbd25f74d63
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 10 18:41:30 2025 +0100

    - updated to 1.4.4

 xorg-app-xinit-consolekit-support.patch |  8 +++----
 xorg-app-xinit-xwrapper.patch           | 37 ++++++++++++++-------------------
 xorg-app-xinit.spec                     |  4 ++--
 3 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/xorg-app-xinit.spec b/xorg-app-xinit.spec
index 976840f..8e06e1e 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.3
+Version:	1.4.4
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	https://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.xz
-# Source0-md5:	2f82c02a9408cbb5a6191c4b62763438
+# Source0-md5:	e7430a710261c9129b1280f26cb159a5
 Source1:	startx.1x.it
 Source2:	startx.1x.pl
 Source3:	xinit.1x.it
diff --git a/xorg-app-xinit-consolekit-support.patch b/xorg-app-xinit-consolekit-support.patch
index d8f4480..20d0da3 100644
--- a/xorg-app-xinit-consolekit-support.patch
+++ b/xorg-app-xinit-consolekit-support.patch
@@ -33,9 +33,9 @@ index 1aee1d2..5775db3 100644
  AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
  
---- 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
+--- xinit-1.4.4/startx.in.orig	2025-03-10 17:56:52.562463648 +0100
++++ xinit-1.4.4/startx.in	2025-03-10 18:01:27.337512430 +0100
+@@ -319,6 +319,8 @@ EOF
      done
  fi
  
@@ -43,7 +43,7 @@ index 1aee1d2..5775db3 100644
 +
  case "$(uname -s)" in
  CYGWIN_NT*|Darwin)
-     eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs
+     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
diff --git a/xorg-app-xinit-xwrapper.patch b/xorg-app-xinit-xwrapper.patch
index 2f5e767..e6b764e 100644
--- a/xorg-app-xinit-xwrapper.patch
+++ b/xorg-app-xinit-xwrapper.patch
@@ -1,26 +1,21 @@
-diff -urNp -x '*.orig' xinit-1.4.1.org/Makefile.am xinit-1.4.1/Makefile.am
---- xinit-1.4.1.org/Makefile.am	2019-03-03 19:58:11.000000000 +0000
-+++ xinit-1.4.1/Makefile.am	2022-04-06 18:27:19.734543460 +0000
-@@ -49,7 +49,7 @@ PROGCPPDEFS = \
- 	-DXINIT=@XINIT@
+--- xinit-1.4.4/startx.in.orig	2025-03-09 21:44:26.000000000 +0100
++++ xinit-1.4.4/startx.in	2025-03-10 17:56:52.562463648 +0100
+@@ -16,7 +16,6 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ xinitdir="@XINITDIR@"
+ xterm="@XTERM@"
+-xserver="@XSERVER@"
+ xinit="@XINIT@"
+ bundle_id_prefix="@bundleidprefix@"
+ xauth="@XAUTH@"
+@@ -24,6 +23,7 @@ bindir="@bindir@"
+ libexecdir="@libexecdir@"
+ mk_cookie="@MCOOKIE@"
+ has_cookie_maker="@HAS_COOKIE_MAKER@"
++xserver="${bindir}/Xwrapper"
  
- CPP_FILES_FLAGS = \
--	-DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \
-+	-DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \
- 	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
- 	-D__libexecdir__="$(libexecdir)" \
- 	-D__bindir__="$(bindir)" \
---- 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
+ unset SESSION_MANAGER
  
- 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/8da6715aefd27cc907629647c75b9cbd25f74d63



More information about the pld-cvs-commit mailing list