r46199 - /desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Mon Sep 28 18:08:22 2015
New Revision: 46199

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46199
Log:
Add one needed fix to make gtkdocentities generation really work

Modified:
    desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff

Modified: desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff?rev=46199&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/gtkdocentities.diff	[utf-8] Mon Sep 28 18:08:22 2015
@@ -6,9 +6,11 @@
  Generate an entity file automatically on build, containing all the
  PACKAGE_* variables. Use it in the default generated main XML file, so
  that new modules using gtk-doc don’t have to worry about this any more.
+ .
+ Also cherry-pick the needed part of commit 3f34493430d0c9a3.
 Origin: upstream, https://git.gnome.org/browse/gtk-doc/commit/?id=98b88db275738b72
 Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=743182
-Last-Update: 2015-09-26
+Last-Update: 2015-09-28
 
 --- a/gtk-doc.make
 +++ b/gtk-doc.make
@@ -70,7 +72,15 @@
  GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
 --- a/gtkdoc-mkdb.in
 +++ b/gtkdoc-mkdb.in
-@@ -2686,6 +2686,8 @@
+@@ -174,6 +174,7 @@
+                 }
+                 last;
+             }
++            s#<!ENTITY % gtkdocentities SYSTEM \"([^"]*)\">#<!ENTITY % gtkdocentities SYSTEM \"../$1\">#;
+             $doctype_header .= $_;
+         }
+         close(INPUT);
+@@ -2686,6 +2687,8 @@
                 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
  [
    <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
@@ -79,7 +89,7 @@
  ]>
  <book id="index">
  EOF
-@@ -2700,11 +2702,11 @@
+@@ -2700,11 +2703,11 @@
  
  print OUTPUT <<EOF;
    <bookinfo>