experimental/michga conglomerate.info,1.23,1.24 conglomerate.patch,1.10,1.11

[Michèle G. <mi...@us...>]

Update of /cvsroot/fink/experimental/michga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13820

Modified Files:
	conglomerate.info conglomerate.patch 
Log Message:
New prerelease version

Index: conglomerate.info
===================================================================
RCS file: /cvsroot/fink/experimental/michga/conglomerate.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- conglomerate.info	3 Apr 2005 07:57:28 -0000	1.23
+++ conglomerate.info	17 Jun 2005 02:55:07 -0000	1.24
@@ -1,9 +1,9 @@
 Package: conglomerate
-Version: 0.9.0
+Version: 0.9.1
 Revision: 1.0
 #Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source: http://micmacfr.homeunix.org/conglomerate/conglomerate-2005-04-03.tar.gz
-Source-MD5: 6460fa361644e72260ce7af387cdc79c
+Source: http://micmacfr.homeunix.org/conglomerate/conglomerate-2005-06-17.tar.gz
+Source-MD5: 449ef87fc6c37d84e136843936d2398f
 #SourceDirectory: %n-%v
 SourceDirectory: %n
 GCC: 3.3

Index: conglomerate.patch
===================================================================
RCS file: /cvsroot/fink/experimental/michga/conglomerate.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conglomerate.patch	3 Apr 2005 07:57:28 -0000	1.10
+++ conglomerate.patch	17 Jun 2005 02:55:07 -0000	1.11
@@ -1,14 +1,58 @@
---- conglomerate/src/plugin-sgml.c	Fri Jul 30 06:18:40 2004
-+++ conglomerate/src/plugin-patched-sgml.c	Fri Oct 29 07:31:15 2004
-@@ -111,7 +111,7 @@
+--- conglomerate/src/plugin-sgml.c	2004-07-30 06:18:40.000000000 +0200
++++ conglomerate/src/plugin-sgml-patched.c	2005-06-16 19:16:52.000000000 +0200
+@@ -79,6 +79,23 @@
+ }
+ #endif
+ 
++gchar *uri_to_system_filename(GnomeVFSURI *uri) {
++		if (gnome_vfs_uri_is_local(uri)) {
++				return gnome_vfs_uri_to_string(uri, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD);
++			} else {
++					return gnome_vfs_uri_to_string(uri, GNOME_VFS_URI_HIDE_PASSWORD);
++				}
++	}
++
++gchar *uri_to_system_filename2(gchar *uri) {
++		gchar *ret;
++		GnomeVFSURI *guri = gnome_vfs_uri_new(uri);
++		ret = uri_to_system_filename(guri);
++		gnome_vfs_uri_unref(guri);
++		return ret;
++	}
++
++
+ /**
+  * sgml_importer_action_callback:
+  * @importer:
+@@ -99,7 +116,7 @@
+ 	xmlDocPtr xml_doc;
+ 
+ #if 1
+-	gchar *argv[3];
++	gchar *argv[5];
+ 	gchar *standard_output;
+ 	gchar *standard_error;
+ 	gint exit_status;
+@@ -107,13 +124,15 @@
+ 	gboolean result;
+ 
+ /* 	gchar * posix_name = cong_util_get_local_path_from_uri(GnomeVFSURI *uri); */
+- 
++  gchar * posix_name = uri_to_system_filename2((gchar*)uri); 
  
  	g_message("sgml_importer_action_callback");
  
 -	argv[0] = "sgml2xml";
+-	argv[1] = (gchar*)uri; /* FIXME: this is GnomeVFS uri path string, not a POSIX path */
+-	argv[2] = NULL;
 +	argv[0] = "osx";
- 	argv[1] = (gchar*)uri; /* FIXME: this is GnomeVFS uri path string, not a POSIX path */
- 	argv[2] = NULL;
++	argv[1] = "-xno-nl-in-tag";
++		argv[2] = "-xlower";
++		argv[3] = (gchar*)posix_name; /* FIXME: this is GnomeVFS uri path string, not a POSIX path */
++		argv[4] = NULL;
+ 
  
+ 	/* Spawn a subprocess that runs sgml2xml on the uri and grabs the output: */
 --- conglomerate/omf.make	Thu Jan 22 11:45:14 2004
 +++ conglomerate/omf-patched.make	Mon Jul 19 15:41:07 2004
 @@ -42,7 +42,6 @@