[packages/xorg-app-xinit] - rediffed

[hawk]

commit 6d473db98080cfdb3f77fb06e7459a7698590777
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Wed Apr 6 18:28:15 2022 +0000

    - rediffed

 xorg-app-xinit-xwrapper.patch | 25 ++++++++++++++-----------
 xorg-app-xinit.spec           |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/xorg-app-xinit.spec b/xorg-app-xinit.spec
index a7d8f3c..582588f 100644
--- a/xorg-app-xinit.spec
+++ b/xorg-app-xinit.spec
@@ -2,7 +2,7 @@ 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.1
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Applications
 Source0:	https://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
diff --git a/xorg-app-xinit-xwrapper.patch b/xorg-app-xinit-xwrapper.patch
index 779c0de..f778431 100644
--- a/xorg-app-xinit-xwrapper.patch
+++ b/xorg-app-xinit-xwrapper.patch
@@ -1,6 +1,7 @@
---- xinit-1.0.8/Makefile.am.orig	2008-03-06 23:08:48.000000000 +0100
-+++ xinit-1.0.8/Makefile.am	2008-03-08 02:11:36.208958943 +0100
-@@ -49,7 +49,7 @@
+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@
  
  CPP_FILES_FLAGS = \
@@ -9,9 +10,10 @@
  	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
  	-D__libexecdir__="$(libexecdir)" \
  	-D__bindir__="$(bindir)" \
---- xinit-1.0.8/startx.cpp	2005-11-15 05:03:10.000000000 +0100
-+++ xinit-1.0.8/startx.cpp	2005-12-22 10:53:22.620963000 +0100
-@@ -73,7 +73,7 @@
+diff -urNp -x '*.orig' xinit-1.4.1.org/startx.cpp xinit-1.4.1/startx.cpp
+--- xinit-1.4.1.org/startx.cpp	2019-03-03 19:58:11.000000000 +0000
++++ xinit-1.4.1/startx.cpp	2022-04-06 18:27:19.734543460 +0000
+@@ -53,7 +53,7 @@ sysclientrc=XINITDIR/xinitrc
  userserverrc=$HOME/.xserverrc
  sysserverrc=XINITDIR/xserverrc
  defaultclient=XTERM
@@ -19,10 +21,11 @@
 +defaultserver=BINDIR/Xwrapper
  defaultclientargs=""
  defaultserverargs=""
- defaultdisplay=":0"
---- xinit-1.3.0/xinit.c.orig	2010-06-12 03:14:10.000000000 +0200
-+++ xinit-1.3.0/xinit.c	2010-10-31 10:38:50.551098261 +0100
-@@ -92,6 +92,7 @@
+ defaultdisplay=""
+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
+@@ -90,6 +90,7 @@ char xserverrcbuf[256];
  #define TRUE 1
  #define FALSE 0
  
@@ -30,7 +33,7 @@
  static char *default_server = "X";
  static char *default_display = ":0";        /* choose most efficient */
  static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -191,7 +192,10 @@
+@@ -189,7 +190,10 @@ main(int argc, char *argv[])
       */
      if (argc == 0 ||
          (**argv != '/' && **argv != '.')) {
================================================================

---- gitweb:

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