From 76805ede387ae80f1a9e37973948186ed9458b28 Mon Sep 17 00:00:00 2001 From: davehome Date: Tue, 4 Jun 2013 13:24:37 -0600 Subject: [PATCH 1/3] base-files: add xdg-user-dirs.sh --- srcpkgs/base-files/files/xdg-user-dirs.sh | 12 ++++++++++++ srcpkgs/base-files/template | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/base-files/files/xdg-user-dirs.sh diff --git a/srcpkgs/base-files/files/xdg-user-dirs.sh b/srcpkgs/base-files/files/xdg-user-dirs.sh new file mode 100644 index 00000000000..67ed0804d58 --- /dev/null +++ b/srcpkgs/base-files/files/xdg-user-dirs.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +CFGDIR=$HOME/.config + +if [ -f "/usr/bin/xdg-user-dirs-update" ] && [ -f "/usr/bin/xdg-user-dirs-gtk-update" ]; then + if [ ! -f "$CFGDIR/user-dirs.dirs" ] && [ ! -f "$CFGDIR/user-dirs.locale" ]; then + xdg-user-dirs-update + xdg-user-dirs-gtk-update + echo "XDG user dirs created/updated." + fi +fi + diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 4e3e282d440..6e2f234c88a 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,7 +1,7 @@ # Template file for 'base-files' pkgname=base-files version=0.86 -revision=1 +revision=2 bootstrap=yes makedepends="base-directories xbps-triggers" short_desc="Void Linux base system files" From 30992c8b0b30474739eaa47536dbfb1ce3c0795e Mon Sep 17 00:00:00 2001 From: davehome Date: Tue, 4 Jun 2013 13:43:56 -0600 Subject: [PATCH 2/3] gvfs: add gnome-open symlink to gvfs-open. --- srcpkgs/gvfs/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 4d829a3720c..a0409a9930b 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.16.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-hal --disable-afc --with-bash-completion-dir=/usr/share/bash-completion/completions" @@ -28,6 +28,7 @@ gvfs-devel_package() { gvfs_package() { pkg_install() { + cd ${DESTDIR}/usr/bin && ln -sf gvfs-open gnome-open vmove usr } } From 554fa1a54bcccd957e3d62946ef26ae54f9c8067 Mon Sep 17 00:00:00 2001 From: xdave Date: Wed, 5 Jun 2013 08:48:59 -0600 Subject: [PATCH 3/3] gvfs: create gnome-open symlink in post_install() instead. --- srcpkgs/gvfs/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index a0409a9930b..98a858c5924 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -19,6 +19,10 @@ license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/1.16/$pkgname-$version.tar.xz" checksum=6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1 +post_install() { + cd ${DESTDIR}/usr/bin && ln -sf gvfs-open gnome-open +} + gvfs-devel_package() { short_desc+=" - development files" pkg_install() { @@ -28,7 +32,6 @@ gvfs-devel_package() { gvfs_package() { pkg_install() { - cd ${DESTDIR}/usr/bin && ln -sf gvfs-open gnome-open vmove usr } }