[mutter-wayland] Update logfile patch

Florian Müllner fmuellner at fedoraproject.org
Fri Dec 20 13:24:07 UTC 2013


commit 0b7db71ba76cbfd18017fbb6368aea55d87a8dca
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Fri Dec 20 14:23:47 2013 +0100

    Update logfile patch

 mutter-wayland-3.10.0.1-logfile.patch |   35 ++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/mutter-wayland-3.10.0.1-logfile.patch b/mutter-wayland-3.10.0.1-logfile.patch
index 7b9b580..7d271d1 100644
--- a/mutter-wayland-3.10.0.1-logfile.patch
+++ b/mutter-wayland-3.10.0.1-logfile.patch
@@ -1,12 +1,29 @@
-diff -up mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c
---- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx	2013-09-16 16:40:46.000000000 -0400
-+++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c	2013-10-02 13:37:57.027318760 -0400
-@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
+index 02c5b7b..af90469 100644
+--- a/src/wayland/meta-xwayland.c
++++ b/src/wayland/meta-xwayland.c
+@@ -296,7 +296,6 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
+   char **env;
+   char *fd_string;
+   char *display_name;
+-  char *log_path;
+   char *args[11];
+   GError *error;
+ 
+@@ -359,7 +358,6 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
+ 
+   display_name = g_strdup_printf (":%d",
+                                   compositor->xwayland_display_index);
+-  log_path = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+ 
+   args[0] = XWAYLAND_PATH;
+   args[1] = display_name;
+@@ -367,11 +365,9 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
    args[3] = "-rootless";
    args[4] = "-retro";
    args[5] = "-noreset";
 -  args[6] = "-logfile";
--  args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+-  args[7] = log_path;
 -  args[8] = "-nolisten";
 -  args[9] = "all";
 -  args[10] = NULL;
@@ -16,3 +33,11 @@ diff -up mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx mutter-wayland-3
  
    error = NULL;
    if (g_spawn_async (NULL, /* cwd */
+@@ -402,7 +398,6 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
+ 
+   g_strfreev (env);
+   g_free (display_name);
+-  g_free (log_path);
+ 
+   /* We need to run a mainloop until we know xwayland has a binding
+    * for our xserver interface at which point we can assume it's


More information about the scm-commits mailing list