2014-07-25	Nicolas Setton  <setton@adacore.com>

	*gio/glocalfilemonitor.c (_g_local_file_monitor_new): Deactivate
	monitor for files, which hangs in FAMOpen2 for nfs on
	some implementations. N725-029.

2013-05-15	Nicolas Setton  <setton@adacore.com>

	(gio/Makefile.in): Deactivate making in tests, which requires an
	installed glib.
	(docs/Makefile.in): Deactivate makeing in reference, which requires
	automake-1.13.

2012-03-06	Nicolas Setton  <setton@adacore.com>

	(configure): Do not set HAVE_LIBELF, not working on older
	version of Linux (SuSE 10, Red Hat 4)

	Python 2.5 and do not work on old versions of Linux and Solaris.

--- ../glib-2.36.2-orig/configure	2013-05-13 14:28:34.000000000 +0200
+++ configure	2013-05-15 11:37:53.395585837 +0200
@@ -25942,7 +25942,7 @@
 
 if test x$have_libelf = xyes; then
 
-$as_echo "#define HAVE_LIBELF 1" >>confdefs.h
+$as_echo "#undef HAVE_LIBELF" >>confdefs.h
 
 fi
 
--- gio/Makefile.in.orig	2013-05-15 15:50:20.130800000 +0200
+++ gio/Makefile.in	2013-05-15 15:50:36.089600000 +0200
@@ -92,7 +92,7 @@
 
 @OS_WIN32_TRUE@am__append_22 = gwin32appinfo.c gwin32appinfo.h
 @OS_WIN32_TRUE@am__append_23 = -lshlwapi -lws2_32 -ldnsapi
-@BUILD_MODULAR_TESTS_TRUE@am__append_24 = tests 
+@BUILD_MODULAR_TESTS_TRUE@am__append_24 =  
 
 # This is dumb.  The ObjC source file should be properly named .m
 @OS_COCOA_TRUE@am__append_25 = -xobjective-c

--- ../glib-2.36.2-orig/gio/Makefile.in	2013-05-13 14:28:38.000000000 +0200
+++ gio/Makefile.in	2013-05-15 11:38:53.154093600 +0200
@@ -549,7 +549,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
-	fam tests
+	fam 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
--- ../glib-2.36.2-orig/docs/Makefile.in	2013-05-13 14:28:37.000000000 +0200
+++ docs/Makefile.in	2013-05-15 11:44:09.971387733 +0200
@@ -402,7 +402,7 @@
 # initialize variables for unconditional += appending
 EXTRA_DIST = debugging.txt macros.txt
 TEST_PROGS = 
-SUBDIRS = reference
+SUBDIRS = 
 all: all-recursive
 
 .SUFFIXES:
*** Makefile.in.orig	2013-07-08 14:23:50.889000000 +0200
--- Makefile.in	2013-07-08 14:24:38.796600000 +0200
***************
*** 765,773 ****
  glib-gettextize: $(top_builddir)/config.status $(srcdir)/glib-gettextize.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  INSTALL: $(top_builddir)/config.status $(srcdir)/INSTALL.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  README: $(top_builddir)/config.status $(srcdir)/README.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  install-binSCRIPTS: $(bin_SCRIPTS)
--- 765,773 ----
  glib-gettextize: $(top_builddir)/config.status $(srcdir)/glib-gettextize.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  INSTALL: $(top_builddir)/config.status $(srcdir)/INSTALL.in
! 	cd $(top_builddir) && $(SHELL) ./config.status INSTALL
  README: $(top_builddir)/config.status $(srcdir)/README.in
! 	cd $(top_builddir) && $(SHELL) ./config.status README
  config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  install-binSCRIPTS: $(bin_SCRIPTS)
--- gio/glocalfilemonitor.c.orig	2014-07-25 19:42:35.910961864 +0200
+++ gio/glocalfilemonitor.c	2014-07-27 01:25:20.453594472 +0200
@@ -157,23 +157,6 @@
                            GError            **error)
 {
   GFileMonitor *monitor = NULL;
-  GType type = G_TYPE_INVALID;
-
-  if (is_remote_fs)
-    type = _g_io_module_get_default_type (G_NFS_FILE_MONITOR_EXTENSION_POINT_NAME,
-                                          "GIO_USE_FILE_MONITOR",
-                                          G_STRUCT_OFFSET (GLocalFileMonitorClass, is_supported));
-
-  if (type == G_TYPE_INVALID)
-    type = _g_io_module_get_default_type (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
-                                          "GIO_USE_FILE_MONITOR",
-                                          G_STRUCT_OFFSET (GLocalFileMonitorClass, is_supported));
-
-  if (type != G_TYPE_INVALID)
-    monitor = G_FILE_MONITOR (g_object_new (type, "filename", pathname, "flags", flags, NULL));
-  else
-    g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                         _("Unable to find default local file monitor type"));
 
   return monitor;
 }