From owner-svn-ports-head@freebsd.org Sat Oct 17 17:16:34 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B06DA17940; Sat, 17 Oct 2015 17:16:34 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E29CEB4; Sat, 17 Oct 2015 17:16:34 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9HHGXkb011280; Sat, 17 Oct 2015 17:16:33 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9HHGX4v011278; Sat, 17 Oct 2015 17:16:33 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201510171716.t9HHGX4v011278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 17 Oct 2015 17:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399544 - in head/devel/glib20: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Oct 2015 17:16:34 -0000 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