pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gvfs: update to 1.60.0

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun May 3 19:50:40 2026 +0200
Changeset:	9eba1583b267c318f19a5cc8e302ae19a7373315

Modified Files:
	gvfs/COMMIT_MSG
	gvfs/Makefile
	gvfs/PLIST
	gvfs/distinfo
	gvfs/hacks.mk
	gvfs/options.mk
Added Files:
	gvfs/patches/patch-client_gdaemonvfs.c
	gvfs/patches/patch-man_meson.build

Log Message:
gvfs: update to 1.60.0

* Enable gudev support on *BSD alongside some options depending on it.
* General clean-up, in respect of the good work PHO already did here.
* Some stuff has been moved to options.
* Update paths for dependencies imported in the main tree.

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

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

diffstat:
 gvfs/COMMIT_MSG                        |   2 +-
 gvfs/Makefile                          | 193 +++++++++++++--------------------
 gvfs/PLIST                             |  28 +++--
 gvfs/distinfo                          |   8 +-
 gvfs/hacks.mk                          |   2 +-
 gvfs/options.mk                        | 160 +++++++++++++++++++++++----
 gvfs/patches/patch-client_gdaemonvfs.c |  16 +++
 gvfs/patches/patch-man_meson.build     |  15 +++
 8 files changed, 269 insertions(+), 155 deletions(-)

diffs:
diff --git a/gvfs/COMMIT_MSG b/gvfs/COMMIT_MSG
index d62253cfd6..3634b73c11 100644
--- a/gvfs/COMMIT_MSG
+++ b/gvfs/COMMIT_MSG
@@ -1,4 +1,4 @@
-sysutils/gvfs: Update to gvfs-1.58.0
+sysutils/gvfs: Update to gvfs-1.60.0
 
 The change log is too long to paste here. See:
 https://gitlab.gnome.org/GNOME/gvfs/-/blob/master/NEWS
diff --git a/gvfs/Makefile b/gvfs/Makefile
index eeb02960bb..bee03cc8de 100644
--- a/gvfs/Makefile
+++ b/gvfs/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.79 2016/08/03 10:23:24 adam Exp $
 #
 
-DISTNAME=	gvfs-1.58.0
+DISTNAME=	gvfs-1.60.0
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/${PKGVERSION_NOREV:S/./ /g:[1..2]:ts.}/}
 EXTRACT_SUFX=	.tar.xz
@@ -11,152 +11,107 @@ HOMEPAGE=	https://wiki.gnome.org/Projects/gvfs
 COMMENT=	Userspace virtual filesystem
 LICENSE=	gnu-lgpl-v2
 
-# TODO: Remove this line. Dunno why but mk/tools/replace.mk dies without it.
-USE_TOOLS+=	gm4
-
 USE_TOOLS+=	pkg-config
 
-.include "options.mk"
-.include "../../mk/bsd.fast.prefs.mk"
+USE_PKGLOCALEDIR=	yes
 
-# SystemD support is obviously only for Linux.
-.if ${OPSYS} != "Linux"
-MESON_ARGS+=	-Dsystemduserunitdir=no
-MESON_ARGS+=	-Dtmpfilesdir=no
-.endif
-
-# afc://{UUID}
-#   Apple File Conduit; allow to exchange files with iOS devices
-MESON_ARGS+=	-Dafc=true
-.include "../../wip/libimobiledevice/buildlink3.mk"
-.include "../../textproc/libplist/buildlink3.mk"
-
-# afp://[user@]host[:port][/share]
-#   Apple Filing Protocol.
-MESON_ARGS+=	-Dafp=true
-
-# archive://{URL-ENCODED-URI}
-#   Access archive files.
-MESON_ARGS+=	-Darchive=true
-.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../mk/compiler.mk"
 
-# burn://{DEVICE}
-#   Virtual filesystem for file managers to help them implement burning
-#   optical discs.
-MESON_ARGS+=	-Dburn=true
+CFLAGS.NetBSD+=	-DNETBSD_SOURCE
 
