From 18730954841ce6aecdbcf08f232960e19708f753 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 7 Aug 2011 11:01:41 -0400 Subject: [PATCH] Put in a workaround for #622591, by ensuring Search::Xapian gets loaded before Image::Magick. --- IkiWiki/Plugin/search.pm | 2 ++ debian/changelog | 2 ++ 2 files changed, 4 insertions(+) diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index ab7c0eebb..8138cd67f 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -15,6 +15,8 @@ sub import { hook(type => "cgi", id => "search", call => \&cgi); hook(type => "disable", id => "search", call => \&disable); hook(type => "needsbuild", id => "search", call => \&needsbuild); + + eval q{ use Search::Xapian }; # load early to work around #622591 } sub getsetup () { diff --git a/debian/changelog b/debian/changelog index fb1be285b..da0a04ac4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low * Fix escaping of html entities in permalinks. * Fix escaping of html entities in tag names. * Avoid using named capture groups in heredoc code for oldperl compatability. + * Put in a workaround for #622591, by ensuring Search::Xapian gets loaded + before Image::Magick. -- Joey Hess Tue, 19 Jul 2011 11:22:52 -0400 -- 2.32.0.93.g670b81a890