| author | Rich Burridge <rich.burridge@oracle.com> |
| Wed, 13 Jul 2016 10:10:59 -0700 | |
| changeset 6408 | 3c9262a98d5d |
| permissions | -rw-r--r-- |
|
6408
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
gcc build fails complaining %u expects unsigned int, but getpid() returns |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
pid_t -- which is an int on Solaris now (historically a long). |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This patch should be sent upstream. |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- evince-3.16.0/libdocument/ev-file-helpers.c 2014-11-29 01:40:15.000000000 -0800 |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ evince-3.16.0.new/libdocument/ev-file-helpers.c 2015-07-08 13:57:33.999990934 -0700 |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -88,7 +88,7 @@ |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
const gchar *prgname; |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
prgname = g_get_prgname (); |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
- dirname = g_strdup_printf ("%s-%u", prgname ? prgname : "unknown", getpid ());
|
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ dirname = g_strdup_printf ("%s-%u", prgname ? prgname : "unknown", (unsigned int) getpid ());
|
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
tmp_dir = g_build_filename (g_get_tmp_dir (), dirname, NULL); |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
g_free (dirname); |
|
3c9262a98d5d
PSARC 2016/321 Update evince, poppler, poppler-data and libspectre
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
} |