<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bfb4a615350294e4d209790eb30da596ef66b873">https://github.com/macports/macports-ports/commit/bfb4a615350294e4d209790eb30da596ef66b873</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bfb4a61 imageindex: change to use perl 5.26; add Debian's patches
</span>bfb4a61 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfb4a615350294e4d209790eb30da596ef66b873
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Fri Nov 10 09:44:31 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> imageindex: change to use perl 5.26; add Debian's patches
</span>---
graphics/imageindex/Portfile | 11 ++-
graphics/imageindex/files/fix-dotfiles.patch | 44 +++++++++
graphics/imageindex/files/fix-javascript.patch | 13 +++
graphics/imageindex/files/fix_deprecated.patch | 106 +++++++++++++++++++++
.../files/make-charset-configurable-pod.patch | 16 ++++
.../files/make-charset-configurable.patch | 52 ++++++++++
6 files changed, 239 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/Portfile b/graphics/imageindex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 482331e..69e11f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/imageindex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup perl5 1.0
</span> name imageindex
version 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
supported_archs noarch
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +22,17 @@ master_sites http://www.edwinh.org/imageindex/release/
</span> checksums rmd160 cffde483a8dddcef7f415c38b8ee3a9487444ecb \
sha256 78f3d92a334e9b8a970cb07a452eb19485f3971485a3c400b4a680007964f66c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26
</span>
depends_lib port:p${perl5.major}-perlmagick
depends_run port:p${perl5.major}-image-info
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-imageindex.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.post_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix-dotfiles.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make-charset-configurable-pod.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-javascript.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make-charset-configurable.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_deprecated.patch
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/files/fix-dotfiles.patch b/graphics/imageindex/files/fix-dotfiles.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a3fa291
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/files/fix-dotfiles.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix Processing of dotfiles, see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=492934
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -611,10 +611,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (defined($prev)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($name,$path,$suffix);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($name,$path,$suffix) = fileparse($prev,'\.\S+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($name,$path,$suffix) = fileparse($prev,'\.[^.]+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $back{$pathname} = "$name.html";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($name,$path,$suffix) = fileparse($pathname,'\.\S+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($name,$path,$suffix) = fileparse($pathname,'\.[^.]+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $forward{$prev} = "$name.html";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $prev = $pathname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1848,7 +1848,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $info{$pathname}{'format'} = $info{$pathname}{'video_format'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my ($name,$path,$suffix) = fileparse($filename,'\.\S+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my ($name,$path,$suffix) = fileparse($filename,'\.[^.]+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (-e "${name}.txt") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1942,7 +1942,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $info{$pathname}{'comment'} = $image->Get('comment');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my ($name,$path,$suffix) = fileparse($filename,'\.\S+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my ($name,$path,$suffix) = fileparse($filename,'\.[^.]+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($info{$pathname}{'format'} =~ /JFIF/i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2783,7 +2783,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $ctime,$blksize,$blocks) = stat($file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $posix_mtime = POSIX::strftime ("%Y%m%d%H%M.%S",localtime($mtime));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my ($name,$path,$suffix) = fileparse($file,'\.\S+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my ($name,$path,$suffix) = fileparse($file,'\.[^.]+');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $thumb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $medium;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/files/fix-javascript.patch b/graphics/imageindex/files/fix-javascript.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f763f9a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/files/fix-javascript.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix SCRIPT Tag, see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=322552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2325,7 +2325,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<BODY>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Break out of frames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "<SCRIPT TYPE=\"textvascript\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "<SCRIPT TYPE=\"text/javascript\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "if (parent.frames.length > 0) {\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " parent.location.href = self.document.location\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "}\n";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/files/fix_deprecated.patch b/graphics/imageindex/files/fix_deprecated.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6cf2ebf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/files/fix_deprecated.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,106 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Kevin Oberman rkoberman at gmail.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: Tue Mar 4 04:44:42 UTC 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: https://lists.freebsd.org/pipermail/freebsd-ports/2014-March/090447.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Adapt to perl 5.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,7 +329,7 @@ use File::Basename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use File::Copy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use English;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use Carp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-require 'flush.pl';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use IO::Handle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to shut up -w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use vars qw($opt_recurse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -527,7 +527,7 @@ my $mplayer_prog = &find_in_path ('mplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "Extracting image info";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my $file (@files) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1712,7 +1712,7 @@ sub extract_file_info {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # at the user so that the video regexp might be adjusted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($retval == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "\nwarning: $pathname identified by extension as video file but mplayer doesn't recognize it\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &extract_image_info ($filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1735,15 +1735,15 @@ sub extract_movie_info {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($arate, $anch, $length, $is_video);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ".";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($mplayer_prog eq '' || ($do_video_files == 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (($do_video_files != 0) && $mplayer_prog eq '') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "\nwarning: Trying to process video files but cannot find mplayer in \$path!\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "\nSkipping $pathname";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $object_counter++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1897,14 +1897,14 @@ sub extract_image_info {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ".";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $retval = $image->Read($pathname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($retval ne "") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "\nSkipping $pathname";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flush (STDOUT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STDOUT->flush();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $object_counter++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2302,7 +2302,7 @@ sub page_header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (defined($lastdate)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<META NAME=\"$enddatemetatag\" CONTENT=\"$lastdate\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!defined ($opt_includeall) && defined (@opt_exclude) && scalar (@opt_exclude)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!defined ($opt_includeall) && @opt_exclude && scalar (@opt_exclude)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $tmp = join (',', @opt_exclude);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $etmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2315,7 +2315,7 @@ sub page_header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"$numimagesmetatag\" CONTENT=\"%d\">\n", $image_counter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (defined (@opt_skipmont) && scalar (@opt_skipmont)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( @opt_skipmont && scalar (@opt_skipmont)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $tmp = join (',', @opt_skipmont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"$skipmetatag\" CONTENT=\"%s\">\n", $tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2479,7 +2479,7 @@ sub exclude_files {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # then process. Check to see if any of the -skipmont options were given as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # strings of filenames concatenated with ',' characters. If so, support it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (defined (@opt_skipmont)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (@opt_skipmont) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach (@opt_skipmont) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (@tokens) = split (/,/, $_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach $token (@tokens) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2503,7 +2503,7 @@ sub exclude_files {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # then process. Check to see if any of the -exclude options were given as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # strings of filenames concatenated with ',' characters. If so, support it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (defined (@opt_exclude)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (@opt_exclude) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -includeall takes priority over -exclude on the commandline if they are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # used together (wierd, but ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/files/make-charset-configurable-pod.patch b/graphics/imageindex/files/make-charset-configurable-pod.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0153777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/files/make-charset-configurable-pod.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Make default charset configuratble.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/imageindex.pod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/imageindex.pod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,6 +456,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $montagetitle = "%n images %b through %e";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Control which charset the generated html pages should have. This defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++to UTF-8, but can either be ISO-8859-1 or any other encoding:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $file_charset = "ISO-8859-1";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The following eight variables control how dates and times are formatted when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ written into the HTML. Again we're using printf(1)-like variables where codes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ are interpolated according to a user's taste.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/imageindex/files/make-charset-configurable.patch b/graphics/imageindex/files/make-charset-configurable.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b7e7ed0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/imageindex/files/make-charset-configurable.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Make default charset used configurable, set to UTF-8, see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=322552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/imageindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,6 +290,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $thumbxmetatag = 'ThumbnailX';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $thumbymetatag = 'ThumbnailY';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# which charset to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#$file_charset = 'ISO-8859-1';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$file_charset = 'UTF-8';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Any of the above can be overridden in an rc file in the user's home dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $rcfile = "$ENV{'HOME'}/.imageindexrc";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1430,7 +1434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<HEAD>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $verstring = &versionstring();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"GENERATOR\" CONTENT=\"imageindex %s\">\n", $verstring);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=ISO-8859-1\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${file_charset}\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<TITLE>$current_titletext - $filename</TITLE>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<LINK TYPE=\"text/css\" REL=\"stylesheet\" HREF=\"../$stylefile\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "</HEAD>\n<BODY>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2276,7 +2280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<HEAD>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $verstring = &versionstring();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"GENERATOR\" CONTENT=\"imageindex %s\">\n", $verstring);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=ISO-8859-1\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${file_charset}\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (defined ($write_meta_tag{$titlemetatag})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<META NAME=\"$titlemetatag\" CONTENT=\"$current_titletext\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2628,7 +2632,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<HEAD>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $verstring = &versionstring();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"GENERATOR\" CONTENT=\"imageindex %s\">\n", $verstring);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=ISO-8859-1\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${file_charset}\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<LINK TYPE=\"text/css\" REL=\"stylesheet\" HREF=\"../$stylefile\">";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<TITLE>$current_titletext</TITLE>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<LINK TYPE=\"text/css\" REL=\"stylesheet\" HREF=\"../$stylefile\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2658,7 +2662,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<HEAD>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $verstring = &versionstring();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf ("<META NAME=\"GENERATOR\" CONTENT=\"imageindex %s\">\n", $verstring);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=ISO-8859-1\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf ("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${file_charset}\">\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<LINK TYPE=\"text/css\" REL=\"stylesheet\" HREF=\"../$stylefile\">\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "<TITLE>$current_titletext</TITLE>\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "</HEAD>\n<BODY>\n";
</span></pre><pre style='margin:0'>
</pre>