-# cdda://{DEVICE}
-#   Access audio discs.
-PLIST_VARS+=	cdda
-.if ${OPSYS} == "Linux"
-MESON_ARGS+=	-Dcdda=true
-PLIST.cdda=	yes
-# libcdio-paranoia is a cross-platform library but the gvfs backend relies
-# on udev, which is only available on Linux.
-GUDEV_REQUIRED=	yes
-.  include "../../misc/libcdio-paranoia/buildlink3.mk"
+.if !empty(PKGSRC_COMPILER:Mclang) || ${CC_VERSION:Mgcc-[6-9]*} || ${CC_VERSION:Mgcc-1[0-9].*}
+CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 .else
-MESON_ARGS+=	-Dcdda=false
+CFLAGS.SunOS+=	-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
 .endif
 
-# gphoto2://{ID_SERIAL}, gphoto2://[usb:bus,dev]
-#   Access digital cameras.
-PLIST_VARS+=	gphoto2
-.if ${OPSYS} == "Linux"
-MESON_ARGS+=	-Dgphoto2=true
-PLIST.gphoto2=	yes
-GUDEV_REQUIRED=	yes
-.  include "../../devel/libgphoto2/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dgphoto2=false
-.endif
+# Enforce some defaults to prevent PLIST issues witnessed in some environments.
+MESON_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
+		--localedir=${PKGLOCALEDIR}/locale
 
-# mtp://{ID_SERIAL}, mtp://[usb:bus,dev]
-#   Access digital audio/media players.
-PLIST_VARS+=	mtp
-.if ${OPSYS} == "Linux"
-MESON_ARGS+=	-Dmtp=true
-PLIST.mtp=	yes
-GUDEV_REQUIRED=	yes
-.  include "../../devel/libmtp/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dmtp=false
-.endif
+# Disable meson's default of using "-Wl,--as-needed" on ld.bfd arches,
+# to prevent build failures due to undefined references.
+MESON_ARGS+=	-Db_asneeded=false
 
-# http://, https://
-#   HTTP protocol support.
-MESON_ARGS+=	-Dhttp=true
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../net/libsoup3/buildlink3.mk"
+# Disable some options which currently have no support on pkgsrc,
+# and are otherwise only available on Linux.
+MESON_ARGS+=	-Dlogind=false \
+		-Donedrive=false \
+		-Dudisks2=false
 
