diff options
author | wiz <wiz> | 2010-01-22 14:21:32 +0000 |
---|---|---|
committer | wiz <wiz> | 2010-01-22 14:21:32 +0000 |
commit | 91960061b92faff296e2620d74e46d71c2b8a38f (patch) | |
tree | c1139e72cba8e6946a0646e983d37bf8105e88e0 | |
parent | f828fe3f8514283aca064e4e1dd0ed5f66dc65b7 (diff) | |
download | pkgsrc-91960061b92faff296e2620d74e46d71c2b8a38f.tar.gz |
Add two patches from upstream to fix --module and 'make dist' problems.
Bump PKGREVISION.
-rw-r--r-- | textproc/gtk-doc/Makefile | 3 | ||||
-rw-r--r-- | textproc/gtk-doc/distinfo | 4 | ||||
-rw-r--r-- | textproc/gtk-doc/patches/patch-aa | 78 | ||||
-rw-r--r-- | textproc/gtk-doc/patches/patch-ab | 31 |
4 files changed, 114 insertions, 2 deletions
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 11bf9ed2faf..8c15d6797cf 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/01/20 11:12:01 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/01/22 14:21:32 wiz Exp $ # DISTNAME= gtk-doc-1.13 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/1.13/} EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo index 107d2f86310..8961a874abe 100644 --- a/textproc/gtk-doc/distinfo +++ b/textproc/gtk-doc/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.16 2010/01/20 11:12:01 wiz Exp $ +$NetBSD: distinfo,v 1.17 2010/01/22 14:21:32 wiz Exp $ SHA1 (gtk-doc-1.13.tar.bz2) = 8c6b157e594072aaf598bc7e68562ec02e50b651 RMD160 (gtk-doc-1.13.tar.bz2) = 36da31b769aa0e9d35c246160489d4c59a6f0e67 Size (gtk-doc-1.13.tar.bz2) = 644297 bytes +SHA1 (patch-aa) = 35a8774e7c670ead15a5a88341c37974378bda77 +SHA1 (patch-ab) = 1e0304443e6ae11df39d301217a83ce741da944e diff --git a/textproc/gtk-doc/patches/patch-aa b/textproc/gtk-doc/patches/patch-aa new file mode 100644 index 00000000000..3e531ac8d03 --- /dev/null +++ b/textproc/gtk-doc/patches/patch-aa @@ -0,0 +1,78 @@ +$NetBSD: patch-aa,v 1.1 2010/01/22 14:21:32 wiz Exp $ + +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. + +--- gtkdoc-fixxref.in.orig 2009-12-17 19:36:51.000000000 +0000 ++++ 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); + diff --git a/textproc/gtk-doc/patches/patch-ab b/textproc/gtk-doc/patches/patch-ab new file mode 100644 index 00000000000..a7a5c159174 --- /dev/null +++ b/textproc/gtk-doc/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 2010/01/22 14:21:32 wiz Exp $ + +From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001 +From: Nicola Fontana <ntd@entidi.it> +Date: Mon, 03 Aug 2009 13:32:36 +0000 +Subject: gtkdoc-scan: touch MODULE-overrides.txt when missing. Fixes #590625 + +gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST, so this +file must exist to be able to "make dist". + +--- gtkdoc-scan.in.orig 2009-11-25 19:18:11.000000000 +0000 ++++ gtkdoc-scan.in +@@ -180,12 +180,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_ + `cp $old_decl_list $sections_file`; + } + +-# If there is no MODULE-overrides.txt file we create an empty one. +-# FIXME: why? +-#my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt"; +-#if (! -e $overrides_file) { +-# `touch $overrides_file`; +-#} ++# If there is no MODULE-overrides.txt file we create an empty one ++# because EXTRA_DIST in gtk-doc.make requires it. ++my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt"; ++if (! -e $overrides_file) { ++ `touch $overrides_file`; ++} + + + |