gvfs bump to 1.30.4 gnome-mount to 0.8.37 libgnome-keyring fixed to work with evolution

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gvfs bump to 1.30.4 gnome-mount to 0.8.37 libgnome-keyring fixed to work with evolution
From: sergio lenzi <nervoso%k1.com.br@localhost>
Date: Mon, 21 Sep 2020 21:55:37 +0000
Module Name:	pkgsrc-wip
Committed By:	sergio lenzi <nervoso%k1.com.br@localhost>
Pushed By:	lenzi.sergio
Date:		Mon Sep 21 18:55:37 2020 -0300
Changeset:	fb964461a8629c8da995f67a9fd8bc763d579d1b

Added Files:
	gnome-mount/DESCR
	gnome-mount/Makefile
	gnome-mount/buildlink3.mk
	gnome-mount/distinfo
	gnome-mount/files/gnome-mount.schemas.in.NetBSD
	gnome-mount/patches/patch-aa
	gnome-mount/patches/patch-ab
	gnome-mount/patches/patch-ac
	gvfs/DESCR
	gvfs/Makefile
	gvfs/PLIST
	gvfs/buildlink3.mk
	gvfs/distinfo
	gvfs/patches/patch-configure.ac
	libgnome-keyring/DESCR
	libgnome-keyring/Makefile
	libgnome-keyring/PLIST
	libgnome-keyring/buildlink3.mk
	libgnome-keyring/distinfo
	libgnome-keyring/patches/patch-egg_egg-libgcrypt.c
	libgnome-keyring/patches/patch-library_tests_frob-list-modified.c

Log Message:
gvfs bump to 1.30.4 gnome-mount to 0.8.37 libgnome-keyring fixed to work with evolution

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

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

diffstat:
 gnome-mount/DESCR                                  |  10 ++
 gnome-mount/Makefile                               |  41 ++++++
 gnome-mount/buildlink3.mk                          |  37 ++++++
 gnome-mount/distinfo                               |   9 ++
 gnome-mount/files/gnome-mount.schemas.in.NetBSD    |  77 +++++++++++
 gnome-mount/patches/patch-aa                       | 122 +++++++++++++++++
 gnome-mount/patches/patch-ab                       | 148 +++++++++++++++++++++
 gnome-mount/patches/patch-ac                       |  13 ++
 gvfs/DESCR                                         |   5 +
 gvfs/Makefile                                      |  99 ++++++++++++++
 gvfs/PLIST                                         |   0
 gvfs/buildlink3.mk                                 |  40 ++++++
 gvfs/distinfo                                      |   8 ++
 gvfs/patches/patch-configure.ac                    |  13 ++
 libgnome-keyring/DESCR                             |  15 +++
 libgnome-keyring/Makefile                          |  25 ++++
 libgnome-keyring/PLIST                             | 102 ++++++++++++++
 libgnome-keyring/buildlink3.mk                     |  32 +++++
 libgnome-keyring/distinfo                          |   8 ++
 libgnome-keyring/patches/patch-egg_egg-libgcrypt.c |  55 ++++++++
 .../patch-library_tests_frob-list-modified.c       |  13 ++
 21 files changed, 872 insertions(+)

