[freeside-commits] branch FREESIDE_4_BRANCH updated. 4ff0725a89f9bc8678c046648ebd803fbd82f740

Ivan Kohler ivan at freeside.biz
Tue May 31 15:16:45 PDT 2022


The branch, FREESIDE_4_BRANCH has been updated
       via  4ff0725a89f9bc8678c046648ebd803fbd82f740 (commit)
      from  7e5fce86f887975d57029e28511100e511d1bdb9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ff0725a89f9bc8678c046648ebd803fbd82f740
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 31 15:16:44 2022 -0700

    explicit dep on PDF::WebKit

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 0a16724a8..33e150ae3 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -11,6 +11,7 @@ use FS::cust_msg;
 use FS::template_content;
 
 use Date::Format qw(time2str);
+use PDF::WebKit;
 
 FS::UID->install_callback( sub { $conf = new FS::Conf; } );
 
@@ -411,8 +412,6 @@ Options are as for 'prepare', but 'from' and 'to' are meaningless.
 
 sub render {
   my $self = shift;
-  eval "use PDF::WebKit";
-  die $@ if $@;
   my %opt = @_;
   my %hash = $self->prepare(%opt);
   my $html = $hash{'html_body'};
diff --git a/debian/control b/debian/control
index 61e7da3ae..7fe36e1d4 100644
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,
  libspreadsheet-parsexlsx-perl, libunicode-truncate-perl (>= 0.303-1),
  libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl,
  liblocale-codes-perl, liblocale-po-perl, libgeo-uscensus-geocoding-perl,
- libnet-sftp-foreign-perl
+ libnet-sftp-foreign-perl, libpdf-webkit-perl
 Conflicts: libparams-classify-perl (>= 0.013-6)
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/msg_template.pm | 3 +--
 debian/control        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list