diff options
| author | Ladislav Hagara | 2010-02-05 09:15:21 +0100 |
|---|---|---|
| committer | Eric Sandall | 2010-02-06 18:06:53 -0800 |
| commit | 06f3c8c65f8a51d2a2902075d4032ad917b0a881 (patch) | |
| tree | 6fc8f1ef6c981130044cd462e99de1a938db04f7 | |
| parent | 6716482a72a19d5f6075c4ba1a75595fb6854642 (diff) | |
gtk-doc: added patch from gtk-doc git #15562
(cherry picked from commit db96916b235a73f9a4e7f259e347a961e7f1673b)
| -rwxr-xr-x | gnome2-libs/gtk-doc/DETAILS | 1 | ||||
| -rw-r--r-- | gnome2-libs/gtk-doc/HISTORY | 4 | ||||
| -rwxr-xr-x | gnome2-libs/gtk-doc/PRE_BUILD | 3 | ||||
| -rw-r--r-- | gnome2-libs/gtk-doc/fixxref.patch | 80 |
4 files changed, 88 insertions, 0 deletions
diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS index 1ceac30809..dd448235e2 100755 --- a/gnome2-libs/gtk-doc/DETAILS +++ b/gnome2-libs/gtk-doc/DETAILS @@ -1,5 +1,6 @@ SPELL=gtk-doc VERSION=1.13 + PATCHLEVEL=1 BRANCH=`echo $VERSION | cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY index a67c46994c..2b80478931 100644 --- a/gnome2-libs/gtk-doc/HISTORY +++ b/gnome2-libs/gtk-doc/HISTORY @@ -1,3 +1,7 @@ +2010-02-05 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: PATCHLEVEL=1 + * PRE_BUILD, fixxref.patch: added patch from gtk-doc git #15562 + 2010-01-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.13 diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD new file mode 100755 index 0000000000..4315ee2d6b --- /dev/null +++ b/gnome2-libs/gtk-doc/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SPELL_DIRECTORY/fixxref.patch diff --git a/gnome2-libs/gtk-doc/fixxref.patch b/gnome2-libs/gtk-doc/fixxref.patch new file mode 100644 index 0000000000..6b5a09b66c --- /dev/null +++ b/gnome2-libs/gtk-doc/fixxref.patch @@ -0,0 +1,80 @@ +From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001 +From: Vincent Untz <vuntz@gnome.org> +Date: Tue, 22 Dec 2009 11:54:31 +0000 +Subject: fixxref: make it work again without --module argument, Fixes #605211 + +This restores a compatible behavior with previous versions of gtk-doc, +which is required by many tarballs. +--- +diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in +index 8f166ef..5a703ad 100755 +--- a/gtkdoc-fixxref.in ++++ b/gtkdoc-fixxref.in +@@ -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); + +-- +cgit v0.8.3.1 |