[packages/xorg-app-xinit] - up to 1.3.4 - updated consolekit-support.patch

draenog draenog at pld-linux.org
Fri Sep 12 19:30:48 CEST 2014


commit 188d0e2625bb6b49b2a1b510cf01109a553fb2a2
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Fri Sep 12 18:28:15 2014 +0100

    - up to 1.3.4
    - updated consolekit-support.patch

 xorg-app-xinit-consolekit-support.patch | 10 +++++-----
 xorg-app-xinit.spec                     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/xorg-app-xinit.spec b/xorg-app-xinit.spec
index 5801fcd..f7958ff 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.3.3
+Version:	1.3.4
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
-# Source0-md5:	3b8da0e6237aee9828cc809c647510a7
+# Source0-md5:	4e928452dfaf73851413a2d8b8c76388
 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 e713105..aa8c97b 100644
--- a/xorg-app-xinit-consolekit-support.patch
+++ b/xorg-app-xinit-consolekit-support.patch
@@ -37,7 +37,7 @@ diff --git a/startx.cpp b/startx.cpp
 index 42421ef..998c7f8 100644
 --- a/startx.cpp
 +++ b/startx.cpp
-@@ -222,6 +222,12 @@ EOF
+@@ -301,6 +301,12 @@
      done
  fi
  
@@ -47,9 +47,9 @@ index 42421ef..998c7f8 100644
 +    export DISPLAY=:0
 +fi
 +
- #if defined(__SCO__) || defined(__UNIXWARE__)
- if [ "$REMOTE_SERVER" = "TRUE" ]; then
-         exec SHELL_CMD ${client}
+ #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
@@ -101,7 +101,7 @@ index 42421ef..998c7f8 100644
 +#endif /* USE_CONKIT */
 +
  static pid_t
- startClient(char *client[])
+ startClient(char *client_argv[])
  {
 @@ -566,6 +603,9 @@ startClient(char *client[])
      if (clientpid == 0) {
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list