rpms/gtk-doc
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix issues with gtkdoc-fixxref

Browse Source
This commit is contained in:
Matthias Clasen 2010-01-06 23:01:28 +00:00
parent 5bfd42eded
commit 9d217fd9f1
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
fix-fixxref.patch Normal file
View File

@ -0,0 +1,69 @@
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);

9
gtk-doc.spec
View File

@ -1,7 +1,7 @@
Summary: API documentation generation tool for GTK+ and GNOME Summary: API documentation generation tool for GTK+ and GNOME
Name: gtk-doc Name: gtk-doc
Version: 1.13 Version: 1.13
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
Group: Development/Tools Group: Development/Tools
Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2
@ -28,6 +28,9 @@ Requires: sgml-common
Source1: filter-requires-gtk-doc.sh Source1: filter-requires-gtk-doc.sh
%define __perl_requires %{SOURCE1} %define __perl_requires %{SOURCE1}
# upstream fix
Patch0: fix-fixxref.patch
%description %description
gtk-doc is a tool for generating API reference documentation. gtk-doc is a tool for generating API reference documentation.
It is used for generating the documentation for GTK+, GLib It is used for generating the documentation for GTK+, GLib
@ -36,6 +39,7 @@ and GNOME.
%prep %prep
%setup -q %setup -q
%patch0 -R -p1 -b .fix-fixxref
# Move this doc file to avoid name collisions # Move this doc file to avoid name collisions
mv doc/README doc/README.docs mv doc/README doc/README.docs
@ -69,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/omf/gtk-doc-manual %{_datadir}/omf/gtk-doc-manual
%changelog %changelog
* Wed Jan 6 2010 Matthias Clasen <mclasen@redhat.com> - 1.13-2
- Fix issues with gtkdoc-fixxref
* Tue Dec 22 2009 Matthias Clasen <mclasen@redhat.com> - 1.13-1 * Tue Dec 22 2009 Matthias Clasen <mclasen@redhat.com> - 1.13-1
- Update to 1.13 - Update to 1.13