packages: gtk-doc/gtk-doc.spec, gtk-doc/fix-fixxref.patch (NEW) - added fix...

[sls]

Author: sls                          Date: Fri Feb  5 14:32:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added fix-fixxref.patch (from Fedora)
- rel. 3

---- Files affected:
packages/gtk-doc:
   gtk-doc.spec (1.78 -> 1.79) , fix-fixxref.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gtk-doc/gtk-doc.spec
diff -u packages/gtk-doc/gtk-doc.spec:1.78 packages/gtk-doc/gtk-doc.spec:1.79
--- packages/gtk-doc/gtk-doc.spec:1.78	Fri Jan 15 01:30:52 2010
+++ packages/gtk-doc/gtk-doc.spec	Fri Feb  5 15:32:53 2010
@@ -11,12 +11,13 @@
 Summary(pt_BR.UTF-8):	O gerador de documentação do GTK
 Name:		gtk-doc
 Version:	1.13
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/%{name}-%{version}.tar.bz2
 # Source0-md5:	27940d6cd5c9dcda8fc003043d8c299a
 Patch0:		%{name}-noarch.patch
+Patch1:		fix-fixxref.patch
 URL:		http://www.gtk.org/rdp/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -89,6 +90,7 @@
 %prep
 %setup -q
 %{!?with_tests:%patch0 -p1}
+%patch1 -p1
 mv -f doc/README doc/README.docs
 
 %build
@@ -147,6 +149,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2010/02/05 14:32:53  sls
+- added fix-fixxref.patch (from Fedora)
+- rel. 3
+
 Revision 1.78  2010/01/15 00:30:52  sparky
 - changed Suggests: source-highlight to Requires; most (all?) packages using
   gtk-doc require it to build, but adding BR: in them is not the right solution

================================================================
Index: packages/gtk-doc/fix-fixxref.patch
diff -u /dev/null packages/gtk-doc/fix-fixxref.patch:1.1
--- /dev/null	Fri Feb  5 15:32:58 2010
+++ packages/gtk-doc/fix-fixxref.patch	Fri Feb  5 15:32:53 2010
@@ -0,0 +1,71 @@
+without this patch gtk-fixxref must be invoked with '--module' option
+and it's bad (f.e. building evolution-exchange-2.28.2 fails)
+diff -up gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref gtk-doc-1.13/gtkdoc-fixxref.in
+--- gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref	2009-12-17 14:36:51.000000000 -0500
++++ gtk-doc-1.13/gtkdoc-fixxref.in	2010-01-06 17:56:55.457121567 -0500
+@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
+     }
+ }
+ 
+-open (INPUT, "$MODULE-sections.txt")
+-	|| die "Can't open $MODULE-sections.txt: $!";
+-my $subsection = "";
+-while (<INPUT>) {
+-    if (m/^#/) {
+-        next;
+-
+-    } elsif (m/^<SECTION>/) {
+-        $subsection = "";
+-    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+-        $subsection = $1;
+-    } elsif (m/^<SUBSECTION>/) {
+-        next;
+-    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+-        next;
+-    } elsif (m/^<FILE>(.*)<\/FILE>/) {
+-        next;
+-    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+-        next;
+-    } elsif (m/^<\/SECTION>/) {
+-        next;
+-    } elsif (m/^(\S+)/) {
+-        my $symbol=CreateValidSGMLID($1);
+-
+-        if ($subsection eq "Standard" || $subsection eq "Private") {
+-            $NoLinks{$symbol} = 1;
++if (defined($MODULE)) {
++    open (INPUT, "$MODULE-sections.txt")
++            || die "Can't open $MODULE-sections.txt: $!";
++    my $subsection = "";
++    while (<INPUT>) {
++        if (m/^#/) {
++            next;
++
++        } elsif (m/^<SECTION>/) {
++            $subsection = "";
++        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
++            $subsection = $1;
++        } elsif (m/^<SUBSECTION>/) {
++            next;
++        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
++            next;
++        } elsif (m/^<FILE>(.*)<\/FILE>/) {
++            next;
++        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
++            next;
++        } elsif (m/^<\/SECTION>/) {
++            next;
++        } elsif (m/^(\S+)/) {
++            my $symbol=CreateValidSGMLID($1);
++
++            if ($subsection eq "Standard" || $subsection eq "Private") {
++                $NoLinks{$symbol} = 1;
++            }
+         }
+     }
++    close (INPUT);
+ }
+-close (INPUT);
+ 
+ &FixCrossReferences ($MODULE_DIR);
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk-doc/gtk-doc.spec?r1=1.78&r2=1.79&f=u