summaryrefslogtreecommitdiff
path: root/irfanview
diff options
context:
space:
mode:
Diffstat (limited to 'irfanview')
-rw-r--r--irfanview/README.md4
-rwxr-xr-xirfanview/debian/bin/irfanview-common24
-rw-r--r--irfanview/debian/changelog43
-rw-r--r--irfanview/debian/compat2
-rw-r--r--irfanview/debian/control8
-rw-r--r--irfanview/debian/irfanview-bin32.lintian-overrides4
-rw-r--r--irfanview/debian/irfanview-bin32.manpages1
-rw-r--r--irfanview/debian/irfanview-bin64.lintian-overrides4
-rw-r--r--irfanview/debian/irfanview-bin64.manpages1
-rw-r--r--irfanview/debian/irfanview-common.lintian-overrides4
-rw-r--r--irfanview/debian/irfanview32.1.txt23
-rw-r--r--irfanview/debian/irfanview64.1.txt23
-rwxr-xr-xirfanview/debian/rules6
-rw-r--r--irfanview/debian/source/lintian-overrides5
-rwxr-xr-xirfanview/irfanview-common24
-rw-r--r--irfanview/irfanview.spec13
16 files changed, 162 insertions, 27 deletions
diff --git a/irfanview/README.md b/irfanview/README.md
index 9e8490e..9bf21ce 100644
--- a/irfanview/README.md
+++ b/irfanview/README.md
@@ -11,7 +11,7 @@ At least one distro does package Irfanview:
# Reverse dependency matrix
Distro | Irfanview version
--------- | -----------------
-all | 4.53
+all | 4.54
-# Differences from upstream
+# Differences from upstream packaging
None
diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common
index 6c178fc..9dcb4b0 100755
--- a/irfanview/debian/bin/irfanview-common
+++ b/irfanview/debian/bin/irfanview-common
@@ -11,6 +11,8 @@
# 2019-06-16 remove DEVTTY in favor of just showing on current tty
# 2019-06-16 replace winepath call with wine $WINEPATH_BIN
# 2019-06-16 split into package-arch-specific and common scripts
+# 2020-05-20 handle multiple filenames correctly now, including removing \r from winepath output
+# 2020-07-14 use echo binary instead of shell builtin
# Usage:
# called from irfanview (which is symlink to irfanview32 or ifanview64)
# Do not use this by itself.
@@ -24,7 +26,8 @@ then
false
else
-IV_VERSION="2019-06-16b"
+IV_VERSION="2020-07-14a"
+echobin="$( which echo )"
# Define functions
expandword() {
@@ -32,7 +35,7 @@ expandword() {
# if file, add it
# if directory, expand it
# if tarball, extract it and operate on the directory like normal
- local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )"
+ local _word="$( ${echobin} "${@}" | sed -e 'sF\/\/F\/Fg;' )"
if test -d "${_word}";
then
# loop through all files in the directory
@@ -47,22 +50,23 @@ expandword() {
*.tgz|*.tar.gz)
# extract it and expand the temporary directory
_tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
- echo "tmpdir ${_tmpdir}"
+ ${echobin} "tmpdir ${_tmpdir}"
tar -zx -C "${_tmpdir}" -f "${_word}"
expandword "${_tmpdir}"
;;
*.zip)
_tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
- echo "tmpdir ${_tmpdir}"
- echo "7za e -w${_tmpdir} ${_word}"
+ ${echobin} "tmpdir ${_tmpdir}"
+ ${echobin} "7za e -w${_tmpdir} ${_word}"
( cd "${_tmpdir}" ; 7za e "${_word}" ; )
expandword "${_tmpdir}"
;;
*)
# assume it is readable and add it to list of files to open
- echo "File ${_word}"
+ ${echobin} "File:1 ${_word}"
thisfile="$( getwinepath "${_word}" )"
- irfanfiles="${irfanfiles} ${thisfile}"
+ ${echobin} "File:2 ${thisfile}"
+ irfanfiles="${irfanfiles} '${thisfile}'"
;;
esac
fi
@@ -84,12 +88,12 @@ for word in "${@}";
do
expandword "${word}"
done
-irfanfiles="${irfanfiles## }"
+irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )"
# run wine
cd $WINEPREFIX
-printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
-wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
+eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" &
wait %1
for thistempdir in ${alltempdirs};
diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog
index 764161e..29fede5 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,3 +1,46 @@
+irfanview (4.54-3+devuan) obs; urgency=low
+
+ - Improve filename handling again
+
+ -- B Stack <bgstack15@gmail.com> Tue, 14 Jul 2020 11:13:27 -0400
+
+irfanview (4.54-2+devuan) obs; urgency=low
+
+ - Improve filename handling
+
+ -- B Stack <bgstack15@gmail.com> Thu, 18 Jun 2020 08:40:27 -0400
+
+irfanview (4.54-1+devuan) obs; urgency=medium
+
+ - Version 4.54 Release date: 2019-12-12
+ * Multiple Undo/Redo steps added (max. 20 steps, Properties->Editing)
+ * Zoom magnifier added to fullscreen mode
+ * Option to disable Zoom magnifier (Properties->Viewing)
+ * Profiles option added to Print dialog
+ * New option in Properties->Fullscreen: Set horizontal and/or vertical centering
+ * New option in Print dialog: Set horizontal and/or vertical centering
+ * Option to set selection border thickness (Properties->Editing)
+ * Option to enable/disable PlugIns (Help->Installed PlugIns)
+ * Extended sidecar files option: Copy/Move possible (Properties->File Handling)
+ * New Canvas dialog option/method: Set aspect ratio
+ * New option in Watch/Hot Folder dialog: Watch subfolders
+ * Support for CR3 files (preview only, add CR3 to extensions list in: Properties->Extensions->Load custom types)
+ * New Lossless JPG Dialog option: Add (or Replace) ICC color profile
+ * New Thumbnails option: Keep focus in folder tree (after folder change/click)
+ * Option to show Color Corrections dialog in dark mode
+ * Fix in Metadata PlugIn (crash with bad EXIF tag in CR2 files; KVE-2019-1184)
+ * BMP loading bug fixed (thanks to Joshua Faust, CVE-2019-16887)
+ * JP2 PlugIn loading bug fixed (thanks to Linhlhq)
+ * ANI PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17252)
+ * RAS PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17251)
+ * EXR PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17255)
+ * DPX PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17256)
+ * WSQ PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17250)
+ * JLS PlugIn loading bug fixed (thanks to Linhlhq, CVE-2019-17253)
+ * Several PlugIns are changed/updated, please install the newest versions:
+
+ -- B Stack <bgstack15@gmail.com> Thu, 18 Dec 2019 09:20:59 -0500
+
irfanview (4.53-2+devuan) manual; urgency=medium
* The architecture of the invocation script has been split into common and arch-specific.
diff --git a/irfanview/debian/compat b/irfanview/debian/compat
index b4de394..48082f7 100644
--- a/irfanview/debian/compat
+++ b/irfanview/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/irfanview/debian/control b/irfanview/debian/control
index 0070ef4..5b8950c 100644
--- a/irfanview/debian/control
+++ b/irfanview/debian/control
@@ -2,9 +2,12 @@ Source: irfanview
Section: graphics
Priority: optional
Maintainer: B Stack <bgstack15@gmail.com>
-Build-Depends: debhelper (>=11~),
+Build-Depends: debhelper (>=12~),
+# bgscripts for txtman-wrapper
+ bgscripts-core (>=1.5.0),
imagemagick,
- librsvg2-bin
+ librsvg2-bin,
+ txt2man
Standards-Version: 4.1.4
Homepage: https://irfanview.info/
@@ -33,6 +36,7 @@ Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends},
wine64 | wine-staging | winehq | winehq-staging | wine-stable,
irfanview-common
+Suggests: xchm
Provides: irfanview, x-graphics-viewer
Description: graphics viewer from a non-free OS
The 64-bit release
diff --git a/irfanview/debian/irfanview-bin32.lintian-overrides b/irfanview/debian/irfanview-bin32.lintian-overrides
new file mode 100644
index 0000000..62aa1bd
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.lintian-overrides
@@ -0,0 +1,4 @@
+copyright-has-url-from-dh_make-boilerplate
+copyright-without-copyright-notice
+file-in-usr-marked-as-conffile usr/share/irfanview32/i_view32.ini
+non-standard-file-perm usr/share/irfanview32/i_view32.ini *
diff --git a/irfanview/debian/irfanview-bin32.manpages b/irfanview/debian/irfanview-bin32.manpages
new file mode 100644
index 0000000..fd31f1b
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.manpages
@@ -0,0 +1 @@
+debian/irfanview-bin32/usr/share/man/man1/*
diff --git a/irfanview/debian/irfanview-bin64.lintian-overrides b/irfanview/debian/irfanview-bin64.lintian-overrides
new file mode 100644
index 0000000..0bae588
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.lintian-overrides
@@ -0,0 +1,4 @@
+copyright-has-url-from-dh_make-boilerplate
+copyright-without-copyright-notice
+file-in-usr-marked-as-conffile usr/share/irfanview64/i_view64.ini
+non-standard-file-perm usr/share/irfanview64/i_view64.ini *
diff --git a/irfanview/debian/irfanview-bin64.manpages b/irfanview/debian/irfanview-bin64.manpages
new file mode 100644
index 0000000..ba0ebda
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.manpages
@@ -0,0 +1 @@
+debian/irfanview-bin64/usr/share/man/man1/*
diff --git a/irfanview/debian/irfanview-common.lintian-overrides b/irfanview/debian/irfanview-common.lintian-overrides
new file mode 100644
index 0000000..d5a5720
--- /dev/null
+++ b/irfanview/debian/irfanview-common.lintian-overrides
@@ -0,0 +1,4 @@
+binary-without-manpage
+copyright-has-url-from-dh_make-boilerplate
+copyright-without-copyright-notice
+desktop-command-not-in-package
diff --git a/irfanview/debian/irfanview32.1.txt b/irfanview/debian/irfanview32.1.txt
new file mode 100644
index 0000000..f2193da
--- /dev/null
+++ b/irfanview/debian/irfanview32.1.txt
@@ -0,0 +1,23 @@
+title irfanview-bin32
+section 1
+project irfanview
+volume General Commands Manual
+date June 2020
+=====
+NAME
+ irfanview-bin32 - graphics viewer that runs via wine, 32-bit version
+SYNOPSIS
+ irfanview [FILE1 [FILE2...]]
+DESCRIPTION
+ Run a graphics viewer from a non-free operating system.
+ENVIRONMENT
+* IV_WINEPREFIX = ~/.wine
+* IV_EXEC_PATH = /usr/share/irfanview32/i_view32.exe
+AUTHOR
+ bgstack15@gmail.com
+COPYRIGHT
+ CC-BY-SA 4.0
+BUGS
+ The invocation of i_view32.exe with filenames can get messed up, usually due to spaces.
+SEE ALSO
+ `/usr/share/irfanview32/i_view32.chm`
diff --git a/irfanview/debian/irfanview64.1.txt b/irfanview/debian/irfanview64.1.txt
new file mode 100644
index 0000000..6d93e63
--- /dev/null
+++ b/irfanview/debian/irfanview64.1.txt
@@ -0,0 +1,23 @@
+title irfanview-bin64
+section 1
+project irfanview
+volume General Commands Manual
+date June 2020
+=====
+NAME
+ irfanview-bin64 - graphics viewer that runs via wine, 64-bit version
+SYNOPSIS
+ irfanview [FILE1 [FILE2...]]
+DESCRIPTION
+ Run a graphics viewer from a non-free operating system.
+ENVIRONMENT
+* IV_WINEPREFIX = ~/.wine
+* IV_EXEC_PATH = /usr/share/irfanview64/i_view64.exe
+AUTHOR
+ bgstack15@gmail.com
+COPYRIGHT
+ CC-BY-SA 4.0
+BUGS
+ The invocation of i_view64.exe with filenames can get messed up, usually due to spaces.
+SEE ALSO
+ `/usr/share/irfanview64/i_view32.chm`
diff --git a/irfanview/debian/rules b/irfanview/debian/rules
index c05c160..32f82d8 100755
--- a/irfanview/debian/rules
+++ b/irfanview/debian/rules
@@ -7,6 +7,7 @@
export _prefix=/usr
export _datadir="${_prefix}/share"
+export _mandir="${_datadir}/man"
export appname=irfanview
export appname_32=irfanview-bin32
export appname_64=irfanview-bin64
@@ -53,6 +54,11 @@ override_dh_auto_install:
cp -p irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps/${appname}.svg
rm -f ./irfanview-circle.svg || :
+ @# man pages
+ mkdir -p ${buildroot_32}/${_mandir}/man1 ${buildroot_64}/${_mandir}/man1
+ txt2man-wrapper - < ${debuilddir}/irfanview32.1.txt | gzip > ${buildroot_32}/${_mandir}/man1/irfanview32.1.gz
+ txt2man-wrapper - < ${debuilddir}/irfanview64.1.txt | gzip > ${buildroot_64}/${_mandir}/man1/irfanview64.1.gz
+
override_dh_auto_clean:
dh_auto_clean
rm -rf ./irfanview-circle.svg || :
diff --git a/irfanview/debian/source/lintian-overrides b/irfanview/debian/source/lintian-overrides
new file mode 100644
index 0000000..999c2a5
--- /dev/null
+++ b/irfanview/debian/source/lintian-overrides
@@ -0,0 +1,5 @@
+file-without-copyright-information
+maintainer-script-lacks-debhelper-token
+missing-license-paragraph-in-dep5-copyright
+source-contains-prebuilt-ms-help-file
+source-contains-prebuilt-windows-binary
diff --git a/irfanview/irfanview-common b/irfanview/irfanview-common
index 6c178fc..9dcb4b0 100755
--- a/irfanview/irfanview-common
+++ b/irfanview/irfanview-common
@@ -11,6 +11,8 @@
# 2019-06-16 remove DEVTTY in favor of just showing on current tty
# 2019-06-16 replace winepath call with wine $WINEPATH_BIN
# 2019-06-16 split into package-arch-specific and common scripts
+# 2020-05-20 handle multiple filenames correctly now, including removing \r from winepath output
+# 2020-07-14 use echo binary instead of shell builtin
# Usage:
# called from irfanview (which is symlink to irfanview32 or ifanview64)
# Do not use this by itself.
@@ -24,7 +26,8 @@ then
false
else
-IV_VERSION="2019-06-16b"
+IV_VERSION="2020-07-14a"
+echobin="$( which echo )"
# Define functions
expandword() {
@@ -32,7 +35,7 @@ expandword() {
# if file, add it
# if directory, expand it
# if tarball, extract it and operate on the directory like normal
- local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )"
+ local _word="$( ${echobin} "${@}" | sed -e 'sF\/\/F\/Fg;' )"
if test -d "${_word}";
then
# loop through all files in the directory
@@ -47,22 +50,23 @@ expandword() {
*.tgz|*.tar.gz)
# extract it and expand the temporary directory
_tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
- echo "tmpdir ${_tmpdir}"
+ ${echobin} "tmpdir ${_tmpdir}"
tar -zx -C "${_tmpdir}" -f "${_word}"
expandword "${_tmpdir}"
;;
*.zip)
_tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
- echo "tmpdir ${_tmpdir}"
- echo "7za e -w${_tmpdir} ${_word}"
+ ${echobin} "tmpdir ${_tmpdir}"
+ ${echobin} "7za e -w${_tmpdir} ${_word}"
( cd "${_tmpdir}" ; 7za e "${_word}" ; )
expandword "${_tmpdir}"
;;
*)
# assume it is readable and add it to list of files to open
- echo "File ${_word}"
+ ${echobin} "File:1 ${_word}"
thisfile="$( getwinepath "${_word}" )"
- irfanfiles="${irfanfiles} ${thisfile}"
+ ${echobin} "File:2 ${thisfile}"
+ irfanfiles="${irfanfiles} '${thisfile}'"
;;
esac
fi
@@ -84,12 +88,12 @@ for word in "${@}";
do
expandword "${word}"
done
-irfanfiles="${irfanfiles## }"
+irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )"
# run wine
cd $WINEPREFIX
-printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
-wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
+eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" &
wait %1
for thistempdir in ${alltempdirs};
diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec
index caf711e..85c2cdf 100644
--- a/irfanview/irfanview.spec
+++ b/irfanview/irfanview.spec
@@ -5,8 +5,8 @@
#global upstream_url http://www.irfanview.info/files
Name: irfanview
-Version: 4.53
-Release: 2
+Version: 4.54
+Release: 3
Summary: irfanview is a graphics viewer
%define version_num %( echo %version | tr -d '\.' )
@@ -204,6 +204,15 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%{_datadir}/%{name}64
%changelog
+* Tue Jul 14 2020 B Stack <bgstack15@gmail.com> - 4.54-3
+- Improve filename handling again
+
+* Thu Jun 18 2020 B Stack <bgstack15@gmail.com> - 4.54-2
+- Improve filename handling
+
+* Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 4.54-1
+- version bump
+
* Sun Jun 16 2019 B Stack <bgstack15@gmail.com> - 4.53-2
- improve app start scripts and mimetypes
bgstack15