patches/glib-01-default-path.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17760 d566f872fd1b
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8863
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     1
diff -Nrup glib-2.12.4/glib/gspawn.c ../SUNWgnome-base-libs-2.16.1-patch03/glib-2.12.4/glib/gspawn.c
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     2
--- glib-2.12.4/glib/gspawn.c	2006-09-30 16:21:38.000000000 +0200
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     3
+++ ../SUNWgnome-base-libs-2.16.1-patch03/glib-2.12.4/glib/gspawn.c	2006-10-12 09:38:16.091196000 +0200
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     4
@@ -1457,7 +1457,11 @@ g_execute (const gchar *file,
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     5
            * what to search if PATH is unset. POSIX may, dunno.
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     6
            */
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     7
           
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     8
-          path = "/bin:/usr/bin:.";
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     9
+#ifdef sun
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    10
+          path = "/usr/bin";
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    11
+#else
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    12
+          path = "/bin:/usr/bin";
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    13
+#endif
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    14
 	}
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    15
 
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    16
       len = strlen (file) + 1;
9880
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    17
diff -Nrup glib-2.13.1/glib/gutils.c ../SUNWgnome-base-libs-2.16.1-patch03/glib-2.13.1/glib/gutils.c
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    18
--- glib-2.13.1/glib/gutils.c	2006-07-06 22:30:16.000000000 +0200
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    19
+++ ../SUNWgnome-base-libs-2.16.1-patch03/glib-2.13.1/glib/gutils.c	2006-10-12 09:38:16.081238000 +0200
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    20
@@ -427,7 +427,11 @@
8863
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    21
        * what to search if PATH is unset. POSIX may, dunno.
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    22
        */
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    23
       
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    24
+#ifdef sun
9880
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    25
+      path = "/usr/bin:.";
8863
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    26
+#else
9880
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    27
       path = "/bin:/usr/bin:.";
8863
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    28
+#endif
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    29
     }
8b0e51e42b63 2006-12-19 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    30
 #else
9880
ad99395cbe92 2007-05-11 Damien Carbery <[email protected]>
dcarbery
parents: 8863
diff changeset
    31
   n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN);