Merge branch 'irfanview-bump' into 'master'

fix irfanview invocation

Closes #21

See merge request bgstack15/stackrpms!163

14 files changed, 103 insertions, 15 deletions

diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common
index 6c178fc..9c32c98 100755
--- a/irfanview/debian/bin/irfanview-common
+++ b/irfanview/debian/bin/irfanview-common
@@ -11,6 +11,7 @@
 #    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
 # Usage:
 #    called from irfanview (which is symlink to irfanview32 or ifanview64)
 #    Do not use this by itself.
@@ -24,7 +25,7 @@ then
    false
 else
 
-IV_VERSION="2019-06-16b"
+IV_VERSION="2020-05-20a"
 
 # Define functions
 expandword() {
@@ -60,9 +61,10 @@ expandword() {
             ;;
          *)
             # assume it is readable and add it to list of files to open
-            echo "File ${_word}"
+            echo "File:1 ${_word}"
             thisfile="$( getwinepath "${_word}" )"
-            irfanfiles="${irfanfiles} ${thisfile}"
+            echo "File:2 ${thisfile}"
+            irfanfiles="${irfanfiles} '${thisfile}'"
             ;;
       esac
    fi
@@ -84,12 +86,12 @@ for word in "${@}";
 do
    expandword "${word}"
 done
-irfanfiles="${irfanfiles## }"
+irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )"
 
 # run wine
 cd $WINEPREFIX
-printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
-wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+echo 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 5c0c4a8..8295178 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,3 +1,9 @@
+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
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..9c32c98 100755
--- a/irfanview/irfanview-common
+++ b/irfanview/irfanview-common
@@ -11,6 +11,7 @@
 #    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
 # Usage:
 #    called from irfanview (which is symlink to irfanview32 or ifanview64)
 #    Do not use this by itself.
@@ -24,7 +25,7 @@ then
    false
 else
 
-IV_VERSION="2019-06-16b"
+IV_VERSION="2020-05-20a"
 
 # Define functions
 expandword() {
@@ -60,9 +61,10 @@ expandword() {
             ;;
          *)
             # assume it is readable and add it to list of files to open
-            echo "File ${_word}"
+            echo "File:1 ${_word}"
             thisfile="$( getwinepath "${_word}" )"
-            irfanfiles="${irfanfiles} ${thisfile}"
+            echo "File:2 ${thisfile}"
+            irfanfiles="${irfanfiles} '${thisfile}'"
             ;;
       esac
    fi
@@ -84,12 +86,12 @@ for word in "${@}";
 do
    expandword "${word}"
 done
-irfanfiles="${irfanfiles## }"
+irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )"
 
 # run wine
 cd $WINEPREFIX
-printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
-wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+echo 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 74b44e3..b5dc65d 100644
--- a/irfanview/irfanview.spec
+++ b/irfanview/irfanview.spec
@@ -6,7 +6,7 @@
 
 Name:		irfanview
 Version:	4.54
-Release:	1
+Release:	2
 Summary:	irfanview is a graphics viewer
 %define version_num %( echo %version | tr -d '\.' )
 
@@ -204,6 +204,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %{_datadir}/%{name}64
 
 %changelog
+* Thur 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