author | Rich Burridge <rich.burridge@oracle.com> |
Mon, 25 Jan 2016 14:14:00 -0800 | |
changeset 5327 | e8b0f6b16632 |
permissions | -rw-r--r-- |
5327
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Patch taken from the Desktop consolidation. |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
See BugDB CR #17795775 |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
poppler-data,poppler,libspectre,evince- resolve build issue and add TPNO changes |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
for more details. |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
This patch will be submitted upstream if the problem still exists in the |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
latest version of poppler. |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
--- poppler-0.14.4/glib/demo/main.c.orig 2013-11-14 09:10:00.162047254 +0530 |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
+++ poppler-0.14.4/glib/demo/main.c 2013-11-14 09:12:20.595665974 +0530 |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
@@ -158,7 +158,7 @@ gint main (gint argc, gchar **argv) |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
return 1; |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
} |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
- if (!g_thread_supported ()) |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+ if (!g_thread_get_initialized()) |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
g_thread_init (NULL); |
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
gtk_init (&argc, &argv); |