apply a patch for upstream Bug#697365 (fixed in master, not 2.36.x yet).

at least, required for Cygwin.

2 files changed, 22 insertions, 9 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 0e346d5860a..6b480719399 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.183 2013/04/19 22:21:41 prlw1 Exp $
+$NetBSD: distinfo,v 1.184 2013/04/20 08:59:28 obache Exp $
 
 SHA1 (glib-2.36.1.tar.xz) = 6016ee6b46822d0ed471073e27420cfab26f7c68
 RMD160 (glib-2.36.1.tar.xz) = d89a1719d2e931833d68d91feb7233f0151b7326
@@ -17,7 +17,7 @@ SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
 SHA1 (patch-an) = 2d4eaa904347481bec55668e56d2ac431b567bc9
 SHA1 (patch-ap) = 5bc134ebe768c7171f25ce356b40edeae30c5b92
 SHA1 (patch-aq) = 217a8ea4ba7dbdcc315cb16575d55b9949997b64
-SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
+SHA1 (patch-ba) = 1119c43d1cc6e36aeb50bed2c1be9986e159dc4a
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
 SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
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);
          }
      }