Bug 345389: Template-Toolkit 2.15 moved Template::Plugin::GD into a separate package

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk

diff --git a/checksetup.pl b/checksetup.pl
index 2f3307a5ee62cc6d5342d09e6f627c2d66026d32..c4d5252a82567335a3c88c1abbf9efc82d35e05d 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -340,6 +340,7 @@ my %ppm_modules = (
     'GD::Graph'         => 'GDGraph',
     'GD::Text::Align'   => 'GDTextUtil',
     'Mail::Mailer'      => 'MailTools',
+    'Template::Plugin::GD' => 'Template',
 );
 
 sub install_command {
@@ -364,6 +365,7 @@ foreach my $module (@{$modules}) {
 
 print "\nThe following Perl modules are optional:\n" unless $silent;
 my $gd          = have_vers("GD","1.20");
+my $template_gd = have_vers('Template::Plugin::GD::Image', 0);
 my $chartbase   = have_vers("Chart::Base","1.0");
 my $xmlparser   = have_vers("XML::Parser",0);
 my $gdgraph     = have_vers("GD::Graph",0);
@@ -393,7 +395,7 @@ if (!$xmlparser && !$silent) {
           "the XML::Parser module by running (as $::root):\n\n",
     "   " . install_command("XML::Parser") . "\n\n";
 }
-if ((!$gd || !$gdgraph || !$gdtextalign) && !$silent) {
+if ((!$gd || !$gdgraph || !$gdtextalign || !$template_gd) && !$silent) {
     print "If you you want to see graphical bug reports (bar, pie and line ";
     print "charts of \ncurrent data), you should install libgd and the ";
     print "following Perl modules:\n\n";
@@ -402,6 +404,8 @@ if ((!$gd || !$gdgraph || !$gdtextalign) && !$silent) {
         if !$gdgraph;
     print "GD::Text::Align: " . install_command("GD::Text::Align") . "\n"
         if !$gdtextalign;
+    print "Template::Plugin::GD: " . install_command('Template::Plugin::GD')
+          . "\n" if !$template_gd;
     print "\n";
 }
 if (!$patchreader && !$silent) {

diff --git a/docs/xml/modules.xml b/docs/xml/modules.xml
index d031b19c01794730ac3f55c4b5f65f0a7c776d53..f5e2ef564536a6720a8b57e0e7cd631f5f5c86ad 100644 (file)
--- a/docs/xml/modules.xml
+++ b/docs/xml/modules.xml
@@ -179,6 +179,15 @@
       </literallayout>
     </para>
 
+    <para>
+      Template::Plugin::GD:
+      <literallayout>
+       CPAN Download Page: <ulink url="http://search.cpan.org/dist/Template-GD/" />
+       PPM Download Link:  (Just install Template-Toolkit using the instructions below)
+       Documentation: <ulink url="http://www.template-toolkit.org/docs/aqua/Modules/index.html" />
+      </literallayout>
+    </para>
+
     <para>
       MIME::Parser (part of MIME-tools):
       <literallayout>

diff --git a/testserver.pl b/testserver.pl
index b768dc939c698d739b0b97d4e7ba5d685c5bc311..ae9ce6db287cac08b890819eef1dd558d6b66ebe 100755 (executable)
--- a/testserver.pl
+++ b/testserver.pl
@@ -197,6 +197,14 @@ if ($@ eq '') {
             print "TEST-FAILED Chart returned: $@\n";
         }
     }
+
+    eval 'use Template::Plugin::GD::Image';
+    if ($@) {
+        print "TEST-FAILED Template::Plugin::GD is not installed.\n";
+    }
+    else {
+        print "TEST-OK Template::Plugin::GD is installed.\n";
+    }
 }
 
 sub fetch {