diff options
| author | obache <obache@pkgsrc.org> | 2013-04-20 08:59:28 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-04-20 08:59:28 +0000 |
| commit | 3f7dff435a58f5b0143d4d8068750a2b90c14f19 (patch) | |
| tree | e853ddc6510e2f2978541c5e78356939f6cdf3ae /devel/glib2/patches | |
| parent | 1694f5002e1c28440244dcb9c16ed40b826f1dea (diff) | |
| download | pkgsrc-3f7dff435a58f5b0143d4d8068750a2b90c14f19.tar.gz | |
apply a patch for upstream Bug#697365 (fixed in master, not 2.36.x yet).
at least, required for Cygwin.
Diffstat (limited to 'devel/glib2/patches')
| -rw-r--r-- | devel/glib2/patches/patch-ba | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba index 7e017530a11..902a045ef8c 100644 --- a/devel/glib2/patches/patch-ba +++ b/devel/glib2/patches/patch-ba @@ -1,8 +1,9 @@ -$NetBSD: patch-ba,v 1.10 2012/04/30 13:53:48 drochner Exp $ +$NetBSD: patch-ba,v 1.11 2013/04/20 08:59:29 obache Exp $ -http://bugzilla.gnome.org/show_bug.cgi?id=583330 +* http://bugzilla.gnome.org/show_bug.cgi?id=583330 +* http://bugzilla.gnome.org/show_bug.cgi?id=697365 ---- gio/gunixmounts.c.orig 2012-03-18 02:35:25.000000000 +0000 +--- gio/gunixmounts.c.orig 2013-04-15 21:22:13.000000000 +0000 +++ gio/gunixmounts.c @@ -155,6 +155,9 @@ struct _GUnixMountMonitor { GFileMonitor *fstab_monitor; @@ -106,7 +107,19 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 #elif defined(HAVE_GETFSSTAT) if (mntent[i].f_flags & MNT_RDONLY) #endif -@@ -1122,6 +1142,10 @@ get_mounts_timestamp (void) +@@ -774,9 +794,11 @@ _g_get_unix_mount_points (void) + (strcmp (mntent->mnt_dir, "none") == 0)) + continue; + ++#if defined (HAVE_HASMNTOPT) + /* We ignore bind fstab entries, as we ignore bind mounts anyway */ + if (hasmntopt (mntent, "bind")) + continue; ++#endif + + mount_entry = g_new0 (GUnixMountPoint, 1); + mount_entry->mount_path = g_strdup (mntent->mnt_dir); +@@ -1126,6 +1148,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -117,7 +130,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 return 0; } -@@ -1267,6 +1291,13 @@ g_unix_mount_monitor_finalize (GObject * +@@ -1271,6 +1297,13 @@ g_unix_mount_monitor_finalize (GObject * g_object_unref (monitor->mtab_monitor); } @@ -131,7 +144,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1358,6 +1389,51 @@ proc_mounts_changed (GIOChannel *chann +@@ -1362,6 +1395,51 @@ proc_mounts_changed (GIOChannel *chann return TRUE; } @@ -183,7 +196,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 static void g_unix_mount_monitor_init (GUnixMountMonitor *monitor) { -@@ -1412,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon +@@ -1416,6 +1494,12 @@ g_unix_mount_monitor_init (GUnixMountMon g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); } } |