Patch to avoid gtk-doc errors. Closes bug #46266.

5 files changed, 163 insertions, 12 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 347bc48f616f..d11a8eca31a7 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.83 2004/03/28 18:24:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.84 2004/04/01 08:53:12 leonardop Exp $
+
+  01 Apr 2004; L. Boshell <leonardop@gentoo.org> gnome-vfs-1.0.5-r3.ebuild,
+  files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch:
+  Patch to avoid gtk-doc errors. Closes bug #46266.
 
   28 Mar 2004; foser <foser@gentoo.org> gnome-vfs-2.6.0.ebuild :
   Add gnome-vfs-extras block for samba
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index cdef602b11a6..5307b91d1399 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,15 +1,16 @@
-MD5 0b983df3879f7f1b8acd6b0e35a9ae65 gnome-vfs-2.6.0.ebuild 1319
-MD5 0a64f21abd8484952e644a2d3702bc37 gnome-vfs-2.4.1.ebuild 1044
+MD5 8e0cdc26f5ead386cefd26f9b02b3e9e ChangeLog 10044
 MD5 bb0dbb43366b1fb9eb6ce94459001c33 gnome-vfs-2.4.2-r1.ebuild 1063
-MD5 0df2324101e6ea8594ec5b5682d903be gnome-vfs-1.0.5-r3.ebuild 1581
-MD5 f57be585aaa0c3ff1d8228c60f3de302 gnome-vfs-2.4.0.ebuild 1040
-MD5 9fa342b88e66a769022e871b90d05f22 ChangeLog 9863
+MD5 0b983df3879f7f1b8acd6b0e35a9ae65 gnome-vfs-2.6.0.ebuild 1319
+MD5 6a71688177f0c586f3afeb889916e830 gnome-vfs-1.0.5-r3.ebuild 1673
+MD5 f1ade3c92fe526fdef6193d00c1ca3f5 gnome-vfs-2.4.0.ebuild 1044
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 0a64f21abd8484952e644a2d3702bc37 gnome-vfs-2.4.1.ebuild 1044
 MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
-MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
+MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
 MD5 7803b9dff2675a9dcf670ad1128a1d36 files/digest-gnome-vfs-2.4.0 69
 MD5 f0d9fa08ccb4ec34316561d25051dab4 files/digest-gnome-vfs-2.4.1 69
-MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
-MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
+MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
+MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
+MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
diff --git a/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch
new file mode 100644
index 000000000000..d7f68be625b5
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch
@@ -0,0 +1,144 @@
+diff -NurB gnome-vfs-1.0.5-orig/doc/about.sgml gnome-vfs-1.0.5/doc/about.sgml
+--- gnome-vfs-1.0.5-orig/doc/about.sgml	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/about.sgml	2004-04-01 02:13:19.000000000 -0500
+@@ -83,7 +83,7 @@
+     <para>
+       The GnomeVFS equivalent is very similar, but you will notice slightly different data types. The
+       consistent returning of a GnomeVFSResult also necessitated moving the return value of read into
+-      a pass-back-value pointer <variable>bytes_read</variable>:
++      a pass-back-value pointer <varname>bytes_read</varname>:
+       <programlisting>
+ 	GnomeVFSResult gnome_vfs_read (GnomeVFSHandle *handle,
+ 	                               gpointer buffer,
+diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml
+--- gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml	2004-04-01 02:40:00.000000000 -0500
+@@ -18,7 +18,6 @@
+ <!entity gnome-vfs-inet-connection SYSTEM "sgml/inet-connection.sgml">
+ <!entity gnome-vfs-init SYSTEM "sgml/init.sgml">
+ <!entity gnome-vfs-iobuf SYSTEM "sgml/iobuf.sgml">
+-<!entity gnome-vfs-list-sort SYSTEM "sgml/list-sort.sgml">
+ <!entity gnome-vfs-method SYSTEM "sgml/method.sgml">
+ <!entity gnome-vfs-mime-handlers SYSTEM "sgml/mime-handlers.sgml">
+ <!entity gnome-vfs-mime-info SYSTEM "sgml/mime-info.sgml">
+@@ -94,7 +93,7 @@
+ 	without the use of threads.
+       </para>
+       &gnome-vfs-async-ops;
+-    <--FIXME: should we display this?gnome-vfs-cancellable-ops-->
++    <!--FIXME: should we display this?gnome-vfs-cancellable-ops-->
+       &gnome-vfs-ops;
+       &gnome-vfs-directory;
+       &gnome-vfs-xfer;
+@@ -136,12 +135,12 @@
+       read-write, seeking, etc). Modules are dynamically loaded based upon the URI
+       scheme passed into the high-level GnomeVFS APIs.
+     </para>
+-      &writing-modules;
+       &gnome-vfs-method;
+       &gnome-vfs-module-shared;
+       &gnome-vfs-module;
+       &gnome-vfs-module-callback-module-api;
+   </chapter>
++  &writing-modules;
+ 
+   <chapter id="everything-else">
+     <title>Other APIs</title>
+@@ -152,11 +151,10 @@
+       &gnome-vfs-directory-filter;
+       &gnome-vfs-file-size;
+       &gnome-vfs-find-directory;
+-      <--FIXME: I think this should be private: gnome-vfs-handle-->
++      <!--FIXME: I think this should be private: gnome-vfs-handle-->
+       &gnome-vfs-inet-connection;
+       &gnome-vfs-init;
+       &gnome-vfs-iobuf;
+-      &gnome-vfs-list-sort;
+       &gnome-vfs-module-callback;
+       &gnome-vfs-standard-callbacks;
+       &gnome-vfs-parse-ls;
+diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt
+--- gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt	2004-04-01 03:16:07.000000000 -0500
+@@ -194,7 +194,7 @@
+ 
+ <SECTION>
+ <FILE>find-directory</FILE>
+-<TITLE>Find Directory</TITLE>
++<TITLE>Find Directory Section</TITLE>
+ gnome_vfs_find_directory
+ </SECTION>
+ 
+@@ -224,6 +224,7 @@
+ 
+ <SECTION>
+ <FILE>init</FILE>
++<TITLE>Init Section</TITLE>
+ gnome_vfs_init
+ gnome_vfs_initialized
+ gnome_vfs_shutdown
+diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml
+--- gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml	1969-12-31 19:00:00.000000000 -0500
+@@ -1,38 +0,0 @@
+-<!-- ##### SECTION Title ##### -->
+-list-sort
+-
+-<!-- ##### SECTION Short_Description ##### -->
+-
+-
+-<!-- ##### SECTION Long_Description ##### -->
+-<para>
+-
+-</para>
+-
+-<!-- ##### SECTION See_Also ##### -->
+-<para>
+-
+-</para>
+-
+-<!-- ##### USER_FUNCTION GnomeVFSListCompareFunc ##### -->
+-<para>
+-
+-</para>
+-
+-@a: 
+-@b: 
+-@data: 
+-@Returns: 
+-
+-
+-<!-- ##### FUNCTION gnome_vfs_list_sort ##### -->
+-<para>
+-
+-</para>
+-
+-@list: 
+-@compare_func: 
+-@data: 
+-@Returns: 
+-
+-
+diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml
+--- gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml	2004-04-01 02:32:34.000000000 -0500
+@@ -24,7 +24,7 @@
+ </para>
+ 
+ 
+-</para><informaltable pgwide=1 frame="none" role="params">
++<informaltable pgwide=1 frame="none" role="params">
+ <tgroup cols="2">
+ <colspec colwidth="2*">
+ <colspec colwidth="8*">
+diff -NurB gnome-vfs-1.0.5-orig/doc/writing-modules.sgml gnome-vfs-1.0.5/doc/writing-modules.sgml
+--- gnome-vfs-1.0.5-orig/doc/writing-modules.sgml	2004-04-01 02:12:47.000000000 -0500
++++ gnome-vfs-1.0.5/doc/writing-modules.sgml	2004-04-01 02:21:20.000000000 -0500
+@@ -6,7 +6,6 @@
+       GNOME Virtual File System.
+     </para>
+   </abstract>
+- </artheader>
+ 
+   <sect1 id="Introduction">
+     <title>Introduction</title>
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
index e1d393a1665e..990b2adf9c9d 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.9 2004/01/10 14:05:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.10 2004/04/01 08:53:12 leonardop Exp $
 
 IUSE="ssl nls"
 
@@ -38,6 +38,8 @@ src_unpack() {
 	epatch ${FILESDIR}/1.0/${P}-codeset.patch
 	# Use GNOME2 Gconf keys for proxy settings
 	epatch ${FILESDIR}/1.0/${P}-proxy.patch
+	# Avoid openjade errors. See bug #46266.
+	epatch ${FILESDIR}/1.0/${P}-gtkdoc_fixes.patch
 
 	# Fix a rare segfault with gnome-mime-data-2.0.1.  Weird one really ...
 	# <azarah@gentoo.org> (2 Jan 2003).
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
index b6ae309a871b..4f44a19565fd 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild,v 1.11 2003/12/07 23:35:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild,v 1.12 2004/04/01 08:53:12 leonardop Exp $
 
 inherit gnome2 eutils