[gnome-desktop] Drop libgsystem submodule, stop using O_NOATIME

[Colin Walters <walters src gnome org>]

commit c394ae44e99e3edc6d3ae926fb00e58d63aefe4c
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 5 13:51:10 2015 -0500

    Drop libgsystem submodule, stop using O_NOATIME
    
    The entire rationale for adding this _noatime function was fairly
    bogus.
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=680326
    
    But the Linux kernel doesn't permit non-root users to use it for
    root-owned files - which is the default for real world GNOME
    installations.  We end up doing twice the syscall traffic with no
    benefit at all.
    
    The patch does work in jhbuild, but honestly the relatime handling is
    generally OK for this, and where it's not, change your system to mount
    O_NOATIME.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708453

 .gitmodules                                |    3 ---
 autogen.sh                                 |    7 -------
 configure.ac                               |    1 -
 docs/reference/gnome-desktop3/Makefile.am  |    1 -
 libgnome-desktop/Makefile.am               |   14 --------------
 libgnome-desktop/gnome-desktop-thumbnail.c |   22 +++++++---------------
 libgnome-desktop/libgsystem                |    1 -
 7 files changed, 7 insertions(+), 42 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 5e4c4f6..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "libgnome-desktop/libgsystem"]
-       path = libgnome-desktop/libgsystem
-       url = git://git.gnome.org/libgsystem
diff --git a/autogen.sh b/autogen.sh
index f4fcbd8..b305efa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,11 +20,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-# Fetch submodules if needed
-if test ! -f libgnome-desktop/libgsystem/README; then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 5f173c2..2656762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,6 @@ AC_CHECK_LIB([rt], [clock_gettime], [LIBRT="-lrt"], [LIBRT=""])
 AC_SUBST(LIBRT)
 
 AC_CHECK_FUNCS([openat])
-AM_CONDITIONAL([USE_LIBGSYSTEM], [test x$ac_cv_func_openat = xyes])
 
 dnl we need x11 for GnomeBG
 
diff --git a/docs/reference/gnome-desktop3/Makefile.am b/docs/reference/gnome-desktop3/Makefile.am
index d4f0779..65d0100 100644
--- a/docs/reference/gnome-desktop3/Makefile.am
+++ b/docs/reference/gnome-desktop3/Makefile.am
@@ -48,7 +48,6 @@ CFILE_GLOB=$(top_srcdir)/libgnome-desktop/*.c
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES= \
-       libgsystem \
        meta-dbus-idle-monitor.h \
        meta-dbus-xrandr.h \
        meta-xrandr-shared.h
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 2389eb1..d6cac82 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -7,7 +7,6 @@ lib_LTLIBRARIES = libgnome-desktop-3.la
 
 AM_CPPFLAGS =                                                  \
        -I$(top_srcdir)                                         \
-       -I$(srcdir)/libgsystem                                  \
        $(GNOME_DESKTOP_CFLAGS)                                 \
        $(XLIB_CFLAGS)                                          \
        -DG_LOG_DOMAIN=\"GnomeDesktop\"                         \
@@ -20,15 +19,6 @@ AM_CPPFLAGS =                                                        \
 
 AM_CFLAGS = $(WARN_CFLAGS)
 
-if USE_LIBGSYSTEM
-libgsystem_srcpath := libgsystem
-libgsystem_cflags = $(GNOME_DESKTOP_CFLAGS)
-libgsystem_libs = $(GNOME_DESKTOP_LIBS)
-include libgsystem/Makefile-libgsystem.am
-
-noinst_LTLIBRARIES += libgsystem.la
-endif
-
 introspection_sources =                \
        gnome-desktop-thumbnail.c       \
        gnome-thumbnail-pixbuf-utils.c  \
@@ -84,10 +74,6 @@ libgnome_desktop_3_la_LIBADD =       \
        $(LIBRT)                \
        $(NULL)
 
-if USE_LIBGSYSTEM
-libgnome_desktop_3_la_LIBADD += libgsystem.la
-endif
-
 libgnome_desktop_3_la_LDFLAGS = \
        -version-info $(LT_VERSION) \
        -export-symbols-regex "^gnome_.*" \
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
index 7a1963b..fa1904b 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
@@ -145,9 +145,6 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include "gnome-desktop-thumbnail.h"
 #include <glib/gstdio.h>
-#ifdef HAVE_OPENAT
-#include <libgsystem.h>
-#endif
 
 #define SECONDS_BETWEEN_STATS 10
 
@@ -487,18 +484,13 @@ _gdk_pixbuf_new_from_uri_at_scale (const char *uri,
     }
 
     if (input_stream == NULL) {
-#ifdef HAVE_OPENAT
-        if (g_file_is_native (file))
-            input_stream = gs_file_read_noatime (file, NULL, &error);
-        else
-#endif
-            input_stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
-        if (input_stream == NULL) {
-            g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
-            g_clear_error (&error);
-            g_object_unref (file);
-            return NULL;
-        }
+           input_stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+           if (input_stream == NULL) {
+                   g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
+                   g_clear_error (&error);
+                   g_object_unref (file);
+                   return NULL;
+           }
     }
 
     has_frame = FALSE;