svn commit: r399544 - in head/devel/glib20: . files

[Koop Mast]

Author: kwm
Date: Sat Oct 17 17:16:33 2015
New Revision: 399544
URL: https://svnweb.freebsd.org/changeset/ports/399544

Log:
  Re-enable kqueue backend for file monitoring. But add a hack, it
  should allow programs to work properly again.
  
  PR:		202128

Added:
  head/devel/glib20/files/patch-gio_gunionvolumemonitor.c   (contents, props changed)
Modified:
  head/devel/glib20/Makefile

Modified: head/devel/glib20/Makefile
==============================================================================
--- head/devel/glib20/Makefile	Sat Oct 17 16:55:31 2015	(r399543)
+++ head/devel/glib20/Makefile	Sat Oct 17 17:16:33 2015	(r399544)
@@ -3,7 +3,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.44.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,8 +33,7 @@ CONFIGURE_ARGS=	--disable-gtk-doc --with
 		--enable-static=yes \
 		--with-pcre=system \
 		--disable-fam
-CONFIGURE_ENV=	ac_cv_header_sys_inotify_h= \
-		ac_cv_header_sys_event_h=
+CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip

Added: head/devel/glib20/files/patch-gio_gunionvolumemonitor.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/glib20/files/patch-gio_gunionvolumemonitor.c	Sat Oct 17 17:16:33 2015	(r399544)
@@ -0,0 +1,16 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=753378
+
+--- gio/gunionvolumemonitor.c.orig	2015-09-25 11:23:00.429587000 +0200
++++ gio/gunionvolumemonitor.c	2015-09-25 11:23:12.787618000 +0200
+@@ -592,9 +592,9 @@ _g_mount_get_for_mount_path (const gchar
+ 
+   if (klass->get_mount_for_mount_path)
+     {
+-      g_rec_mutex_lock (&the_volume_monitor_mutex);
++//      g_rec_mutex_lock (&the_volume_monitor_mutex);
+       mount = klass->get_mount_for_mount_path (mount_path, cancellable);
+-      g_rec_mutex_unlock (&the_volume_monitor_mutex);
++//      g_rec_mutex_unlock (&the_volume_monitor_mutex);
+     }
+ 
+   /* TODO: How do we know this succeeded? Keep in mind that the native