components/gnome/gnome-shell/patches/02-proc-cmdline.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 28 Oct 2016 17:56:16 -0700
changeset 7206 23066e5fef27
child 7661 aff9737ef6ba
permissions -rw-r--r--
23245637 Deliver gnome-shell 3.18.3 in Solaris PSARC/2016/396 GNOME 3 Window Manager Bundle
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7206
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     1
Enable use of /proc/self/cmdline on Solaris as well as Linux, now that we have
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     2
support for it via PSARC/2015/207, instead of falling through to no-op case in
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     3
shell_global_reexec_self().
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     4
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     5
Need to submit upstream.
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     6
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     7
diff --git a/src/shell-global.c b/src/shell-global.c
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     8
index 6dda352..a698f0e 100644
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     9
--- a/src/shell-global.c
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    10
+++ b/src/shell-global.c
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    11
@@ -1244,7 +1244,7 @@ shell_global_reexec_self (ShellGlobal *global)
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    12
   GPtrArray *arr;
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    13
   gsize len;
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    14
 
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    15
-#if defined __linux__
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    16
+#if defined __linux__ || defined __sun
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    17
   char *buf;
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    18
   char *buf_p;
23066e5fef27 23245637 Deliver gnome-shell 3.18.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    19
   char *buf_end;