diff -Nurd -x'*~' gpdf-2.10.0.orig/configure gpdf-2.10.0/configure --- gpdf-2.10.0.orig/configure 2005-03-07 14:46:20.000000000 -0500 +++ gpdf-2.10.0/configure 2010-03-09 01:19:55.000000000 -0500 @@ -9660,6 +9660,7 @@ +EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS $INTLLIBS" GNOME_PRINT_PRIVATE_CFLAGS="-I`$PKG_CONFIG libgnomeprint-2.2 --variable privateincludedir`" diff -Nurd -x'*~' gpdf-2.10.0.orig/shell/eel-vfs-extensions.c gpdf-2.10.0/shell/eel-vfs-extensions.c --- gpdf-2.10.0.orig/shell/eel-vfs-extensions.c 2003-12-29 15:14:14.000000000 -0500 +++ gpdf-2.10.0/shell/eel-vfs-extensions.c 2005-09-21 12:42:46.000000000 -0400 @@ -48,6 +48,11 @@ #include #include +/* needed for stat() */ +#include +#include +#include + #define READ_CHUNK_SIZE 8192 struct EelReadFileHandle { @@ -986,6 +991,7 @@ eel_make_uri_from_shell_arg (const char *location) { char *uri; + struct stat info; g_return_val_if_fail (location != NULL, g_strdup ("")); @@ -997,7 +1003,8 @@ uri = gnome_vfs_get_uri_from_local_path (location); break; default: - if (has_valid_scheme (location)) { + /* stat() returns 0 if the file is readable */ + if (stat(location, &info) && has_valid_scheme (location)) { uri = g_strdup (location); } else { uri = file_uri_from_local_relative_path (location); diff -Nurd -x'*~' gpdf-2.10.0.orig/xpdf/TextOutputDev.h gpdf-2.10.0/xpdf/TextOutputDev.h --- gpdf-2.10.0.orig/xpdf/TextOutputDev.h 2004-05-17 15:37:57.000000000 -0400 +++ gpdf-2.10.0/xpdf/TextOutputDev.h 2010-03-09 01:02:29.000000000 -0500 @@ -25,7 +25,9 @@ class GfxFont; class GfxState; class UnicodeMap; - +class TextBlock; +class TextPage; +class TextLineFrag; //------------------------------------------------------------------------ typedef void (*TextOutputFunc)(void *stream, char *text, int len); diff -Nurd -x'*~' gpdf-2.10.0.orig/xpdf/gpdf-control.cc gpdf-2.10.0/xpdf/gpdf-control.cc --- gpdf-2.10.0.orig/xpdf/gpdf-control.cc 2004-12-28 15:04:18.000000000 -0500 +++ gpdf-2.10.0/xpdf/gpdf-control.cc 2010-03-09 01:02:29.000000000 -0500 @@ -213,7 +213,7 @@ g_return_if_fail (GPDF_IS_NON_NULL_CONTROL (control)); priv = control->priv; - if ((to_id = (unsigned int) + if ((to_id = (unsigned int) (uintptr_t) g_object_get_data (G_OBJECT (control), "status-timeout-id")) != 0) { g_object_set_data (G_OBJECT (control), diff -Nurd -x'*~' gpdf-2.10.0.orig/xpdf/gpdf-thumbnails-view.cc gpdf-2.10.0/xpdf/gpdf-thumbnails-view.cc --- gpdf-2.10.0.orig/xpdf/gpdf-thumbnails-view.cc 2004-08-02 10:17:44.000000000 -0400 +++ gpdf-2.10.0/xpdf/gpdf-thumbnails-view.cc 2005-09-21 12:40:52.000000000 -0400 @@ -344,7 +344,7 @@ if (y) { *y = GPDF_THUMBNAILS_MARGIN_TOP + - (uint)((page -1) / priv->page_per_row) * + (guint)((page -1) / priv->page_per_row) * (priv->max_page_height + GPDF_THUMBNAILS_ROW_SEP + GPDF_THUMBNAILS_TEXT_HEIGHT + GPDF_THUMBNAILS_INNER_MARGIN_BOTTOM + diff -Nurd -x'*~' gpdf-2.10.0.orig/xpdf/gpdf-util.h gpdf-2.10.0/xpdf/gpdf-util.h --- gpdf-2.10.0.orig/xpdf/gpdf-util.h 2004-02-26 15:39:18.000000000 -0500 +++ gpdf-2.10.0/xpdf/gpdf-util.h 2010-03-09 01:02:29.000000000 -0500 @@ -9,7 +9,9 @@ #define END_EXTERN_C } +#include "gpdf-g-switch.h" #include +#include "gpdf-g-switch.h" /* FIXME kill when GNOME's macros are fixed */ /*