Merge branch 'irfanview-bump' into 'master'

Irfanview 4.56

See merge request bgstack15/stackrpms!204

4 files changed, 155 insertions, 2 deletions

diff --git a/irfanview/build-orig-tarball.sh b/irfanview/build-orig-tarball.sh
new file mode 100755
index 0000000..ee8b56e
--- /dev/null
+++ b/irfanview/build-orig-tarball.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Package: irfanview
+# Startdate: 2020-11-06 14:05
+# References:
+#    ublock-origin-combined/build-orig-tarball.sh
+#    irfanview/debian/README.debian from this package
+# Dependencies:
+#    sudo apt-get install wget curl sed awk
+
+frontpageurl="https://www.irfanview.com/"
+package_name="irfanview"
+
+# FUNCTIONS
+ferror() {
+   printf "%s\n" "$@" 1>&2
+}
+
+get() {
+   # get "https://example.com/example.zip"
+   # get "https://example.com/example.zip" "outputname.zip"
+   ___get_url="${1}"
+   ___get_outfile="${2}"
+   ___wget_options=""
+   test -n "${___get_outfile}" && ___wget_options="-O ${___get_outfile}"
+
+   test -n "${DEBUG}" && ferror "wget --quiet --referer \"${___get_url}\" --user-agent='Mozilla (X11)' --content-disposition \"${___get_url}\" ${___wget_options}"
+   test -z "${DRYRUN}" && wget --quiet --referer "${___get_url}" --user-agent='Mozilla (X11)' --content-disposition "${___get_url}" ${___wget_options}
+}
+
+to_filename() {
+   # call: to_filename "https://example.com/filename.ext"
+   # returns: "filename.ext"
+   printf "${1##*/}"
+}
+
+### Flow
+
+# check dependencies
+#which jq 1>/dev/null 2>&1 || { echo "Please install jq! Aborted." ; exit 1; }
+
+## 1. learn latest version file
+url_contents="$( curl -s "${frontpageurl}" )"
+latest_version="$( echo "${url_contents}" | grep -oiE "current version.{0,8}[0-9\.]+" | awk '{print $NF}' | sort -n | tail -n1 )"
+latest_version_no_dot="$( echo "${latest_version}" | tr -dc '[0-9]' )"
+
+## 2. dl it
+test -z "${NOFETCH}" && {
+   get "http://www.irfanview.info/files/iview${latest_version_no_dot}.zip"
+   get "http://www.irfanview.info/files/iview${latest_version_no_dot}_x64.zip"
+   get "http://www.irfanview.info/files/iview${latest_version_no_dot}_plugins.zip"
+   get "http://www.irfanview.info/files/iview${latest_version_no_dot}_plugins_x64.zip"
+}
+
+## 5. assemble orig tarball
+iver="${latest_version_no_dot}"
+
+# original logic which is not needed due to the automation above.
+#dir_iver="$( echo "${iver}" | head -c1 ).$( echo "${iver}" | tail -c3 )"
+
+test -n "${DEBUG}" && ferror "mkdir -p \"${package_name}-${latest_version}\"; cd \"${package_name}-${latest_version}\""
+test -z "${DRYRUN}" && { mkdir -p "${package_name}-${latest_version}" ; cd "${package_name}-${latest_version}" ; }
+
+test -n "${DEBUG}" && ferror "mkdir -p \"${package_name}-bin32\" \"${package_name}-bin64\""
+test -z "${DRYRUN}" && { mkdir -p "${package_name}-bin32" "${package_name}-bin64" ; }
+
+test -n "${DEBUG}" && ferror "cd \"${package_name}-bin32\" ; unzip -o ../../iview${iver}.zip     ; cd Plugins ; unzip -o ../../../iview${iver}_plugins.zip     ; cd ../.."
+test -z "${DRYRUN}" && { cd "${package_name}-bin32" ; unzip -o ../../iview${iver}.zip     ; cd Plugins ; unzip -o ../../../iview${iver}_plugins.zip     ; cd ../.. ; }
+
+test -n "${DEBUG}" && ferror "cd \"${package_name}-bin64\" ; unzip -o ../../iview${iver}_x64.zip ; cd Plugins ; unzip -o ../../../iview${iver}_plugins_x64.zip ; cd ../.."
+test -z "${DRYRUN}" && { cd "${package_name}-bin64" ; unzip -o ../../iview${iver}_x64.zip ; cd Plugins ; unzip -o ../../../iview${iver}_plugins_x64.zip ; cd ../.. ; }
+
+test -n "${DEBUG}" && ferror "cd .."
+test -z "${DRYRUN}" && { cd .. ; }
+
+test -n "${DEBUG}" && ferror "tar -zcf \"${package_name}_${latest_version}.orig.tar.gz\" \"${package_name}-${latest_version}\""
+test -z "${DRYRUN}" && tar -zcf "${package_name}_${latest_version}.orig.tar.gz" "${package_name}-${latest_version}"
+
+# CLEAN UP
+rm -rf "${package_name}-${latest_version}/"
diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog
index 29fede5..062a1e8 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,3 +1,37 @@
+irfanview (4.56-1+devuan) obs; urgency=low
+
+  - Version 4.56 Release date: 2020-10-21
+    * Updated Video PlugIn (improved Win10 compatibility, new player for MP3/FLAC)
+    * Option to play all audio formats in main window (Properties->Video/Sound)
+    * Option to change hotkeys for menus: Right mouse click on menu item
+    * New option in Paint dialog: Fill rect/ellipse with transparent color
+    * New "Edit->Insert Watermark" option: Use color to highlight an area
+    * Option to disable mouse wheel for file browsing (Properties->Browsing)
+    * New SVG PlugIn (Thanks to seppesol)
+    * New XCF PlugIn (Thanks to Jacek SQ6KBQ)
+    * New JPG option: Use QuantSmooth loading (PlugIn, thanks to Ilya Kurdyukov)
+    * Option for page/frame filename suffix in Multipage-Extract dialog
+    * CTRL + "Save-As" icon on toolbar calls the "Save" menu
+    * New option in Advanced batch dialog: Add Border/Frame
+    * New option in Insert Text dialog: Settings for Outline-1 effect (Rainbow)
+    * New paste option: Change paste counter (Edit->Paste special)
+    * New shapes in Hexagon dialog: Ellipse, Cloud; Spiral (thanks to Rod Stephens)
+    * New option in Hexagon/Shadow dialog: Background transparency
+    * Support for PSB format (Photoshop files)
+    * Context menu added to EXIF dialog (Copy only selected lines)
+    * New placeholder: $c (Compression text from Image->Info dialog)
+    * Program icon updated
+    * New Paint dialog icons (Thanks to Michael Grosberg)
+    * CLP format moved to FORMATS PlugIn
+    * JP2 PlugIn loading bugs fixed (thanks to Phung Duc Luan and Linhlhq)
+    * B3D and XCF PlugIn loading bugs fixed (thanks to Zhe Wang)
+    * Formats PlugIn bugs fixed (XPM,XBM,CR2,HDR,WBMB,FITS,DDS) (thanks to nhiephon)
+      (CVE-2020-13905, CVE-2020-13906)
+    * MNG PlugIn loading bug fixed (thanks to zhazha crack)
+    * Several PlugIns are changed/updated, please install the newest versions: 
+
+ -- B Stack <bgstack15@gmail.com>  Fri, 06 Nov 2020 09:53:14 -0500
+
 irfanview (4.54-3+devuan) obs; urgency=low
 
   - Improve filename handling again
