Patchwork [meta-oe] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core)

login
register
mail settings
Submitter Denis Carikli
Date June 28, 2012, 1:38 p.m.
Message ID <1340890700-31781-1-git-send-email-denis@eukrea.com>
Download mbox | patch
Permalink /patch/30811/
State Accepted
Commit e19f6ed0b2bb3454f52165ca124cb6d92beea364
Headers show

Comments

Denis Carikli - June 28, 2012, 1:38 p.m.
Without that fix environments like sato cannot start because
  they require x-session-manager to be started instead of
  x-window-manager.

Signed-off-by: Denis Carikli <denis@eukrea.com>
---
 ...0005-add-XWindowManager-Xsession.d-script.patch |   17 +++++++----------
 .../xserver-common/xserver-common_1.34.bb          |    2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)
Denis Carikli - July 9, 2012, 1:52 p.m.
On Thursday, June 28, 2012 03:38:20 PM Denis Carikli wrote:
> Without that fix environments like sato cannot start because
>   they require x-session-manager to be started instead of
>   x-window-manager.
> 
> Signed-off-by: Denis Carikli <denis@eukrea.com>
> ---
>  ...0005-add-XWindowManager-Xsession.d-script.patch |   17 +++++++----------
> .../xserver-common/xserver-common_1.34.bb          |    2 +-
>  2 files changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git
> a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin
> dowManager-Xsession.d-script.patch
> b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin
> dowManager-Xsession.d-script.patch index f5c2c78..1782665 100644
> ---
> a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin
> dowManager-Xsession.d-script.patch +++
> b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin
> dowManager-Xsession.d-script.patch @@ -9,18 +9,15 @@ Signed-off-by: Martin
> Jansa <Martin.Jansa@gmail.com> 1 files changed, 6 insertions(+), 0
> deletions(-)
>   create mode 100644 X11/Xsession.d/90xXWindowManager
> 
> -diff --git a/X11/Xsession.d/90xXWindowManager
> b/X11/Xsession.d/90xXWindowManager -new file mode 100644
> -index 0000000..3df8435
> ---- /dev/null
> -+++ b/X11/Xsession.d/90xXWindowManager
> -@@ -0,0 +1,6 @@
> -+#!/bin/sh
> +Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager
> +===================================================================
> +--- /dev/null	1970-01-01 00:00:00.000000000 +0000
> ++++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager	2012-06-28
> 15:02:22.010521773 +0200 +@@ -0,0 +1,7 @@
>  +if [ -x $HOME/.Xsession ]; then
>  +    exec $HOME/.Xsession
> ++elif [ -x /usr/bin/x-session-manager ]; then
> ++    exec /usr/bin/x-session-manager
>  +else
>  +    exec /usr/bin/x-window-manager
>  +fi
> ---
> -1.7.8.5
> -
> diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
> b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index
> 1147fca..a7e8191 100644
> --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
> +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> 
> -PR = "r6"
> +PR = "r7"
> 
>  # we are using a gpe-style Makefile
>  inherit gpe

Ping.

Denis.

Patch

diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
index f5c2c78..1782665 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
@@ -9,18 +9,15 @@  Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 files changed, 6 insertions(+), 0 deletions(-)
  create mode 100644 X11/Xsession.d/90xXWindowManager
 
-diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager
-new file mode 100644
-index 0000000..3df8435
---- /dev/null
-+++ b/X11/Xsession.d/90xXWindowManager
-@@ -0,0 +1,6 @@
-+#!/bin/sh
+Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager	2012-06-28 15:02:22.010521773 +0200
+@@ -0,0 +1,7 @@
 +if [ -x $HOME/.Xsession ]; then
 +    exec $HOME/.Xsession
++elif [ -x /usr/bin/x-session-manager ]; then
++    exec /usr/bin/x-session-manager
 +else
 +    exec /usr/bin/x-window-manager
 +fi
--- 
-1.7.8.5
-
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
index 1147fca..a7e8191 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-PR = "r6"
+PR = "r7"
 
 # we are using a gpe-style Makefile
 inherit gpe