diff options
author | Kevin Brodsky | 2019-02-02 12:10:05 +0000 |
---|---|---|
committer | Kevin Brodsky | 2019-02-02 12:10:05 +0000 |
commit | 18fe307797bb513489ab1fa8272506c69f3ca836 (patch) | |
tree | 7f7d2d62743b48d3ff7fa19ef7e5b0d4a61e26a9 | |
parent | a07465a47bd0cff67cf166978be988835300b292 (diff) | |
download | aur-18fe307797bb513489ab1fa8272506c69f3ca836.tar.gz |
updpkg: 0.93-2 (gvfs-trash workaround)
As reported by fuan_k, the trash functionality is now quite broken
because XnView relies on gvfs-trash, which no longer exists. Until it is
properly fixed, use a wrapper that calls gio trash (gio is provided by
glib2, so the optdepends has been updated).
See also: https://newsgroup.xnview.com/viewtopic.php?t=37989
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | gvfs-trash | 2 |
3 files changed, 19 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = xnviewmp-system-libs pkgdesc = An efficient multimedia viewer, browser and converter (using system libraries). pkgver = 0.93 - pkgrel = 1 + pkgrel = 2 url = http://www.xnview.com/en/xnviewmp/ arch = x86_64 arch = i686 @@ -12,10 +12,12 @@ pkgbase = xnviewmp-system-libs depends = qt5-x11extras depends = qtav depends = desktop-file-utils - optdepends = gvfs: support for moving files to trash + optdepends = glib2: support for moving files to trash conflicts = xnviewmp source = xnviewmp.desktop + source = gvfs-trash md5sums = 24f44d5a881b94daf48775213a57e4ec + md5sums = 0c749b6334e8c4cf55cec56281458214 source_x86_64 = XnViewMP-linux-x64_0.93-rel1.tgz::http://download.xnview.com/XnViewMP-linux-x64.tgz md5sums_x86_64 = fcf4929e5f69847ee44a1cab0771c4ce source_i686 = XnViewMP-linux_0.93-rel1.tgz::http://download.xnview.com/XnViewMP-linux.tgz @@ -4,20 +4,20 @@ pkgname=xnviewmp-system-libs _pkgname=xnviewmp pkgver=0.93 srcrel=1 # Incremented when there is a new release for the same version number -pkgrel=1 +pkgrel=2 pkgdesc="An efficient multimedia viewer, browser and converter (using system libraries)." url="http://www.xnview.com/en/xnviewmp/" arch=('x86_64' 'i686') license=('custom') depends=('qt5-multimedia' 'qt5-svg' 'qt5-webkit' 'qt5-x11extras' 'qtav' 'desktop-file-utils') -optdepends=('gvfs: support for moving files to trash') +optdepends=('glib2: support for moving files to trash') conflicts=('xnviewmp') -source=('xnviewmp.desktop') +source=('xnviewmp.desktop' 'gvfs-trash') source_x86_64=("XnViewMP-linux-x64_${pkgver}-rel${srcrel}.tgz::http://download.xnview.com/XnViewMP-linux-x64.tgz") source_i686=("XnViewMP-linux_${pkgver}-rel${srcrel}.tgz::http://download.xnview.com/XnViewMP-linux.tgz") -md5sums=('24f44d5a881b94daf48775213a57e4ec') +md5sums=('24f44d5a881b94daf48775213a57e4ec' '0c749b6334e8c4cf55cec56281458214') md5sums_x86_64=('fcf4929e5f69847ee44a1cab0771c4ce') md5sums_i686=('17e8ab2a1de48c8d9bd5f4a42bfac83e') @@ -55,6 +55,15 @@ package() { for dir in "styles"; do ln -s "/usr/lib/qt/plugins/${dir}" "${pkgdir}/opt/${_pkgname}/lib/" done + + # XnView uses gvfs-trash to move files to the trash, unfortunately gvfs does + # not provide this command any more; it has been replaced by gio trash, + # provided by glib2. As a workaround, use a wrapper and add it to PATH in + # xnview.sh. + install -d -m755 "${pkgdir}/opt/${_pkgname}/bin" + install -m755 "${srcdir}/gvfs-trash" "${pkgdir}/opt/${_pkgname}/bin" + sed -i '/LD_LIBRARY_PATH/ i \ +export PATH="$dirname/bin:$PATH"' "${pkgdir}/opt/${_pkgname}/xnview.sh" } # vim:set ts=2 sw=2 et: diff --git a/gvfs-trash b/gvfs-trash new file mode 100644 index 000000000000..80e588fe7544 --- /dev/null +++ b/gvfs-trash @@ -0,0 +1,2 @@ +#!/bin/bash +exec gio trash "$@" |