Package: doxygen
Version: 1.7.4-3
Severity: normal
Tags: upstream patch

Due to incorrect handling of the generated svg file name, the following
error message is output and the dot graph does not show in the html:

Failed to rename file
/home/bill/src/qf/quakeforge/o.o/doc/doxygen/html/inline_dotgraph_1.dot.svg
to
/home/bill/src/qf/quakeforge/o.o/doc/doxygen/html/inline_dotgraph_1.dot.svg.tmp!

The following patch fixes the problem. Rather than using inFile to
calculate the name of the svg file name, outDir and baseName are used.
Also, baseName rathern than inFile is needed for writeSVGFigureLink().

diff -ur doxygen-1.7.4/src/dot.cpp doxygen-1.7.4-fixed/src/dot.cpp
--- doxygen-1.7.4/src/dot.cpp   2011-03-23 06:50:53.000000000 +0900
+++ doxygen-1.7.4-fixed/src/dot.cpp     2011-07-26 10:49:23.000000000
+0900
@@ -3571,8 +3587,10 @@
 
   if (imgExt=="svg") // vector graphics
   {
-    writeSVGFigureLink(t,relPath,inFile,inFile+".svg");
-    DotFilePatcher patcher(inFile+".svg");
+    QCString svgName=outDir+'/'+baseName;
+    svgName.append(".svg");
+    writeSVGFigureLink(t,relPath,baseName,svgName);
+    DotFilePatcher patcher(svgName);
     patcher.addSVGConversion(relPath,TRUE,context);
     patcher.run();
   }


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39 (PREEMPT)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages doxygen depends on:
ii  libc6                         2.13-10    Embedded GNU C Library: Shared lib
ii  libgcc1                       1:4.6.1-5  GCC support library
ii  libstdc++6                    4.6.1-5    GNU Standard C++ Library v3

Versions of packages doxygen recommends:
ii  doxygen-latex                 1.7.4-3    Documentation system for C, C++, J

Versions of packages doxygen suggests:
pn  doxygen-doc                   <none>     (no description available)
pn  doxygen-gui                   <none>     (no description available)
ii  graphviz                      2.26.3-7   rich set of graph drawing tools

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to