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 7794e2123f0398ff9f35e60357b86ed0056930df..5780d06d547e71fe871bacd790b528dddc8a313d 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -354,6 +354,7 @@ my %ppm_modules = (
     'Mail::Mailer'      => 'MailTools',
     'Mail::Base64'      => 'MIME-Base64',
     'MIME::Tools'       => 'MIME-Tools',
+    'Template::Plugin::GD' => 'Template',
 );
 
 sub install_command {
@@ -378,6 +379,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::Twig",0);
 my $gdgraph     = have_vers("GD::Graph",0);
@@ -416,7 +418,7 @@ if (!$imagemagick && !$silent) {
     "   " . install_command("Image::Magick") . "\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";
@@ -425,6 +427,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 151358cbd473eb16ec0c2159587d44a6fd15ae79..8e2df5999cbba5ff1e559fd1032b94d51e4607a1 100644 (file)
--- a/docs/xml/modules.xml
+++ b/docs/xml/modules.xml
@@ -148,6 +148,16 @@
       </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::Base64:
       <literallayout>

diff --git a/testserver.pl b/testserver.pl
index 0d1d08ba5878d9a9c8b139bea77a88159b6977d6..87c6c08020aa447e703783bda75e68d347361cbc 100755 (executable)
--- a/testserver.pl
+++ b/testserver.pl
@@ -194,6 +194,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 {