pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gvfs: unbreak build on Slackware



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Tue May 5 20:04:25 2026 +0200
Changeset:	d77f6c68c4f249ec681c0fc048adbc44f4a23efd

Modified Files:
	gvfs/Makefile
	gvfs/PLIST
	gvfs/options.mk

Log Message:
gvfs: unbreak build on Slackware

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d77f6c68c4f249ec681c0fc048adbc44f4a23efd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gvfs/Makefile   | 13 ++++++-------
 gvfs/PLIST      |  6 ++++--
 gvfs/options.mk |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diffs:
diff --git a/gvfs/Makefile b/gvfs/Makefile
index bee03cc8de..a59c3d1987 100644
--- a/gvfs/Makefile
+++ b/gvfs/Makefile
@@ -39,8 +39,13 @@ MESON_ARGS+=	-Dlogind=false \
 		-Donedrive=false \
 		-Dudisks2=false
 
+# Disable systemd support by default, as we currently lack a way to check for
+# builtin systemd on Linux.
+MESON_ARGS+=	-Dsystemduserunitdir=no \
+		-Dtmpfilesdir=no
+
 # Generate man pages; requires docbook-xsl.
-TOOL_DEPENDS+=		docbook-xsl-ns-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DOCBOOK_MANPAGE_XSL=	${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
 MESON_ARGS+=		-Dman=true
 
@@ -94,12 +99,6 @@ MESON_ARGS+=	-Dnfs=true
 ##   SFTP protocol support.
 MESON_ARGS+=	-Dsftp=true
 
-## SystemD support: obviously only for Linux.
-.if ${OPSYS} != "Linux"
-MESON_ARGS+=	-Dsystemduserunitdir=no
-MESON_ARGS+=	-Dtmpfilesdir=no
-.endif
-
 ## wsdd:///
 ##   Access Web Service Discovery Daemon.
 MESON_ARGS+=	-Dwsdd=true
diff --git a/gvfs/PLIST b/gvfs/PLIST
index aa94cc91e1..cee4c57de1 100644
--- a/gvfs/PLIST
+++ b/gvfs/PLIST
@@ -7,7 +7,7 @@ ${PLIST.afc}libexec/gvfs-afc-volume-monitor
 ${PLIST.gphoto}libexec/gvfs-gphoto2-volume-monitor
 ${PLIST.mtp}libexec/gvfs-mtp-volume-monitor
 libexec/gvfsd
-${PLIST.admin}libexec/gvfsd-admin
+${PLIST.polkit}libexec/gvfsd-admin
 ${PLIST.afc}libexec/gvfsd-afc
 libexec/gvfsd-afp
 libexec/gvfsd-afp-browse
@@ -48,7 +48,7 @@ ${PLIST.dnssd}share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
 share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
 ${PLIST.smb}share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 share/glib-2.0/schemas/org.gnome.system.wsdd.gschema.xml
-${PLIST.admin}share/gvfs/mounts/admin.mount
+${PLIST.polkit}share/gvfs/mounts/admin.mount
 ${PLIST.afc}share/gvfs/mounts/afc.mount
 share/gvfs/mounts/afp-browse.mount
 share/gvfs/mounts/afp.mount
@@ -159,3 +159,5 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+${PLIST.polkit}share/polkit-1/actions/org.gtk.vfs.file-operations.policy
+${PLIST.polkit}share/polkit-1/rules.d/org.gtk.vfs.file-operations.rules
diff --git a/gvfs/options.mk b/gvfs/options.mk
index 02c581519b..ca81ce6d7a 100644
--- a/gvfs/options.mk
+++ b/gvfs/options.mk
@@ -55,10 +55,10 @@ MESON_ARGS+=	-Dafc=false
 ### admin:///
 ###   Access local filesystem as a root user.
 ###
-PLIST_VARS+=	admin
+PLIST_VARS+=	polkit
 .if !empty(PKG_OPTIONS:Mpolkit)
 MESON_ARGS+=	-Dadmin=true
-PLIST.admin=	yes
+PLIST.polkit=	yes
 .  include "../../sysutils/libcap/buildlink3.mk"
 .  include "../../security/polkit/buildlink3.mk"
 .else


Home | Main Index | Thread Index | Old Index