diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | support_for_KDE_Frameworks_5.6.diff | 43 |
3 files changed, 10 insertions, 58 deletions
@@ -1,6 +1,6 @@ pkgbase = xdg-utils-slock pkgdesc = Command line tools that assist applications with a variety of desktop integration tasks; patched to support slock lockscreen - pkgver = 1.1.1 + pkgver = 1.1.3 pkgrel = 1 url = https://www.freedesktop.org/wiki/Software/xdg-utils/ arch = any @@ -11,21 +11,19 @@ pkgbase = xdg-utils-slock makedepends = git depends = sh depends = xorg-xset - optdepends = kde-cli-tools: for KDE Plasma5 support in xdg-open optdepends = exo: for Xfce support in xdg-open optdepends = xorg-xprop: for Xfce support in xdg-open optdepends = pcmanfm: for LXDE support in xdg-open + optdepends = pcmanfm-qt: for LXQT support in xdg-open optdepends = perl-file-mimeinfo: for generic support in xdg-open optdepends = perl-net-dbus: Perl extension to dbus used in xdg-screensaver optdepends = perl-x11-protocol: Perl X11 protocol used in xdg-screensaver provides = xdg-utils conflicts = xdg-utils - source = https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz - source = support_for_KDE_Frameworks_5.6.diff + source = https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz source = slock_support.diff md5sums = 2d0aec6037769a5f138ff404b1bb4b15 - md5sums = fc0a612362e00cc091d2c1ebbfbfc500 - md5sums = eab28cbb6c84860c19fb2a1bf58b9a55 + md5sums = 902042508b626027a3709d105f0b63ff pkgname = xdg-utils-slock @@ -1,10 +1,11 @@ -# Maintainer: Vyacheslav Artemiev <artemiev.vyacheslav a gmail d com> +# Maintainer: TheCynicalTeam <TheCynicalTeam@github.com> +# Contributor: Vyacheslav Artemiev <artemiev.vyacheslav a gmail d com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=xdg-utils pkgname=$_pkgname-slock -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks; patched to support slock lockscreen" arch=('any') @@ -12,29 +13,25 @@ url="https://www.freedesktop.org/wiki/Software/xdg-utils/" license=('MIT') depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git') -optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open' - 'exo: for Xfce support in xdg-open' +optdepends=('exo: for Xfce support in xdg-open' 'xorg-xprop: for Xfce support in xdg-open' 'pcmanfm: for LXDE support in xdg-open' + 'pcmanfm-qt: for LXQT support in xdg-open' 'perl-file-mimeinfo: for generic support in xdg-open' 'perl-net-dbus: Perl extension to dbus used in xdg-screensaver' 'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver') provides=($_pkgname) conflicts=($_pkgname) source=(https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz - support_for_KDE_Frameworks_5.6.diff slock_support.diff) md5sums=('2d0aec6037769a5f138ff404b1bb4b15' - 'fc0a612362e00cc091d2c1ebbfbfc500' - 'eab28cbb6c84860c19fb2a1bf58b9a55') + '902042508b626027a3709d105f0b63ff') prepare() { cd $_pkgname-$pkgver # fix wrong hardcoded chromium binary name - FS#50184 sed -i "s:chromium-browser:chromium:" scripts/xdg-open.in - # fix KDE support, FS#48668 - patch -Np1 -i $srcdir/support_for_KDE_Frameworks_5.6.diff # add slock lockscreen support patch -p1 -i ${srcdir}/slock_support.diff } diff --git a/support_for_KDE_Frameworks_5.6.diff b/support_for_KDE_Frameworks_5.6.diff deleted file mode 100644 index eee4684c17c4..000000000000 --- a/support_for_KDE_Frameworks_5.6.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001 -From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -Date: Fri, 15 Apr 2016 11:17:37 +0200 -Subject: xdg-mime: support for KDE Frameworks 5.6 - - -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index 129850f..63b8a82 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -428,13 +428,9 @@ defapp_kde() - case "${KDE_SESSION_VERSION}" in - 4) - KTRADER=`which ktraderclient 2> /dev/null` -- MIMETYPE="--mimetype" -- SERVICETYPE="--servicetype" - ;; - 5) - KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null` -- MIMETYPE="--mimetype" -- SERVICETYPE="--servicetype" - ;; - esac - else -@@ -442,8 +438,8 @@ defapp_kde() - fi - if [ -n "$KTRADER" ] ; then - DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype" -- trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \ -- | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2` -+ trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \ -+ | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"` - if [ -n "$trader_result" ] ; then - basename "$trader_result" - exit_success -@@ -954,4 +950,3 @@ esac - update_mime_database $xdg_base_dir - - exit_success -- --- -cgit v0.10.2 - |