-# nfs://{HOST}/{SHARE}
-#   NFS v2 and v3 protocols.
-MESON_ARGS+=	-Dnfs=true
-.include "../../wip/libnfs/buildlink3.mk"
+# Generate man pages; requires docbook-xsl.
+TOOL_DEPENDS+=		docbook-xsl-ns-[0-9]*:../../textproc/docbook-xsl
+DOCBOOK_MANPAGE_XSL=	${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
+MESON_ARGS+=		-Dman=true
 
-# OneDrive support requires libmsgraph-1 but we haven't packaged it
-# yet. Nobody would want to use it anyway.
-MESON_ARGS+=	-Donedrive=false
+SUBST_CLASSES+=		man
+SUBST_STAGE.man=	pre-configure
+SUBST_FILES.man=	man/meson.build
+SUBST_VARS.man+=	DOCBOOK_MANPAGE_XSL
 
-# sftp://[user@]host[:port], ssh://[user@]host[:port]
-#   SFTP protocol support.
-MESON_ARGS+=	-Dsftp=true
+.include "../../mk/bsd.fast.prefs.mk"
 
-# ufisks2 support requires libudisks2 but we haven't packaged it yet. It's
-# only for Linux anyway.
-MESON_ARGS+=	-Dudisks2=false
+# Turn on some settings by default.
 
-# wsdd:///
-#   Access Web Service Discovery Daemon.
-MESON_ARGS+=	-Dwsdd=true
+## afp://[user@]host[:port][/share]
+##   Apple Filing Protocol.
+MESON_ARGS+=	-Dafp=true
 
-# Blu-Ray metadata support.
-MESON_ARGS+=	-Dbluray=true
-.include "../../multimedia/libbluray/buildlink3.mk"
+## archive://{URL-ENCODED-URI}
+##   Access archive files.
+MESON_ARGS+=	-Darchive=true
+.include "../../archivers/libarchive/buildlink3.mk"
 
-# FUSE support.
-MESON_ARGS+=	-Dfuse=true
-.include "../../mk/fuse.buildlink3.mk"
+## burn://{DEVICE}
+##   Virtual filesystem for file managers to help them implement burning
+##   optical discs.
+MESON_ARGS+=	-Dburn=true
 
-# libgcrypt support.
-MESON_ARGS+=	-Dgcrypt=true
-.include "../../security/libgcrypt/buildlink3.mk"
+## http://, https://
+##   HTTP protocol support.
+MESON_ARGS+=	-Dhttp=true
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../net/libsoup3/buildlink3.mk"
 
-# logind support requires libelogind but we haven't packaged it yet. It's
-# only for Linux anyway.
-MESON_ARGS+=	-Dlogind=false
+## libgcrypt support.
+MESON_ARGS+=    -Dgcrypt=true
+.include "../../security/libgcrypt/buildlink3.mk"
 
-# libusb-1 support: Not available on DragonFly.
-.if ${OPSYS} == "DragonFly"
-MESON_ARGS+=	-Dlibusb=false
-.else
-MESON_ARGS+=	-Dlibusb=true
+## libusb interruption support: not available on DragonFly.
+.if ${OPSYS} != "DragonFly"
 .  include "../../devel/libusb1/buildlink3.mk"
+MESON_ARGS+=    -Dlibusb=true
+.else
+MESON_ARGS+=    -Dlibusb=false
 .endif
 
-# Generate man pages.
-MESON_ARGS+=	-Dman=true
+## nfs://{HOST}/{SHARE}
+##   NFS v2 and v3 protocols.
+MESON_ARGS+=	-Dnfs=true
+.include "../../net/libnfs/buildlink3.mk"
 
-# Some options require libgudev, which is only available on Linux.
-.if ${GUDEV_REQUIRED:tl} == "yes"
-MESON_ARGS+=	-Dgudev=true
-.  include "../../devel/libgudev/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dgudev=false
-.endif
+## sftp://[user@]host[:port], ssh://[user@]host[:port]
+##   SFTP protocol support.
+MESON_ARGS+=	-Dsftp=true
 
-# Some options require gnome-online-accounts, which is supposedly
-# universally available but users would have a reason not to want it by
-# default.
-.if ${GOA_REQUIRED:tl} == "yes"
-MESON_ARGS+=	-Dgoa=true
-.  include "../../net/gnome-online-accounts/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dgoa=false
+## 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
+
+.include "options.mk"
+
 .include "../../devel/glib2/modules.mk"
-.include "../../devel/meson/build.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/libxslt/xsltproc-nonet.mk"
+
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gvfs/PLIST b/gvfs/PLIST
index b201a6f6dc..aa94cc91e1 100644
--- a/gvfs/PLIST
+++ b/gvfs/PLIST
@@ -3,10 +3,12 @@ lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.so
 lib/gvfs/libgvfscommon.so
 lib/gvfs/libgvfsdaemon.so
-libexec/gvfs-afc-volume-monitor
+${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
-libexec/gvfsd-afc
+${PLIST.afc}libexec/gvfsd-afc
 libexec/gvfsd-afp
 libexec/gvfsd-afp-browse
 libexec/gvfsd-archive
@@ -16,9 +18,9 @@ libexec/gvfsd-computer
 libexec/gvfsd-dav
 ${PLIST.dnssd}libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
-libexec/gvfsd-fuse
-${PLIST.google}libexec/gvfsd-google
-${PLIST.gphoto2}libexec/gvfsd-gphoto2
+${PLIST.fuse}libexec/gvfsd-fuse
+${PLIST.gdata}libexec/gvfsd-google
+${PLIST.gphoto}libexec/gvfsd-gphoto2
 libexec/gvfsd-http
 libexec/gvfsd-localtest
 libexec/gvfsd-metadata
@@ -37,29 +39,31 @@ man/man1/gvfsd.1
 man/man7/gvfs.7
 ${PLIST.dnssd}share/GConf/gsettings/gvfs-dns-sd.convert
 ${PLIST.smb}share/GConf/gsettings/gvfs-smb.convert
-share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
+${PLIST.afc}share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
 share/dbus-1/services/org.gtk.vfs.Daemon.service
+${PLIST.gphoto}share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service
+${PLIST.mtp}share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service
 share/dbus-1/services/org.gtk.vfs.Metadata.service
 ${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
-share/gvfs/mounts/afc.mount
+${PLIST.afc}share/gvfs/mounts/afc.mount
 share/gvfs/mounts/afp-browse.mount
 share/gvfs/mounts/afp.mount
 share/gvfs/mounts/archive.mount
 share/gvfs/mounts/burn.mount
 ${PLIST.cdda}share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
-${PLIST.dnssd}share/gvfs/mounts/dav+sd.mount
+share/gvfs/mounts/dav+sd.mount
 share/gvfs/mounts/dav.mount
 ${PLIST.dnssd}share/gvfs/mounts/dns-sd.mount
 share/gvfs/mounts/ftp.mount
 share/gvfs/mounts/ftpis.mount
 share/gvfs/mounts/ftps.mount
-${PLIST.google}share/gvfs/mounts/google.mount
-${PLIST.gphoto2}share/gvfs/mounts/gphoto2.mount
+${PLIST.gdata}share/gvfs/mounts/google.mount
+${PLIST.gphoto}share/gvfs/mounts/gphoto2.mount
 share/gvfs/mounts/http.mount
 share/gvfs/mounts/localtest.mount
 ${PLIST.mtp}share/gvfs/mounts/mtp.mount
@@ -71,7 +75,9 @@ ${PLIST.smb}share/gvfs/mounts/smb-browse.mount
 ${PLIST.smb}share/gvfs/mounts/smb.mount
 share/gvfs/mounts/trash.mount
 share/gvfs/mounts/wsdd.mount
-share/gvfs/remote-volume-monitors/afc.monitor
+${PLIST.afc}share/gvfs/remote-volume-monitors/afc.monitor
+${PLIST.gphoto}share/gvfs/remote-volume-monitors/gphoto2.monitor
+${PLIST.mtp}share/gvfs/remote-volume-monitors/mtp.monitor
 share/locale/ab/LC_MESSAGES/gvfs.mo
 share/locale/af/LC_MESSAGES/gvfs.mo
 share/locale/ar/LC_MESSAGES/gvfs.mo
diff --git a/gvfs/distinfo b/gvfs/distinfo
index 717b56fcc6..1b201cc2c9 100644
--- a/gvfs/distinfo
+++ b/gvfs/distinfo
@@ -1,7 +1,9 @@
 $NetBSD: distinfo,v 1.25 2015/11/04 01:32:16 agc Exp $
 
-BLAKE2s (gvfs-1.58.0.tar.xz) = 9f9bbd4ed9fc3133a64a8a35bf7455cc0dfa0e5008d1bba59b180ae73f762e62
-SHA512 (gvfs-1.58.0.tar.xz) = b77e1d6184be7310ffad74a45598c07ebc9555d4a5b72d2c2be535e3258a7a2da73f68f74e4ff669988410688e5592e33cf68e30e5ac12d28e9b70d36a4a9b42
-Size (gvfs-1.58.0.tar.xz) = 1283696 bytes
+BLAKE2s (gvfs-1.60.0.tar.xz) = 7592f6c6545146f4eedb3cc2339ab36a9d1e47246ade9fa688409f228fd127c0
+SHA512 (gvfs-1.60.0.tar.xz) = 4897f8bcaa4e8d1eb73f797080e30bc6a442729d93f1ab958add719fe8cd7a30777a1ff26ef807f86fa62edd15529426fa974f01c0081bd3b72af8ae03c01385
+Size (gvfs-1.60.0.tar.xz) = 1297324 bytes
+SHA1 (patch-client_gdaemonvfs.c) = c4833ffcec2b6d1b93beb12b7405fdc3e171beb0
 SHA1 (patch-daemon_ParseFTPList.c) = 50c38494cabb67c4c5047a1dc5a34f487f7349cf
+SHA1 (patch-man_meson.build) = e49cca1e56248625ce111168807425df4fd2e9f9
 SHA1 (patch-meson.build) = f223d6dc97791da7ef96cf4cc099c1599c0e39b2
diff --git a/gvfs/hacks.mk b/gvfs/hacks.mk
index 00a218845d..143658820b 100644
--- a/gvfs/hacks.mk
+++ b/gvfs/hacks.mk
@@ -19,6 +19,6 @@ GVFS_HACKS_MK=	defined
 ### in a very indirect way, and the only way around is to do this silly
 ### hack:
 PKG_HACKS+=	rpath-fixup
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX:Q}/lib/gvfs
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gvfs
 
 .endif # GVFS_HACKS_MK
diff --git a/gvfs/options.mk b/gvfs/options.mk
index 4464f99149..02c581519b 100644
--- a/gvfs/options.mk
+++ b/gvfs/options.mk
@@ -1,21 +1,55 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS=	dnssd libgdata samba gcr secret
-PKG_SUGGESTED_OPTIONS=	dnssd secret
+PKG_SUPPORTED_OPTIONS=	bluray cdda dnssd fuse goa gcr gphoto idevice libgdata \
+			libmtp polkit samba secret udev
+PKG_SUGGESTED_OPTIONS=	gcr dnssd secret
 
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=	samba
+.endif
+
+.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 099993)
+PKG_SUGGESTED_OPTIONS+=	fuse
+.endif
+
+# Some options expect gudev support:
+# use the GUDEV_REQUIRED variable to handle them.
+GUDEV_REQUIRED?=	# empty
+
+# Gnome Online Accounts support:
+# some users might have a reason not to want it by default.
+GOA_REQUIRED?=		# empty
+
+# Check for a working udev implementation.
+# If available, enable some options which depend on it.
+.include "../../mk/udev.buildlink3.mk"
+.if ${UDEV_TYPE} != "none"
+PKG_SUGGESTED_OPTIONS+=	udev
+PKG_SUGGESTED_OPTIONS+=	cdda libmtp
+.endif
 
 .if ${OPSYS} == "Linux"
 # polkit itself is cross-platform but gvfs also requires libcap, which is
 # only available on Linux.
-PKG_SUPPORTED_OPTIONS+=	polkit
 PKG_SUGGESTED_OPTIONS+=	polkit
 .endif
 
-GUDEV_REQUIRED=	no
-GOA_REQUIRED=	no
+.include "../../mk/bsd.options.mk"
+
+###
+### afc://{UUID}
+###  Apple File Conduit; allow to exchange files with iOS devices
+###
+PLIST_VARS+=	afc
+.if !empty(PKG_OPTIONS:Midevice)
+MESON_ARGS+=    -Dafc=true
+PLIST.afc=	yes
+.  include "../../comms/libimobiledevice/buildlink3.mk"
+.  include "../../textproc/libplist/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dafc=false
+.endif
 
 ###
 ### admin:///
@@ -31,6 +65,30 @@ PLIST.admin=	yes
 MESON_ARGS+=	-Dadmin=false
 .endif
 
+###
+#### Blu-Ray metadata support.
+###
+.if !empty(PKG_OPTIONS:Mbluray)
+MESON_ARGS+=    -Dbluray=true
+.  include "../../multimedia/libbluray/buildlink3.mk"
+.else
+MESON_ARGS+=    -Dbluray=false
+.endif
+
+###
+###  cdda://{DEVICE}
+###    Access audio discs.
+###
+PLIST_VARS+=    cdda
+.if !empty(PKG_OPTIONS:Mcdda)
+MESON_ARGS+=    -Dcdda=true
+GUDEV_REQUIRED= yes
+.  include "../../misc/libcdio-paranoia/buildlink3.mk"
+PLIST.cdda=     yes
+.else
+MESON_ARGS+=    -Dcdda=false
+.endif
+
 ###
 ### dns-sd://{DOMAIN}
 ###   DNS-SD shares on the local network.
@@ -44,20 +102,82 @@ PLIST.dnssd=	yes
 MESON_ARGS+=	-Ddnssd=false
 .endif
 
+###
+### FUSE support.
+###
+PLIST_VARS+=	fuse
+.if !empty(PKG_OPTIONS:Mfuse)
+BUILDLINK_API_DEPENDS.fuse+=    fuse>=2.8
+.include "../../mk/fuse.buildlink3.mk"
+MESON_ARGS+=	-Dfuse=true
+PLIST.fuse=             yes
+.else
+MESON_ARGS+=	-Dfuse=false
+.endif
+
+###
+### GCR certificate support.
+###
+.if !empty(PKG_OPTIONS:Mgcr)
+MESON_ARGS+=    -Dgcr=true
+.  include "../../security/gcr4/buildlink3.mk"
+.else
+MESON_ARGS+=    -Dgcr=false
+.endif
+
 ###
 ### google-drive://{USER}@{HOST}
 ###   Access Google Drive.
 ###
-PLIST_VARS+=	google
+PLIST_VARS+=	gdata
 .if !empty(PKG_OPTIONS:Mlibgdata)
-MESON_ARGS+=	-Dgoogle=true
-PLIST.google=	yes
 GOA_REQUIRED=	yes
+MESON_ARGS+=	-Dgoogle=true
+PLIST.gdata=	yes
 .  include "../../net/libgdata/buildlink3.mk"
 .else
 MESON_ARGS+=	-Dgoogle=false
 .endif
 
+###
+### GOA (Gnome Online Accounts).
+### Required for Google Drive support.
+###
+.if !empty(PKG_OPTIONS:Mgoa) || ${GOA_REQUIRED:tl} == "yes"
+MESON_ARGS+=    -Dgoa=true
+.  include "../../net/gnome-online-accounts/buildlink3.mk"
+.else
+MESON_ARGS+=    -Dgoa=false
+.endif
+
+###
+### gphoto2://{ID_SERIAL}, gphoto2://[usb:bus,dev]
+###   Access digital cameras.
+###
+PLIST_VARS+=    gphoto
+.if !empty(PKG_OPTIONS:Mgphoto)
+MESON_ARGS+=    -Dgphoto2=true
+GUDEV_REQUIRED= yes
+PLIST.gphoto=  yes
+.  include "../../devel/libgphoto2/buildlink3.mk"
+.else
+MESON_ARGS+=    -Dgphoto2=false
+.endif
+
+###
+### mtp://{ID_SERIAL}, mtp://[usb:bus,dev]
+###   Access digital audio/media players.
+###
+.if !empty(PKG_OPTIONS:Mlibmtp)
+PLIST_VARS+=    mtp
+MESON_ARGS+=    -Dmtp=true
+GUDEV_REQUIRED= yes
+.  include "../../devel/libmtp/buildlink3.mk"
+PLIST.mtp=      yes
+.else
+MESON_ARGS+=    -Dmtp=false
+.endif
+
 ###
 ### smb://[user@]host[:port][/share]
 ###   SMB/CIFS protocol support.
@@ -71,16 +191,6 @@ PLIST.smb=	yes
 MESON_ARGS+=	-Dsmb=false
 .endif
 
-###
-### GCR support.
-###
-.if !empty(PKG_OPTIONS:Mgcr)
-MESON_ARGS+=	-Dgcr=true
-.  include "../../wip/gcr4/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dgcr=false
-.endif
-
 ###
 ### GNOME Keyring support.
 ###
@@ -90,3 +200,13 @@ MESON_ARGS+=	-Dkeyring=true
 .else
 MESON_ARGS+=	-Dkeyring=false
 .endif
+
+###
+### GUdev device support.
+###
+.if !empty(PKG_OPTIONS:Mudev) || ${GUDEV_REQUIRED:tl} == "yes"
+MESON_ARGS+=    -Dgudev=true
+.  include "../../devel/libgudev/buildlink3.mk"
+.else
+MESON_ARGS+=    -Dgudev=false
+.endif
diff --git a/gvfs/patches/patch-client_gdaemonvfs.c b/gvfs/patches/patch-client_gdaemonvfs.c
new file mode 100644
index 0000000000..2047ab39fc
--- /dev/null
+++ b/gvfs/patches/patch-client_gdaemonvfs.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Don't crash when creating volume monitors if the VFS was never
+initialized.
+
+--- client/gdaemonvfs.c.orig	2026-03-13 10:15:46.000000000 +0000
++++ client/gdaemonvfs.c
+@@ -1436,7 +1436,7 @@ g_daemon_vfs_deserialize_icon (GVfs     
+ GDBusConnection *
+ _g_daemon_vfs_get_async_bus (void)
+ {
+-  return the_vfs->async_bus;
++  return the_vfs ? the_vfs->async_bus : NULL;
+ }
+ 
+ static gboolean
diff --git a/gvfs/patches/patch-man_meson.build b/gvfs/patches/patch-man_meson.build
new file mode 100644
index 0000000000..cc2ab7aea3
--- /dev/null
+++ b/gvfs/patches/patch-man_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix detection of docbook.
+
+--- man/meson.build.orig	2026-05-03 13:29:08.697502288 +0000
++++ man/meson.build
+@@ -10,7 +10,7 @@ xsltproc_cmd = [
+   '--stringparam', 'man.th.extra1.suppress', '1',
+   '--stringparam', 'man.authors.section.enabled', '0',
+   '--stringparam', 'man.copyright.section.enabled', '0',
+-  'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
++  '@DOCBOOK_MANPAGE_XSL@',
+   '@INPUT@',
+ ]
+
Home | Main Index | Thread Index | Old Index