summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-26 04:15:08 +0000
committerEric Hameleers <alien@slackware.com>2019-01-26 08:59:46 +0100
commit22643bf37651b7677deb9e06c35d1c1b0c43b883 (patch)
treed01a458de09d6987e6c62d4485e4fe4e0e9a9d23 /source/x
parent7ad185bd2d8fe579a2a8f288a911298e9b022c39 (diff)
downloadcurrent-22643bf37651b7677deb9e06c35d1c1b0c43b883.tar.gz
Sat Jan 26 04:15:08 UTC 201920190126041508
a/mkinitrd-1.4.11-x86_64-11.txz: Rebuilt. setup.01.mkinitrd: revert to the previous command line for mkinitrd_command_generator.sh (the new one fails when called from the installer).
Diffstat (limited to 'source/x')
-rw-r--r--source/x/xdg-utils/xdg-open.no.relative.paths.diff15
-rwxr-xr-xsource/x/xdg-utils/xdg-utils.SlackBuild5
2 files changed, 19 insertions, 1 deletions
diff --git a/source/x/xdg-utils/xdg-open.no.relative.paths.diff b/source/x/xdg-utils/xdg-open.no.relative.paths.diff
new file mode 100644
index 00000000..f28308ee
--- /dev/null
+++ b/source/x/xdg-utils/xdg-open.no.relative.paths.diff
@@ -0,0 +1,15 @@
+--- ./scripts/xdg-open.in.orig 2018-05-10 10:02:31.000000000 -0500
++++ ./scripts/xdg-open.in 2019-01-25 13:01:17.492733618 -0600
+@@ -453,12 +453,6 @@
+ # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
+ if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
+ local file="$(file_url_to_path "$1")"
+-
+- # handle relative paths
+- if ! echo "$file" | grep -q ^/; then
+- file="$(pwd)/$file"
+- fi
+-
+ pcmanfm "$file"
+ else
+ open_generic "$1"
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index c15d398e..060fbb53 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=xdg-utils
VERSION=1.1.3
PKG_VERSION=${VERSION/-/_}
ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
@@ -54,6 +54,9 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
+# Fix xdg-open usage in LXDE:
+zcat $CWD/xdg-open.no.relative.paths.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \