cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logic to repair mounts monitoring.

Browse Source
This commit is contained in:
ajacoutot 2012-03-30 10:25:35 +00:00
parent 1a188fefd1
commit 417912853d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.159 2012/03/25 21:46:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.160 2012/03/30 10:25:35 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
@ -10,6 +10,8 @@ EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 0
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

26
devel/glib2/patches/patch-gio_gunixmounts_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-gio_gunixmounts_c,v 1.6 2012/03/23 13:19:32 ajacoutot Exp $
$OpenBSD: patch-gio_gunixmounts_c,v 1.7 2012/03/30 10:25:35 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=583330
From FreeBSD: poll the list of mounted filesystems since we can't rely
on checking for mtab updates like other systems.
--- gio/gunixmounts.c.orig Tue Feb 21 01:10:54 2012
+++ gio/gunixmounts.c Fri Mar 16 12:38:35 2012
--- gio/gunixmounts.c.orig Sun Mar 18 03:35:25 2012
+++ gio/gunixmounts.c Fri Mar 30 12:12:34 2012
@@ -156,6 +156,9 @@ struct _GUnixMountMonitor {
GFileMonitor *mtab_monitor;
@ -138,20 +138,16 @@ on checking for mtab updates like other systems.
static void
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
{
@@ -1406,10 +1476,16 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
}
else
{
+#if defined __linux__
file = g_file_new_for_path (mtab_path);
monitor->mtab_monitor = g_file_monitor_file (file, 0, NULL, NULL);
@@ -1411,6 +1481,12 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
g_object_unref (file);
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+#else
+ monitor->mount_poller_mounts = _g_get_unix_mounts ();
+ mount_poller_time = (guint64)time (NULL);
+ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
+#endif
}
+ }
+ else
+ {
+ monitor->mount_poller_mounts = _g_get_unix_mounts ();
+ mount_poller_time = (guint64)time (NULL);
+ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
}
}