diff --git a/irfanview/deploy-to-obs.sh b/irfanview/deploy-to-obs.sh
new file mode 100755
index 0000000..e2fbd0f
--- /dev/null
+++ b/irfanview/deploy-to-obs.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Startdate: 2020-11-04 15:06
+# Purpose: make it a oneliner to get into the OBS
+# Reference:
+#    ublock-origin-combined/deploy-to-obs.sh
+# Dependencies:
+#    osc
+
+devdir=~/dev
+gitdir="${devdir}/stackrpms/irfanview"
+obsdir="${devdir}/osc/home:bgstack15/irfanview"
+
+# Flow
+cd "${devdir}"
+"${gitdir}/build-orig-tarball.sh"
+echo "DONE WITH build-orig-tarball"
+tf="$( find . -maxdepth 1 -name 'irfanview*orig*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 )"
+tar -zxf "${tf}"
+cd "$( tar -zvtf "${tf}" | awk '/^d/{print $NF}' | head -n1 )"
+cp -pr "${gitdir}/debian" .
+debuild -us -uc # depends on dpkg-dev=1.19.7 and not 1.20.5 which is still broken in Ceres as of 2020-11-04
+test $? -eq 0 || { "debuild failed. Cannot continue. Aborted." ; exit 1 ; }
+cd "${devdir}"
+dsc_file="$( find . -maxdepth 1 -name 'irfan*dsc' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
+debian_tar_file="$( find . -maxdepth 1 -name 'irfan*debian*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
+
+# prep obs
+cd "${obsdir}"
+osc up
+osc rm *
+cd "${devdir}"
+cp -p "${dsc_file}" "${debian_tar_file}" "${tf}" "${obsdir}/"
+cd "${obsdir}"
+#find . -mindepth 1 -maxdepth 1 ! -name "${dsc_file}" ! -name "${debian_tar_file}" ! -name "${tf}" -delete
+osc add *
+osc commit # will prompt for commit name
diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec
index 85c2cdf..a6fd0fc 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.54
-Release:	3
+Version:	4.56
+Release:	1
 Summary:	irfanview is a graphics viewer
 %define version_num %( echo %version | tr -d '\.' )
 
@@ -113,6 +113,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
 # man pages
 pushd %{name}-bin32
 %{__install} -p -D -m0644 -t %{buildroot}%{_docdir}/%{name} *.txt *.chm
+%{__install} -p -m0755 -d %{buildroot}%{_docdir}/%{name}/Html
 %{__install} -p -D -m0644 -t %{buildroot}%{_docdir}/%{name}/Html Html/*
 popd
 
@@ -204,6 +205,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %{_datadir}/%{name}64
 
 %changelog
+* Fri Nov 06 2020 B Stack <bgstack15@gmail.com> - 4.56-1
+- version bump
+
 * Tue Jul 14 2020 B Stack <bgstack15@gmail.com> - 4.54-3
 - Improve filename handling again