diffs:
diff --git a/gnome-mount/DESCR b/gnome-mount/DESCR
new file mode 100644
index 0000000000..a505176767
--- /dev/null
+++ b/gnome-mount/DESCR
@@ -0,0 +1,10 @@
+The grand plan with gnome-mount is to get the appropriate GNOME
+software (such as gnome-volume-manager and gnome-vfs) to use this
+instead of invoking mount(1)/umount(1)/eject(1) / invoking methods on
+HAL directly.
+
+Included in gnome-mount is also gnome-umount and gnome-eject. All
+programs utilize the methods on HAL and as such run unprivileged. The
+rationale for gnome-mount is to have a centralized place (in gconf)
+where settings (e.g. mount options, mount location) are
+maintained.
diff --git a/gnome-mount/Makefile b/gnome-mount/Makefile
new file mode 100644
index 0000000000..94988ddb75
--- /dev/null
+++ b/gnome-mount/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.42 2017/02/12 06:25:59 ryoon Exp $
+#
+
+DISTNAME=		gnome-mount-0.8
+PKGREVISION=		37
+CATEGORIES?=		sysutils wip
+MASTER_SITES=		http://hal.freedesktop.org/releases/
+
+MAINTAINER=		nervoso%NetBSD.org@localhost
+HOMEPAGE=		http://hal.freedesktop.org/
+COMMENT=		Programs for mounting, unmounting and ejecting storage devices
+
+GNU_CONFIGURE=		YES
+USE_PKGLOCALEDIR=	YES
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
+USE_LIBTOOL=		YES
+
+GENERATE_PLIST=		cd ${DESTDIR}${LOCALBASE};find * \! -type d;
+
+CONFIGURE_ARGS+=	--disable-nautilus-extension
+
+GCONF_SCHEMAS+=		gnome-mount.schemas
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD"
+post-extract:
+	${CP} ${FILESDIR}/gnome-mount.schemas.in.NetBSD ${WRKSRC}/gnome-mount.schemas.in
+.endif
+
+DEPENDS+=	gvfs>0:../../sysutils/gvfs
+
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../wip/libgnome-keyring/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../wip/hal/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
+.include "../Makefile"
diff --git a/gnome-mount/buildlink3.mk b/gnome-mount/buildlink3.mk
new file mode 100644
index 0000000000..d2162980d4
--- /dev/null
+++ b/gnome-mount/buildlink3.mk
@@ -0,0 +1,37 @@
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.17.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.gnome-mount?=	build
+
+BUILDLINK_TREE+=	gnome-mount
+
+.if !defined(GNOME_MOUNT_BUILDLINK3_MK)
+GNOME_MOUNT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gnome-mount+=	gnome-mount>=0.8nb37
+BUILDLINK_PKGSRCDIR.gnome-mount?=	../../wip/gnome-mount
+
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+
+DEPENDS+=	gvfs>0:../../sysutils/gvfs
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../wip/libgnome-keyring/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../wip/hal/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.endif	# GNOME_MOUNT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gnome-mount
diff --git a/gnome-mount/distinfo b/gnome-mount/distinfo
new file mode 100644
index 0000000000..4ad01b8a2f
--- /dev/null
+++ b/gnome-mount/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.5 2015/11/04 01:32:15 agc Exp $
+
+SHA1 (gnome-mount-0.8.tar.gz) = 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb
+RMD160 (gnome-mount-0.8.tar.gz) = 003800eda3edb7747714b1002bd1a1b50ea44fe9
+SHA512 (gnome-mount-0.8.tar.gz) = 92a296ef82f8ab7bc531e25e8131003478f63752efcf9aa64e1d40cbb81475f598084bf6d92562fe9a5ce399b002db8b0c99d5642b9150e31d56beffe23ca85c
+Size (gnome-mount-0.8.tar.gz) = 505788 bytes
+SHA1 (patch-aa) = 31479b417cf7c645cef6f3539aa49576d5104795
+SHA1 (patch-ab) = caf82291c778bb5153ca506dc5357998fd4cfd0c
+SHA1 (patch-ac) = 026448555bd9710cda343b6573260e3dcaa28b20
diff --git a/gnome-mount/files/gnome-mount.schemas.in.NetBSD b/gnome-mount/files/gnome-mount.schemas.in.NetBSD
new file mode 100644
index 0000000000..0628d9b94c
--- /dev/null
+++ b/gnome-mount/files/gnome-mount.schemas.in.NetBSD
@@ -0,0 +1,77 @@
+<gconfschemafile>
+  <!-- $NetBSD: gnome-mount.schemas.in.NetBSD,v 1.1 2008/11/24 01:16:18 jmcneill Exp $ -->
+  <schemalist>
+
+      <schema>
+        <key>/schemas/system/storage/default_options/vfat/mount_options</key>
+        <applyto>/system/storage/default_options/vfat/mount_options</applyto>
+        <type>list</type>
+        <list_type>string</list_type>
+        <default>[-u=]</default>
+        <locale name="C">
+          <short>Default mount options for vfat fs</short>
+          <long>A list of default mount options for volumes formatted with the vfat file system.</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/system/storage/default_options/iso9660/mount_options</key>
+        <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
+        <type>list</type>
+        <list_type>string</list_type>
+        <default>[-u=]</default>
+        <locale name="C">
+          <short>Default mount options for iso9660 fs</short>
+          <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/system/storage/default_options/udf/mount_options</key>
+        <applyto>/system/storage/default_options/udf/mount_options</applyto>
+        <type>list</type>
+        <list_type>string</list_type>
+        <default>[-u=]</default>
+        <locale name="C">
+          <short>Default mount options for udf fs</short>
+          <long>A list of default mount options for volumes formatted with the udf file system.</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/system/storage/default_options/ntfs/mount_options</key>
+        <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
+        <type>list</type>
+        <list_type>string</list_type>
+        <default>[-u=]</default>
+        <locale name="C">
+          <short>Default mount options for ntfs fs</short>
+          <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
+        </locale>
+      </schema>
+      <schema>
+        <key>/schemas/system/storage/default_options/ntfs/fstype_override</key>
+        <applyto>/system/storage/default_options/ntfs/fstype_override</applyto>
+        <type>string</type>
+        <default>ntfs-3g</default>
+        <locale name="C">
+          <short>When 'ntfs' is detected, what file system driver to use by default</short>
+          <long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/system/storage/default_options/ntfs-3g/mount_options</key>
+        <applyto>/system/storage/default_options/ntfs-3g/mount_options</applyto>
+        <type>list</type>
+        <list_type>string</list_type>
+        <default>[locale=]</default>
+        <locale name="C">
+          <short>Default mount options for ntfs-3g fs</short>
+          <long>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</long>
+        </locale>
+      </schema>
+
+
+  </schemalist>
+</gconfschemafile>
diff --git a/gnome-mount/patches/patch-aa b/gnome-mount/patches/patch-aa
new file mode 100644
index 0000000000..8905f2356c
--- /dev/null
+++ b/gnome-mount/patches/patch-aa
@@ -0,0 +1,122 @@
+$NetBSD: patch-aa,v 1.2 2008/12/25 05:33:20 hasso Exp $
+
+--- src/gnome-mount-properties-view.c.orig	2008-02-25 23:55:05 +0200
++++ src/gnome-mount-properties-view.c	2008-12-24 22:38:36 +0200
+@@ -35,7 +35,7 @@
+ #include <string.h>
+ #include <gconf/gconf-client.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <fstab.h>
+ #include <sys/param.h>
+ #include <sys/ucred.h>
+@@ -59,7 +59,31 @@ struct _GnomeMountPropertiesViewClass {
+ 	GtkVBoxClass base_class;
+ };
+ 
+-#ifdef __FreeBSD__
++#ifdef __NetBSD__
++static struct opt {
++	int o_opt;
++	const char *o_name;
++} optnames[] = {
++	{ MNT_ASYNC,		"async" },
++	{ MNT_NOCOREDUMP,	"nocoredump" },
++	{ MNT_NODEV,		"nodev" },
++	{ MNT_NODEVMTIME,	"nodevmtime" },
++	{ MNT_NOEXEC,		"noexec" },
++	{ MNT_NOSUID,		"nosuid" },
++	{ MNT_RDONLY,		"rdonly" },
++	{ MNT_SYNCHRONOUS,	"sync" },
++	{ MNT_UNION,		"union" },
++	{ MNT_NOATIME,		"noatime" },
++	{ MNT_SYMPERM,		"symperm" },
++	{ MNT_SOFTDEP,		"softdep" },
++#ifdef MNT_LOG
++	{ MNT_LOG,		"log" },
++#endif
++	{ MNT_IGNORE,		"hidden" },
++	{ 0, NULL }
++};
++#endif
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ static struct opt {
+ 	int o_opt;
+ 	const char *o_name;
+@@ -79,8 +103,12 @@ static struct opt {
+ 	{ MNT_NOCLUSTERW,	"noclusterw" },
+ 	{ MNT_SUIDDIR,		"suiddir" },
+ 	{ MNT_SOFTDEP,		"soft-updates" },
++#ifdef MNT_MULTILABEL
+ 	{ MNT_MULTILABEL,	"multilabel" },
++#endif
++#ifdef MNT_ACLS
+ 	{ MNT_ACLS,		"acls" },
++#endif
+ #ifdef MNT_GJOURNAL
+ 	{ MNT_GJOURNAL,		"gjournal" },
+ #endif
+@@ -337,7 +365,7 @@ populate_ui_from_gconf (GnomeMountProper
+ 	g_object_unref (gconf_client);
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ struct mtab_handle
+ {
+   struct statfs	*mounts;
+@@ -345,6 +373,14 @@ struct mtab_handle
+   int		iter;
+ };
+ #endif
++#ifdef __NetBSD__
++struct mtab_handle
++{
++  struct statvfs *mounts;
++  int		n_mounts;
++  int		iter;
++};
++#endif
+ 
+ /* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
+ static void
+@@ -454,7 +490,7 @@ out:
+ static gboolean
+ mtab_open (gpointer *handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	struct mtab_handle *mtab;
+ 
+ 	mtab = g_new0 (struct mtab_handle, 1);
+@@ -475,7 +511,7 @@ mtab_open (gpointer *handle)
+ static gboolean
+ mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	struct mtab_handle *mtab = handle;
+ 
+ 	if (mtab->iter < mtab->n_mounts) {
+@@ -484,7 +520,11 @@ mtab_next (gpointer handle, char **devic
+ 		GString *optstr;
+ 
+ 		optstr = g_string_new("");
++#if defined(__NetBSD__)
++		flags = mtab->mounts[mtab->iter].f_flag & MNT_VISFLAGMASK;
++#else
+ 		flags = mtab->mounts[mtab->iter].f_flags & MNT_VISFLAGMASK;
++#endif
+ 
+ 		for (o = optnames; flags && o->o_opt; o++) {
+ 			if (flags & o->o_opt) {
+@@ -517,7 +557,7 @@ mtab_next (gpointer handle, char **devic
+ static void
+ mtab_close (gpointer handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	g_free (handle);
+ #else
+ 	fclose (handle);
diff --git a/gnome-mount/patches/patch-ab b/gnome-mount/patches/patch-ab
new file mode 100644
index 0000000000..c8cb6d7d21
--- /dev/null
+++ b/gnome-mount/patches/patch-ab
@@ -0,0 +1,148 @@
+$NetBSD: patch-ab,v 1.4 2013/08/12 14:24:36 obache Exp $
+
+* XXX
+* gtk/gtk.h is not included from libnotify/notify.h of libnotify-0.7
+* XXX
+* libnotify-0.7 API change
+
+--- src/gnome-mount.c.orig	2008-04-16 23:41:32.000000000 +0000
++++ src/gnome-mount.c
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <locale.h>
+ 
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+@@ -39,6 +40,7 @@
+ #include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
+ #include <gdk/gdkx.h>
++#include <gtk/gtk.h>
+ #include "copy-paste/gnome-password-dialog.h"
+ #include <gnome-keyring.h>
+ #include <libnotify/notify.h>
+@@ -51,9 +53,9 @@
+ #define NOTIFY_EXPIRES_DEFAULT -1
+ #endif
+ 
+-#if !defined(sun) && !defined(__FreeBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ #include <mntent.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <fstab.h>
+ #include <sys/param.h>
+ #include <sys/ucred.h>
+@@ -677,15 +679,19 @@ static char *
+ get_mntent_mount_point(const char *device_file)
+ {
+ 	char *mount_point;
+-#if! defined(sun) && !defined(__FreeBSD__)
++#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ 	FILE *f;
+ 	struct mntent mnt;
+ 	struct mntent *mnte;
+ 	char buf[512];
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 	struct statfs *mounts;
+ 	int n_mounts;
+ 	int i;
++#elif defined(__NetBSD__)
++	struct statvfs *mounts;
++	int n_mounts;
++	int i;
+ #elif defined(sun)
+ 	FILE *f;
+ 	struct mnttab mnt;
+@@ -694,7 +700,7 @@ get_mntent_mount_point(const char *devic
+ 
+ 	mount_point = NULL;
+ 
+-#if !defined(sun) && !defined(__FreeBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ 	if ((f = setmntent ("/proc/mounts", "r")) != NULL) {
+ 		
+ 		while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
+@@ -717,13 +723,13 @@ get_mntent_mount_point(const char *devic
+ 		}
+ 		fclose(f);
+ 	}
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	n_mounts = getmntinfo(&mounts, MNT_NOWAIT);
+ 	for (i = 0; i < n_mounts; i++) {
+ 		if (!strcmp(mounts[i].f_mntfromname, device_file))
+ 			mount_point = g_strdup (mounts[i].f_mntonname);
+ 	}
+-#endif /* sun && __FreeBSD__ */
++#endif /* sun && __FreeBSD__ && __NetBSD__ && __DragonFly__ */
+ 
+ out:
+ 	return (mount_point);
+@@ -862,7 +868,7 @@ out:
+ static gboolean
+ fstab_open (gpointer *handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	return setfsent () == 1;
+ #else
+ 	*handle = fopen ("/etc/fstab", "r");
+@@ -873,7 +879,7 @@ fstab_open (gpointer *handle)
+ static char *
+ fstab_next (gpointer handle, char **mount_point)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	struct fstab *fstab;
+ 
+ 	fstab = getfsent ();
+@@ -901,7 +907,7 @@ fstab_next (gpointer handle, char **moun
+ static void
+ fstab_close (gpointer handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	endfsent ();
+ #else
+ 	fclose (handle);
+@@ -1116,7 +1122,7 @@ out:
+ 	return ret;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #define MOUNT		"/sbin/mount"
+ #define UMOUNT		"/sbin/umount"
+ #else
+@@ -1451,7 +1457,7 @@ volume_mount (const char *udi, LibHalVol
+ 	if (volume == NULL && (mount_options->len == 0)) {
+ 		/* volume from a non-pollable drive, just set uid.. */
+ 		
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ 		snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
+ #else
+ 		snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
+@@ -1482,7 +1488,7 @@ volume_mount (const char *udi, LibHalVol
+ 				g_debug ("read default option '%s' from gconf strlist key %s", option, key);
+ 
+ 				/* special workaround to replace "uid=" with "uid=<actual uid of caller>" */
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ 				if (strcmp (option, "uid=") == 0) {
+ 					g_free (option);
+ 					option = g_strdup_printf ("uid=%u", getuid ());
+@@ -1577,8 +1583,7 @@ unmount_cache_timeout_func (gpointer dat
+ 		message = g_strdup_printf (_("There is data that needs to be written to the device %s before it can be removed. Please do not remove the media or disconnect the drive."), unmount_note_drive_name);
+ 		unmount_note = notify_notification_new (summary,
+ 							message,
+-							"gnome-dev-harddisk", /* TODO: use appropriate icon */
+-							NULL);
++							"gnome-dev-harddisk");
+ 		if (unmount_note == NULL) {
+ 			g_warning ("Cannot create note for unmount cache sync");
+ 		} else {
diff --git a/gnome-mount/patches/patch-ac b/gnome-mount/patches/patch-ac
new file mode 100644
index 0000000000..9f6899c5c7
--- /dev/null
+++ b/gnome-mount/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+
+--- Makefile.in.orig	2008-11-22 12:44:39.000000000 -0500
++++ Makefile.in
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src po
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = $(datadir)/gconf/schemas
+ schema_in_files = gnome-mount.schemas.in
+ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/gvfs/DESCR b/gvfs/DESCR
new file mode 100644
index 0000000000..839b513062
--- /dev/null
+++ b/gvfs/DESCR
@@ -0,0 +1,5 @@
+gvfs is a userspace virtual filesystem designed to work with the i/o
+abstractions of gio (a library availible in glib >= 2.15.1). It
+installs several modules that are automatically used by applications
+using the APIs of libgio. There is also fuse support that allows
+applications not using gio to access the gvfs filesystems.
diff --git a/gvfs/Makefile b/gvfs/Makefile
new file mode 100644
index 0000000000..5e4009ad4c
--- /dev/null
+++ b/gvfs/Makefile
@@ -0,0 +1,99 @@
+# $NetBSD: Makefile,v 1.79 2016/08/03 10:23:24 adam Exp $
+#
+
+DISTNAME=	gvfs-1.30.4
+PKGREVISION=	23
+CATEGORIES?=	sysutils 
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.30/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	nervoso%k1.com.br@localhost
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	Userspace virtual filesystem
+LICENSE=	gnu-lgpl-v2
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	aclocal autoheader autoconf automake gettext-m4 \
+		gmake gm4 intltool msgfmt pkg-config
+CONFIGURE_ARGS+=	--enable-http
+CONFIGURE_ARGS+=	--disable-keyring
+CONFIGURE_ARGS+=	--disable-admin
+CONFIGURE_ARGS+=	--disable-silent-rules
+CONFIGURE_ARGS+=	--enable-bash-completion
+
+PLIST_SRC=	/dev/null
+GENERATE_PLIST=	cd ${DESTDIR}${LOCALBASE};find * \! -type d;
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.gvfs
+PKG_SUPPORTED_OPTIONS+= fuse samba hal
+PKG_SUGGESTED_OPTIONS+= samba 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
+# XXX fuse.bl3.mk will fail if we include it and fuse is not available
+.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
+PKG_SUGGESTED_OPTIONS+=	fuse
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msamba)
+CONFIGURE_ARGS+=	--with-samba-includes=${BUILDLINK_PREFIX.samba}/include
+CONFIGURE_ARGS+=	--with-samba-libs=${BUILDLINK_PREFIX.samba}/lib
+.include "../../net/samba/buildlink3.mk"
+PLIST.samba=		yes
+.else
+CONFIGURE_ARGS+=	--disable-samba
+.endif
+
+.if !empty(PKG_OPTIONS:Mnohal)
+.include "../../misc/libcdio-paranoia/buildlink3.mk"
+.include "../../wip/hal/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hal
+CONFIGURE_ARGS+=	--enable-cdda
+PLIST.hal=		yes
+.else
+CONFIGURE_ARGS+=	--disable-hal
+CONFIGURE_ARGS+=	--disable-cdda
+.endif
+
+.if !empty(PKG_OPTIONS:Mfuse)
+#.include "../../mk/fuse.buildlink3.mk"
+.include "../../filesystems/fuse/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-fuse
+PLIST.fuse=		yes
+.else
+CONFIGURE_ARGS+=	--disable-fuse
+.endif
+
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+
+DBUS_CFLAGS!=		pkg-config --cflags dbus-1
+CFLAGS+=		${DBUS_CFLAGS}
+CFLAGS.SunOS+=		-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+
+
+#BUILDLINK_DEPMETHOD.autogen+= build
+#.include "../../devel/autogen/buildlink3.mk"
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf --force --install
+
+
+DEPENDS+=	glib-networking:../../net/glib-networking
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.23.4
+.include "../../devel/glib2/modules.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=2.26.0
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+#.include "../../security/polkit/buildlink3.mk"
+.include "../../wip/gnome-mount/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gvfs/PLIST b/gvfs/PLIST
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gvfs/buildlink3.mk b/gvfs/buildlink3.mk
new file mode 100644
index 0000000000..1613645778
--- /dev/null
+++ b/gvfs/buildlink3.mk
@@ -0,0 +1,40 @@
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.18.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.gvfs?=	build
+
+BUILDLINK_TREE+=	gvfs
+
+.if !defined(GVFS_BUILDLINK3_MK)
+GVFS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gvfs+=	gvfs>=1.30.4nb23
+BUILDLINK_PKGSRCDIR.gvfs?=	../../wip/gvfs
+
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+.include "../../net/samba/buildlink3.mk"
+.include "../../misc/libcdio-paranoia/buildlink3.mk"
+.include "../../wip/hal/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../wip/gnome-mount/buildlink3.mk"
+.endif	# GVFS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gvfs
diff --git a/gvfs/distinfo b/gvfs/distinfo
new file mode 100644
index 0000000000..6f0a2159f3
--- /dev/null
+++ b/gvfs/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.25 2015/11/04 01:32:16 agc Exp $
+
+SHA1 (gvfs-1.30.4.tar.xz) = 77a6f86b9fb83bcee308592e90af4f13983e794b
+RMD160 (gvfs-1.30.4.tar.xz) = 4ba199efe4361e657a03777a698ff4766176ea40
+SHA512 (gvfs-1.30.4.tar.xz) = 305b2abc8cfcb4bdea1fb84f5a7df4aac9697494f5d63d40ce1eb234b547aed497deb4d88a2cb17f9ab4fc188d49ff56033993a17cbfebae6d65a33dc84a633a
+Size (gvfs-1.30.4.tar.xz) = 1895304 bytes
+SHA1 (patch-configure) = 9baf399e5b3905dadd77173d2a8114cb5e49b528
+SHA1 (patch-configure.ac) = f53fb836c45ecd2d0c2a218ea90b0404cb1b19c4
diff --git a/gvfs/patches/patch-configure.ac b/gvfs/patches/patch-configure.ac
new file mode 100644
index 0000000000..e7b49cf8d6
--- /dev/null
+++ b/gvfs/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.ac.orig	2020-09-18 13:48:24.766400687 +0000
++++ configure.ac
+@@ -823,7 +823,7 @@ AC_CHECK_MEMBERS([struct statvfs.f_baset
+ dnl
+ dnl if statfs() takes 2 arguments (Posix) or 4 (Solaris)
+ dnl
+-if test "$ac_cv_func_statfs" = yes ; then
++if test "$ac_cv_func_statvfs" != yes -a "$ac_cv_func_statfs" = yes; then
+   AC_MSG_CHECKING([number of arguments to statfs()])
+   AC_TRY_COMPILE([#include <unistd.h>
+   #ifdef HAVE_SYS_PARAM_H
diff --git a/libgnome-keyring/DESCR b/libgnome-keyring/DESCR
new file mode 100644
index 0000000000..d7cc1cc23a
--- /dev/null
+++ b/libgnome-keyring/DESCR
@@ -0,0 +1,15 @@
+gnome-keyring is a program that keeps passwords and other secrets for
+users.  It is run as a damon in the session, similar to ssh-agent, and
+other applications can locate it by an environment variable.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+The library libgnome-keyring is used by applications to integrate with
+the gnome keyring system.  However, at this point the library hasn't
+been tested and used enough to consider the API to be publically exposed.
+Therefore use of libgnome-keyring is at the moment limited to internal
+use in the gnome desktop.  However, we hope that the gnome-keyring API
+will turn out useful and good, so that later it can be made public for
+any application to use.
diff --git a/libgnome-keyring/Makefile b/libgnome-keyring/Makefile
new file mode 100644
index 0000000000..e32acc5228
--- /dev/null
+++ b/libgnome-keyring/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.16 2018/01/03 01:04:54 rillig Exp $
+
+DISTNAME=	libgnome-keyring-3.12.0
+CATEGORIES?=	security wip
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome-keyring/3.12/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	nervoso%k1.com.br@localhost
+HOMEPAGE=	https://www.gnome.org/
+COMMENT=	GNOME password and secret manager
+LICENSE=	gnu-lgpl-v2
+
+CONFLICTS+=	gnome-keyring<2.30
+
+USE_TOOLS+=		gmake intltool msgfmt pkg-config xgettext
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+
+PKGCONFIG_OVERRIDE+=	library/gnome-keyring-1.pc.in
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus+=    dbus>=1.2.1
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libgnome-keyring/PLIST b/libgnome-keyring/PLIST
new file mode 100644
index 0000000000..f7d32095e2
--- /dev/null
+++ b/libgnome-keyring/PLIST
@@ -0,0 +1,102 @@
+@comment $NetBSD$
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
+include/gnome-keyring-1/gnome-keyring.h
+lib/libgnome-keyring.la
+lib/pkgconfig/gnome-keyring-1.pc
+share/gtk-doc/html/gnome-keyring/annotation-glossary.html
+share/gtk-doc/html/gnome-keyring/ch01.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Callbacks.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Daemon-Management-Functions.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Item-ACLs.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Item-Attributes.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Item-Information.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Keyring-Info.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Keyring-Items.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Keyrings.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Miscellaneous-Functions.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Network-Passwords.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Non-pageable-Memory.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Result-Codes.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Search-Functionality.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-Simple-Password-Storage.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2
+share/gtk-doc/html/gnome-keyring/home.png
+share/gtk-doc/html/gnome-keyring/index.html
+share/gtk-doc/html/gnome-keyring/index.sgml
+share/gtk-doc/html/gnome-keyring/left.png
+share/gtk-doc/html/gnome-keyring/right.png
+share/gtk-doc/html/gnome-keyring/style.css
+share/gtk-doc/html/gnome-keyring/up.png
+share/locale/af/LC_MESSAGES/libgnome-keyring.mo
+share/locale/an/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ar/LC_MESSAGES/libgnome-keyring.mo
+share/locale/as/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ast/LC_MESSAGES/libgnome-keyring.mo
+share/locale/be/LC_MESSAGES/libgnome-keyring.mo
+share/locale/bg/LC_MESSAGES/libgnome-keyring.mo
+share/locale/bn/LC_MESSAGES/libgnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ca/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ca@valencia/LC_MESSAGES/libgnome-keyring.mo
+share/locale/cs/LC_MESSAGES/libgnome-keyring.mo
+share/locale/da/LC_MESSAGES/libgnome-keyring.mo
+share/locale/de/LC_MESSAGES/libgnome-keyring.mo
+share/locale/el/LC_MESSAGES/libgnome-keyring.mo
+share/locale/en_GB/LC_MESSAGES/libgnome-keyring.mo
+share/locale/eo/LC_MESSAGES/libgnome-keyring.mo
+share/locale/es/LC_MESSAGES/libgnome-keyring.mo
+share/locale/et/LC_MESSAGES/libgnome-keyring.mo
+share/locale/eu/LC_MESSAGES/libgnome-keyring.mo
+share/locale/fa/LC_MESSAGES/libgnome-keyring.mo
+share/locale/fi/LC_MESSAGES/libgnome-keyring.mo
+share/locale/fr/LC_MESSAGES/libgnome-keyring.mo
+share/locale/fur/LC_MESSAGES/libgnome-keyring.mo
+share/locale/fy/LC_MESSAGES/libgnome-keyring.mo
+share/locale/gd/LC_MESSAGES/libgnome-keyring.mo
+share/locale/gl/LC_MESSAGES/libgnome-keyring.mo
+share/locale/gu/LC_MESSAGES/libgnome-keyring.mo
+share/locale/he/LC_MESSAGES/libgnome-keyring.mo
+share/locale/hi/LC_MESSAGES/libgnome-keyring.mo
+share/locale/hu/LC_MESSAGES/libgnome-keyring.mo
+share/locale/id/LC_MESSAGES/libgnome-keyring.mo
+share/locale/it/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ja/LC_MESSAGES/libgnome-keyring.mo
+share/locale/km/LC_MESSAGES/libgnome-keyring.mo
+share/locale/kn/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ko/LC_MESSAGES/libgnome-keyring.mo
+share/locale/lt/LC_MESSAGES/libgnome-keyring.mo
+share/locale/lv/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ml/LC_MESSAGES/libgnome-keyring.mo
+share/locale/mn/LC_MESSAGES/libgnome-keyring.mo
+share/locale/mr/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ms/LC_MESSAGES/libgnome-keyring.mo
+share/locale/nb/LC_MESSAGES/libgnome-keyring.mo
+share/locale/nds/LC_MESSAGES/libgnome-keyring.mo
+share/locale/nl/LC_MESSAGES/libgnome-keyring.mo
+share/locale/nn/LC_MESSAGES/libgnome-keyring.mo
+share/locale/or/LC_MESSAGES/libgnome-keyring.mo
+share/locale/pa/LC_MESSAGES/libgnome-keyring.mo
+share/locale/pl/LC_MESSAGES/libgnome-keyring.mo
+share/locale/pt/LC_MESSAGES/libgnome-keyring.mo
+share/locale/pt_BR/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ro/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ru/LC_MESSAGES/libgnome-keyring.mo
+share/locale/sk/LC_MESSAGES/libgnome-keyring.mo
+share/locale/sl/LC_MESSAGES/libgnome-keyring.mo
+share/locale/sr/LC_MESSAGES/libgnome-keyring.mo
+share/locale/sr@latin/LC_MESSAGES/libgnome-keyring.mo
+share/locale/sv/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ta/LC_MESSAGES/libgnome-keyring.mo
+share/locale/te/LC_MESSAGES/libgnome-keyring.mo
+share/locale/tg/LC_MESSAGES/libgnome-keyring.mo
+share/locale/th/LC_MESSAGES/libgnome-keyring.mo
+share/locale/tr/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ug/LC_MESSAGES/libgnome-keyring.mo
+share/locale/uk/LC_MESSAGES/libgnome-keyring.mo
+share/locale/uz@cyrillic/LC_MESSAGES/libgnome-keyring.mo
+share/locale/vi/LC_MESSAGES/libgnome-keyring.mo
+share/locale/zh_CN/LC_MESSAGES/libgnome-keyring.mo
+share/locale/zh_HK/LC_MESSAGES/libgnome-keyring.mo
+share/locale/zh_TW/LC_MESSAGES/libgnome-keyring.mo
+@pkgdir share/examples/rc.d
diff --git a/libgnome-keyring/buildlink3.mk b/libgnome-keyring/buildlink3.mk
new file mode 100644
index 0000000000..8880a96473
--- /dev/null
+++ b/libgnome-keyring/buildlink3.mk
@@ -0,0 +1,32 @@
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.17.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.libgnome-keyring?=	build
+
+BUILDLINK_TREE+=	libgnome-keyring
+
+.if !defined(LIBGNOME_KEYRING_BUILDLINK3_MK)
+LIBGNOME_KEYRING_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libgnome-keyring+=	libgnome-keyring>=3.12.0
+BUILDLINK_PKGSRCDIR.libgnome-keyring?=	../../wip/libgnome-keyring
+
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.endif	# LIBGNOME_KEYRING_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libgnome-keyring
diff --git a/libgnome-keyring/distinfo b/libgnome-keyring/distinfo
new file mode 100644
index 0000000000..b01cc54d77
--- /dev/null
+++ b/libgnome-keyring/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (libgnome-keyring-3.12.0.tar.xz) = 69b21d77e0946911b2e71346d219bb19b74d05f8
+RMD160 (libgnome-keyring-3.12.0.tar.xz) = d088c86fe3900e58a2dd67ef20bec5b23fd5f8ad
+SHA512 (libgnome-keyring-3.12.0.tar.xz) = dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
+Size (libgnome-keyring-3.12.0.tar.xz) = 435092 bytes
+SHA1 (patch-egg_egg-libgcrypt.c) = 173a4fb3540d31c3779464edc8e72b6498e94a1e
+SHA1 (patch-library_tests_frob-list-modified.c) = f5a93bcc3079c4cbbac489287b747c83e83f87ba
diff --git a/libgnome-keyring/patches/patch-egg_egg-libgcrypt.c b/libgnome-keyring/patches/patch-egg_egg-libgcrypt.c
new file mode 100644
index 0000000000..20df766d34
--- /dev/null
+++ b/libgnome-keyring/patches/patch-egg_egg-libgcrypt.c
@@ -0,0 +1,55 @@
+$NetBSD$
+
+--- egg/egg-libgcrypt.c.orig	2014-03-23 07:47:26.000000000 +0000
++++ egg/egg-libgcrypt.c
+@@ -53,49 +53,8 @@ fatal_handler (gpointer unused, int unkn
+ 	g_log ("gcrypt", G_LOG_LEVEL_ERROR, "%s", msg);
+ }
+ 
+-static int
+-glib_thread_mutex_init (void **lock)
+-{
+-#if GLIB_CHECK_VERSION(2,31,0)
+-	*lock = g_slice_new (GMutex);
+-	g_mutex_init (*lock);
+-#else
+-	*lock = g_mutex_new ();
+-#endif
+-	return 0;
+-}
+-
+-static int
+-glib_thread_mutex_destroy (void **lock)
+-{
+-#if GLIB_CHECK_VERSION(2,31,0)
+-	g_mutex_clear (*lock);
+-	g_slice_free (GMutex, *lock);
+-#else
+-	g_mutex_free (*lock);
+-#endif
+-	return 0;
+-}
+-
+-static int
+-glib_thread_mutex_lock (void **lock)
+-{
+-	g_mutex_lock (*lock);
+-	return 0;
+-}
+-
+-static int
+-glib_thread_mutex_unlock (void **lock)
+-{
+-	g_mutex_unlock (*lock);
+-	return 0;
+-}
+-
+ static struct gcry_thread_cbs glib_thread_cbs = {
+-	GCRY_THREAD_OPTION_USER, NULL,
+-	glib_thread_mutex_init, glib_thread_mutex_destroy,
+-	glib_thread_mutex_lock, glib_thread_mutex_unlock,
+-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
++	GCRY_THREAD_OPTION_USER
+ };
+ 
+ void
diff --git a/libgnome-keyring/patches/patch-library_tests_frob-list-modified.c b/libgnome-keyring/patches/patch-library_tests_frob-list-modified.c
new file mode 100644
index 0000000000..43936a3294
--- /dev/null
+++ b/libgnome-keyring/patches/patch-library_tests_frob-list-modified.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- library/tests/frob-list-modified.c.orig	2018-07-24 17:00:13.000000000 +0000
++++ library/tests/frob-list-modified.c
+@@ -57,7 +57,7 @@ main (int argc, char **argv)
+ 		datetime = g_date_time_new_from_unix_utc (gnome_keyring_item_info_get_mtime (info));
+ 		date = g_date_time_format (datetime, "%Y%m%dT%H%M%S");
+ 		display = gnome_keyring_item_info_get_display_name (info);
+-		g_print ("%lu %s: %s/%u: %s\n", gnome_keyring_item_info_get_mtime (info),
++		g_print ("%llu %s: %s/%u: %s\n", gnome_keyring_item_info_get_mtime (info),
+ 		         date, found->keyring, found->item_id, display);
+ 		g_date_time_unref (datetime);
+ 		g_free (date);
Prev by Date: unifi6: Add 6.0.22
Next by Date: new pkgs!
Previous by Thread: unifi6: Add 6.0.22
Next by Thread: new pkgs!
Indexes:
Home | Main Index | Thread Index | Old Index