pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Upgrade to fgallery-1.8.2
Module Name: pkgsrc-wip
Committed By: ast <ast%NetBSD.org@localhost>
Pushed By: ast
Date: Fri Jul 15 00:07:24 2016 +0200
Changeset: ee30861f4b94591cb2d33e6cbb99e7237679fb1a
Modified Files:
fgallery/Makefile
fgallery/PLIST
fgallery/distinfo
fgallery/patches/patch-aa
fgallery/patches/patch-ab
fgallery/patches/patch-ac
Removed Files:
fgallery/patches/patch-ad
fgallery/patches/patch-ae
fgallery/patches/patch-af
fgallery/patches/patch-ag
fgallery/patches/patch-ah
Log Message:
Upgrade to fgallery-1.8.2
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee30861f4b94591cb2d33e6cbb99e7237679fb1a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fgallery/Makefile | 4 +-
fgallery/PLIST | 2 +-
fgallery/distinfo | 19 +++-----
fgallery/patches/patch-aa | 120 ++++++++++++++++++++++++++++++++++++++++++++--
fgallery/patches/patch-ab | 21 ++++----
fgallery/patches/patch-ac | 20 ++++----
fgallery/patches/patch-ad | 80 -------------------------------
fgallery/patches/patch-ae | 15 ------
fgallery/patches/patch-af | 19 --------
fgallery/patches/patch-ag | 24 ----------
fgallery/patches/patch-ah | 14 ------
11 files changed, 145 insertions(+), 193 deletions(-)
diffs:
diff --git a/fgallery/Makefile b/fgallery/Makefile
index bb8ce29..809227f 100644
--- a/fgallery/Makefile
+++ b/fgallery/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
PKGBASE= fgallery
-DISTNAME= ${PKGBASE}-1.7
+DISTNAME= ${PKGBASE}-1.8.2
PKGREVISION= 1
CATEGORIES= www
@@ -32,7 +32,7 @@ SUBST_FILES.fix-paths= fgallery
SUBST_SED.fix-paths= -e "s,\"\$$RealBin/,\"${PREFIX}/share/fgallery/,g"
FG_DOCSDIR= share/doc/${PKGBASE}
-FG_DOCS= COPYING NEWS.html NEWS.rst README.html README.rst
+FG_DOCS= COPYING.txt NEWS.html NEWS.rst README.html README.rst
FG_SHAREDIR= share/${PKGBASE}/view
FG_SRCDIR= ${WRKDIR}/${DISTNAME}
FG_VIEWDIR= ${FG_SRCDIR}/view
diff --git a/fgallery/PLIST b/fgallery/PLIST
index 2a0274f..c3853dd 100644
--- a/fgallery/PLIST
+++ b/fgallery/PLIST
@@ -1,6 +1,6 @@
@comment $NetBSD$
bin/fgallery
-share/doc/fgallery/COPYING
+share/doc/fgallery/COPYING.txt
share/doc/fgallery/NEWS.html
share/doc/fgallery/NEWS.rst
share/doc/fgallery/README.html
diff --git a/fgallery/distinfo b/fgallery/distinfo
index eda6a41..6b21739 100644
--- a/fgallery/distinfo
+++ b/fgallery/distinfo
@@ -1,14 +1,9 @@
$NetBSD$
-SHA1 (fgallery-1.7.zip) = 2ca73247e2aebbb682ae6c1f03be24846276c393
-RMD160 (fgallery-1.7.zip) = fface70de739bd020528ae0ec180c0e27a8e5b72
-SHA512 (fgallery-1.7.zip) = 4786baecd809afadc4a4e431a6dd655fdb8b4dcd693dff177e557d7b163a4110b1d0468ad34171fc0d7e050aec85a7437fd7faa7d26203ed7342c7c874d044f0
-Size (fgallery-1.7.zip) = 145719 bytes
-SHA1 (patch-aa) = 783ec3d00952c5994fd151f301c80bd3b178afc4
-SHA1 (patch-ab) = 7fa15a19f5aaa3a2c26b911d3d41017a7830e660
-SHA1 (patch-ac) = c74d52d58e6511b7a612c589bbda1aced19f7af9
-SHA1 (patch-ad) = 13d6859887aeed7c8fe56216ef286eb09eae7f68
-SHA1 (patch-ae) = 83b177e68bfe85c8bb730cd37f721e581d68ead0
-SHA1 (patch-af) = 4b3b300a1e1963bdac453306dece595bee20e894
-SHA1 (patch-ag) = d5049e3fbb9a909a4c3a6cf3970da3ac679789d7
-SHA1 (patch-ah) = 703cd2398d33e8da4fd7911f4a6fb9fbb1c1ae34
+SHA1 (fgallery-1.8.2.zip) = a4164160f9e7d70fe1b135f11e175e8a470a94f2
+RMD160 (fgallery-1.8.2.zip) = 959854b675a813379e78d8e66022dd2f56e30561
+SHA512 (fgallery-1.8.2.zip) = 1e782b86c74b7cafbb61e46f346b2e42dab9cc3133cf8cedef827f916b5eb29316d86a52020305b56a42fa9d6555423b9d5a175dac4446a0f7f5d538beb9311f
+Size (fgallery-1.8.2.zip) = 158562 bytes
+SHA1 (patch-aa) = 36855dc0f88888a5a704b33dcafda551ab3cd806
+SHA1 (patch-ab) = 703cd2398d33e8da4fd7911f4a6fb9fbb1c1ae34
+SHA1 (patch-ac) = 838447749d4cde1836d377a498ffd56ee80e3ec0
diff --git a/fgallery/patches/patch-aa b/fgallery/patches/patch-aa
index 07b458c..3b66057 100644
--- a/fgallery/patches/patch-aa
+++ b/fgallery/patches/patch-aa
@@ -1,14 +1,124 @@
$NetBSD$
-Path to fgallery/view code
+Use a "cmd_exists" for tests of existence of commands in given environment
+Use oct instead of 0### and don't return undef explicitely (Perl::Critic)
---- fgallery.orig 2015-10-03 21:35:52.000000000 +0200
-+++ fgallery 2015-10-03 21:39:40.000000000 +0200
-@@ -20,7 +20,6 @@
- use File::Basename qw{fileparse};
+--- fgallery.orig 2014-09-05 16:33:54.000000000 +0200
++++ fgallery 2015-10-02 11:10:05.000000000 +0200
+@@ -21,7 +21,6 @@
use File::Find qw{find};
use File::Path qw{make_path remove_tree};
+ use File::Spec::Functions qw{rel2abs};
-use FindBin qw{$RealBin};
use Getopt::Long qw{:config bundling};
use IO::Handle;
use Image::ExifTool qw{ImageInfo};
+@@ -38,7 +37,7 @@
+ our $ENCODING = encoding::_get_locale_encoding() || 'UTF-8';
+
+ # defaults
+-my $mode = 0644;
++my $mode = oct(644);
+ my $slim = 0;
+ my $ofile = 0;
+ my $orient = 1;
+@@ -73,6 +72,14 @@
+ }
+
+
++# see if our environment has a given command installed
++sub cmd_exists
++{
++ my ($c) = @_;
++ return qx{/bin/sh -c "command -v $c"};
++}
++
++
+ sub sys
+ {
+ my @cmd = @_;
+@@ -263,7 +270,7 @@
+ sub cap_from_str
+ {
+ my ($title, $desc) = split("\n", shift, 2);
+- return undef if(!$title && !$desc);
++ return unless $title || $desc;
+ my $ret = [cap_clean_title($title), ($desc? cap_clean_desc($desc): '')];
+ return $ret;
+ }
+@@ -399,49 +406,27 @@
+ }
+
+ # check tools
+-if(system("identify -version >/dev/null 2>&1")
+-|| system("convert -version >/dev/null 2>&1")) {
+- fatal("cannot run \"identify\" or \"convert\" (check if ImageMagick is installed)");
+-}
+-if(system("7za -h >/dev/null 2>&1"))
+-{
++fatal 'Missing identify or convert executable (from ImageMagick)'
++ unless cmd_exists('identify') || cmd_exists('convert');
++unless(cmd_exists('7za')) {
+ $p7zip = 0;
+- if(system("zip -h >/dev/null 2>&1")) {
+- fatal("cannot run \"zip\" (check if 7za or zip is installed)");
+- }
+-}
+-if(system("jpegoptim -V >/dev/null 2>&1")) {
+- $jpegoptim = 0;
+-}
+-if(system("pngcrush -h >/dev/null 2>&1")) {
+- $pngoptim = 0;
++ cmd_exists('zip') || fatal('Missing 7z or zip command');
+ }
+-if($facedet && system("facedetect -h >/dev/null 2>&1")) {
+- fatal("cannot run \"facedetect\" (see https://www.thregr.org/~wavexx/software/facedetect/)");
+-}
+-
+-my $tificccmd;
+-if($sRGB)
+-{
+- if(!system("tificc >/dev/null 2>&1")) {
+- $tificccmd = "tificc";
+- } elsif(!system("tificc2 >/dev/null 2>&1")) {
+- $tificccmd = "tificc2";
+- } else {
+- fatal("cannot run \"tificc\" or \"tificc2\" (check if liblcms2-utils is installed)");
+- }
+-}
+-
++$jpegoptim = 0 unless cmd_exists('jpegoptim');
++$pngoptim = 0 unless cmd_exists('pngcrush');
++fatal 'Missing facedetect (see http://www.thregr.org/~wavexx/hacks/facedetect/'
++ if $facedet && !cmd_exists('facedetect');
++fatal 'Missing tificc executable (from lcms2 library)'
++ if $sRGB && !cmd_exists('tificc');
++my $tificccmd = 'tificc';
+ my $exiftrancmd;
+-if($orient)
++while($orient)
+ {
+- if(!system("exiftran -h >/dev/null 2>&1")) {
+- $exiftrancmd = "exiftran -aip";
+- } elsif(!system("exifautotran >/dev/null 2>&1")) {
+- $exiftrancmd = "exifautotran";
+- } else {
+- fatal("cannot execute exiftran or exifautotran for lossless JPEG autorotation");
+- }
++ $exiftrancmd = "exiftran -aip" if cmd_exists('exiftran');
++ last if $exiftrancmd;
++ $exiftrancmd = "exifautotran" if cmd_exists('exifautotran');
++ fatal 'Missing exiftran or exifautotran executable for JPEG autorotation'
++ unless $exiftrancmd;
+ }
+
+ # list available files
+@@ -496,7 +481,7 @@
+
+ my $props = ImageInfo($file, {PrintConv => 0, Sort => 'File'});
+ unless(defined($props) && isin($props->{FileType}, @filetypes)) {
+- return undef;
++ return;
+ }
+
+ # sanitize file name
diff --git a/fgallery/patches/patch-ab b/fgallery/patches/patch-ab
index 9fcb523..ca06b7a 100644
--- a/fgallery/patches/patch-ab
+++ b/fgallery/patches/patch-ab
@@ -1,15 +1,14 @@
$NetBSD$
-Use oct instead of 0### (Perl::Critic)
+Make the (optional) download/date text slightly less conspicuous
---- fgallery.orig 2014-09-05 16:33:54.000000000 +0200
-+++ fgallery 2015-10-02 11:10:05.000000000 +0200
-@@ -29,7 +29,7 @@
- use Time::Piece;
+--- view/index.css.orig 2015-10-28 14:11:00.000000000 +0100
++++ view/index.css 2015-10-28 14:11:35.000000000 +0100
+@@ -105,6 +105,7 @@
+ background: #111; /* IE<9 */
+ background: rgba(0, 0, 0, 0.7);
+ font-family: sans-serif;
++ font-size: 60%;
+ padding: 0.5em;
+ }
- # defaults
--my $mode = 0644;
-+my $mode = oct(644);
- my $slim = 0;
- my $ofile = 0;
- my $orient = 1;
diff --git a/fgallery/patches/patch-ac b/fgallery/patches/patch-ac
index c4e6a28..8858310 100644
--- a/fgallery/patches/patch-ac
+++ b/fgallery/patches/patch-ac
@@ -1,15 +1,15 @@
$NetBSD$
-Don't use subroutine prototypes (Perl::Critic)
+Make the (optional) download/date area slightly less intrusive
---- fgallery.orig 2014-09-05 16:33:54.000000000 +0200
-+++ fgallery 2015-10-02 11:10:05.000000000 +0200
-@@ -86,7 +86,7 @@
+--- view/index.js.orig 2015-10-28 14:10:55.000000000 +0100
++++ view/index.js 2015-10-28 14:14:47.000000000 +0100
+@@ -461,7 +461,7 @@
+ el.inject(ehdr);
+ }
+ if(imgs.data[eidx].date)
+- ehdr.adopt(new Element('span', { 'html': '<b>Date</b>: ' + imgs.data[eidx].date }));
++ ehdr.adopt(new Element('span', { 'html': imgs.data[eidx].date }));
+ ehdr.setStyle('display', (ehdr.children.length? 'block': 'none'));
}
-
--sub any(&@)
-+sub any
- {
- my ($fun, @seq) = @_;
- return (List::Util::first { &$fun() } @seq)? 1: 0;
diff --git a/fgallery/patches/patch-ad b/fgallery/patches/patch-ad
deleted file mode 100644
index bb50ff0..0000000
--- a/fgallery/patches/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-
-Handle discovery/checking of external commands uniformly
-
---- fgallery.orig 2015-10-11 11:16:27.000000000 +0200
-+++ fgallery 2015-10-11 11:11:52.000000000 +0200
-@@ -233,6 +233,12 @@
- return int($value);
- }
-
-+# see if our environment has a given command installed
-+sub cmd_exists
-+{
-+ my ($c) = @_;
-+ return qx{/bin/sh -c "command -v $c"};
-+}
-
- sub print_help()
- {
-@@ -299,41 +305,32 @@
- fatal("output directory already exists, but doesn't look like a template copy");
- }
-
--# check tools
--if(system("identify -version >/dev/null 2>&1")
--|| system("convert -version >/dev/null 2>&1")) {
-- fatal("cannot run \"identify\" or \"convert\" (check if ImageMagick is installed)");
--}
--if(system("7za -h >/dev/null 2>&1"))
--{
-+# check for existence of external commands
-+unless(cmd_exists('7z')) {
- $p7zip = 0;
-- if(system("zip -h >/dev/null 2>&1")) {
-- fatal("cannot run \"zip\" (check if 7za or zip is installed)");
-- }
--}
--if(system("jpegoptim -V >/dev/null 2>&1")) {
-- $jpegoptim = 0;
-+ cmd_exists('zip') || fatal('Missing 7z or zip command');
- }
--if(system("pngcrush -h >/dev/null 2>&1")) {
-- $pngoptim = 0;
--}
--if($facedet && system("facedetect -h >/dev/null 2>&1")) {
-- fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)");
--}
--if($sRGB && system("tificc >/dev/null 2>&1")) {
-- fatal("cannot run \"tificc\" (check if liblcms2-utils is installed)");
--}
--
-+fatal 'Missing identify or convert executable (from ImageMagick)'
-+ unless cmd_exists('identify') || cmd_exists('convert');
-+$jpegoptim = 0 unless cmd_exists('jpegoptim');
-+$pngoptim = 0 unless cmd_exists('pngcrush');
-+fatal 'Missing facedetect (see http://www.thregr.org/~wavexx/hacks/facedetect/'
-+ if $facedet && !cmd_exists('facedetect');
-+fatal 'Missing tificc executable (from lcms2 library)'
-+ if $sRGB && !cmd_exists('tificc');
- my $exiftrancmd;
--if($orient)
-+while($orient)
- {
-- if(!system("exiftran -h >/dev/null 2>&1")) {
-+ if(cmd_exists('exiftran')) {
- $exiftrancmd = "exiftran -aip";
-- } elsif(!system("exifautotran >/dev/null 2>&1")) {
-+ last;
-+ }
-+ if(cmd_exists('exifautotran')) {
- $exiftrancmd = "exifautotran";
-- } else {
-- fatal("cannot execute exiftran or exifautotran for lossless JPEG autorotation");
-+ last;
- }
-+ fatal 'Missing exiftran or exifautotran executable for JPEG autorotation'
-+ unless $exiftrancmd;
- }
-
- # list available files
diff --git a/fgallery/patches/patch-ae b/fgallery/patches/patch-ae
deleted file mode 100644
index c73cbeb..0000000
--- a/fgallery/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Pass a code ref to subroutine "any" as expected
-
---- fgallery.orig 2014-09-05 16:33:54.000000000 +0200
-+++ fgallery 2015-10-02 11:10:05.000000000 +0200
-@@ -349,7 +354,7 @@
- my (undef, undef, $suffix) = fileparse($file, qr/\.[^.]*$/);
- return if(length($suffix) < 2);
- $suffix = lc(substr($suffix, 1));
-- if(any { $_ eq $suffix } @exts) {
-+ if(any(sub {$_ eq $suffix},@exts)) {
- push(@files, $file);
- }
- }
diff --git a/fgallery/patches/patch-af b/fgallery/patches/patch-af
deleted file mode 100644
index 1194169..0000000
--- a/fgallery/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Don't use bare variable for filehandle
-
---- fgallery.orig 2014-09-05 16:33:54.000000000 +0200
-+++ fgallery 2015-10-02 11:10:05.000000000 +0200
-@@ -680,8 +685,9 @@
- push(@{$json{data}}, \%data);
- }
-
--open(JSON, ">$out/data.json");
--print(JSON encode_json(\%json));
--close(JSON);
-+my $JSON;
-+open($JSON, '>', "$out/data.json");
-+print($JSON encode_json(\%json));
-+close($JSON);
-
- print("completed\n");
diff --git a/fgallery/patches/patch-ag b/fgallery/patches/patch-ag
deleted file mode 100644
index 76c1a4d..0000000
--- a/fgallery/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Make the (optional) download/date area slightly less intrusive
-
---- view/index.js.orig 2015-10-28 14:10:55.000000000 +0100
-+++ view/index.js 2015-10-28 14:14:47.000000000 +0100
-@@ -5,7 +5,7 @@
- var padding = 22;
- var duration = 500;
- var thrdelay = 1500;
--var hidedelay = 3000;
-+var hidedelay = 2000;
- var prefetch = 1;
- var minupscale = 640 * 480;
- var thumbrt = 16/9 - 5/3;
-@@ -286,7 +286,7 @@
- if(imgs.download)
- dsc.push("<a title=\"Download album\" href=\"" + encodeURI(imgs.download) + "\"><img src=\"download.png\"/></a>");
- if(imgs.data[eidx].date)
-- dsc.push("<b>Date</b>: " + imgs.data[eidx].date);
-+ dsc.push(imgs.data[eidx].date);
- ehdr.set('html', dsc.join(' '));
- ehdr.setStyle('display', (dsc.length? 'block': 'none'));
-
diff --git a/fgallery/patches/patch-ah b/fgallery/patches/patch-ah
deleted file mode 100644
index ca06b7a..0000000
--- a/fgallery/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Make the (optional) download/date text slightly less conspicuous
-
---- view/index.css.orig 2015-10-28 14:11:00.000000000 +0100
-+++ view/index.css 2015-10-28 14:11:35.000000000 +0100
-@@ -105,6 +105,7 @@
- background: #111; /* IE<9 */
- background: rgba(0, 0, 0, 0.7);
- font-family: sans-serif;
-+ font-size: 60%;
- padding: 0.5em;
- }
-
Home |
Main Index |
Thread Index |
Old Index