diff options
author | Ladislav Hagara | 2010-04-01 10:32:04 +0200 |
---|---|---|
committer | Ladislav Hagara | 2010-04-01 10:32:04 +0200 |
commit | 20a589704b0149a077889927593e8af92831c3b3 (patch) | |
tree | e430bd76366a9c43c1d914dde31b7218aa72d112 | |
parent | 961c43c8f8d9eb6d33f0fb8ad47989d784734c2a (diff) |
gtk-doc: removed patches for 1.13
Unpacking source file gtk-doc-1.14.tar.bz2 for spell gtk-doc.
patching file gtkdoc-fixxref.in
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
-rw-r--r-- | gnome2-libs/gtk-doc/HISTORY | 3 | ||||
-rwxr-xr-x | gnome2-libs/gtk-doc/PRE_BUILD | 3 | ||||
-rw-r--r-- | gnome2-libs/gtk-doc/fixxref.patch | 80 |
3 files changed, 3 insertions, 83 deletions
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY index 340a7d63d3..cc1a490dbf 100644 --- a/gnome2-libs/gtk-doc/HISTORY +++ b/gnome2-libs/gtk-doc/HISTORY @@ -1,3 +1,6 @@ +2010-04-01 Ladislav Hagara <hgr@vabo.cz> + * PRE_BUILD, fixxref.patch: removed + 2010-03-30 Vasil Yonkov <spirtbrat@sourcemage.org> * DETAILS: updated spell to 1.14 diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD deleted file mode 100755 index 4315ee2d6b..0000000000 --- a/gnome2-libs/gtk-doc/PRE_BUILD +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 6b5a09b66c..0000000000 --- a/gnome2-libs/gtk-doc/fixxref.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 |