Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30754/10.4-transitional/unstable/main/finkinfo/gnome
Modified Files: gpdf.info Added Files: gpdf.patch Log Message: Fix opening of files with colon in filename. Still need uint->guint fix for Tiger. Index: gpdf.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gpdf.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gpdf.info 19 Sep 2005 15:15:24 -0000 1.8 +++ gpdf.info 21 Sep 2005 17:00:37 -0000 1.9 @@ -1,6 +1,6 @@ Package: gpdf Version: 2.10.0 -Revision: 3 +Revision: 5 GCC: 3.3 Depends: << atk1-shlibs (>= 1.6.0-1), @@ -67,9 +67,9 @@ << Source: mirror:gnome:sources/%n/2.10/%n-%v.tar.bz2 Source-MD5: 9278cd3b9d06e3b1d364452f0e512fa9 +Patch: %n.patch PatchScript: << perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g" help/omf.make help/*/Makefile.in - perl -pi.bak -e 's|\(uint\)|\(guint\)|g' xpdf/gpdf-thumbnails-view.cc << SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man --disable-dependency-tracking @@ -91,6 +91,14 @@ ConfFiles: %p/etc/gconf/schemas/gpdf.schemas DocFiles: AUTHORS CHANGES COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README README.GPdf Description: GNOME pdf viewer +DescPort: << + The "uint" type isn't getting defined on 10.4, so use the more + portable "guint" type unstead (fix by Martin Costabel). See: + http://bugzilla.gnome.org/show_bug.cgi?id=304735 + + Fix opening of files whose first punctuation character is a colon. + See: http://bugzilla.gnome.org/show_bug.cgi?id=160639 +<< License: GPL Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> Homepage: http://www.gnome.org/ --- NEW FILE: gpdf.patch --- 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 <string.h> #include <stdlib.h> +/* needed for stat() */ +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + #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/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 + ------------------------------------------------------- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits