[gentoo-commits] gentoo-x86 commit in dev-util/gtk-doc/files: gtk-doc-1.13-scan-touch-module-overrides.patch gtk-doc-1.13-fixxref-compat.patch

[Romain Perier (mrpouet)]

mrpouet     10/02/16 20:06:53

  Added:                gtk-doc-1.13-scan-touch-module-overrides.patch
                        gtk-doc-1.13-fixxref-compat.patch
  Log:
  Import two patches from upstream: touch MODULE-overrides.txt when missing in gtkdoc-scan, be compatible with old versions of gtk-doc in fixxref. Per bug #305191, thanks to Kacper Kowalik.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch?rev=1.1&content-type=text/plain

Index: gtk-doc-1.13-scan-touch-module-overrides.patch
===================================================================
From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@××××××.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".
---
diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
index ece8d99..c986f36 100755
--- a/gtkdoc-scan.in
+++ b/gtkdoc-scan.in
@@ -185,12 +185,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_file) {
   `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`;
+}
 
 
 
--
cgit v0.8.3.1



1.1                  dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch?rev=1.1&content-type=text/plain

Index: gtk-doc-1.13-fixxref-compat.patch
===================================================================
From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@×××××.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