urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix graphviz plugin to not try to read images as utf-8; they might 

sometimes contain invalid utf-8 byte sequences. Thanks,
  HenrikBrixAndersen.
master
joey 2007-07-25 02:15:52 +00:00
parent a4b3300fde
commit a7b8e35bf9
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki/Plugin/graphviz.pm
View File

@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
$pid=open2(*IN, *OUT, "$params{prog} -Tpng"); $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
# open2 doesn't respect "use open ':utf8'" # open2 doesn't respect "use open ':utf8'"
binmode (IN, ':utf8');
binmode (OUT, ':utf8'); binmode (OUT, ':utf8');
print OUT $src; print OUT $src;

5
debian/changelog vendored
View File

@ -8,8 +8,11 @@ ikiwiki (2.5) UNRELEASED; urgency=low
it. it.
* Add a htmlext config option, this can be used to make ikiwiki generate * Add a htmlext config option, this can be used to make ikiwiki generate
html files with a different extension. html files with a different extension.
* Fix graphviz plugin to not try to read images as utf-8; they might
sometimes contain invalid utf-8 byte sequences. Thanks,
HenrikBrixAndersen.
-- Joey Hess <joeyh@debian.org> Tue, 24 Jul 2007 21:11:30 -0400 -- Joey Hess <joeyh@debian.org> Tue, 24 Jul 2007 22:14:41 -0400
ikiwiki (2.4) unstable; urgency=low ikiwiki (2.4) unstable; urgency=low

6
doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
View File

@ -3,8 +3,14 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
utf8 "\x89" does not map to Unicode at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 53, <IN> chunk 1. utf8 "\x89" does not map to Unicode at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 53, <IN> chunk 1.
Wide character in subroutine entry at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 68. Wide character in subroutine entry at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 68.
> Ok, will remove the binmode IN then. [[done]] --[[Joey]]
It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script. It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
> You seem to be using an old version of ikiwiki, these preview isues have
> been fixed for some time, and the code doesn't look like what you patch
> in your second hunk. --[[Joey]]
The patch below fixes these two issues. The patch below fixes these two issues.
--- graphviz.pm.orig Thu Jun 7 15:45:16 2007 --- graphviz.pm.orig Thu Jun 7 15:45:16 2007

4
doc/bugs/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
View File

@ -8,6 +8,10 @@ is hard-coded in Makefile.PL.
The patch below makes it possible to install those files to alternative directories The patch below makes it possible to install those files to alternative directories
while the default stays as it is now. while the default stays as it is now.
> It should be possible to use the existing MakeMaker variables such as
> INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not
> adding new variables where MakeMaker already has them. --[[Joey]]
<pre> <pre>
- Introduce two variables, IKI_MANDIR and IKI_W3MCGIDIR, to be set from - Introduce two variables, IKI_MANDIR and IKI_W3MCGIDIR, to be set from