michael@454: Index: Makefile.in
michael@454: --- Makefile.in.orig	2012-05-15 00:09:32.000000000 +0200
michael@454: +++ Makefile.in	2012-07-13 20:35:15.000000000 +0200
michael@769: @@ -820,7 +820,7 @@
michael@769:  
michael@769:  @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
michael@454:  ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
michael@769: -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
michael@454: +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
michael@454:  DIST_SUBDIRS = $(SUBDIRS) build
michael@454:  bin_SCRIPTS = glib-gettextize
michael@454:  AM_CPPFLAGS = \
michael@454: Index: gio/Makefile.in
michael@454: --- gio/Makefile.in.orig	2012-05-15 00:09:29.000000000 +0200
michael@454: +++ gio/Makefile.in	2012-07-13 20:35:15.000000000 +0200
michael@769: @@ -798,8 +798,7 @@
michael@769:      *) \
michael@769:        b='$*';; \
michael@769:    esac
michael@769: -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
michael@769: -	tests fam
michael@769: +DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . fam
michael@454:  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
michael@454:  am__relativize = \
michael@454:    dir0=`pwd`; \
michael@769: @@ -1172,8 +1171,8 @@
michael@769:  @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
michael@769:  
michael@769:  @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
michael@769: -SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
michael@769: -	$(am__append_22) $(am__append_26) $(am__append_29) . tests \
michael@769: +SUBDIRS = $(am__append_15) $(am__append_19) \
michael@769: +	$(am__append_22) $(am__append_26) $(am__append_29) . \
michael@769:  	$(am__append_32)
michael@454:  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
michael@454:  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
michael@454: Index: gio/glib-compile-schemas.c
michael@454: --- gio/glib-compile-schemas.c.orig	2012-04-13 15:39:41.000000000 +0200
michael@454: +++ gio/glib-compile-schemas.c	2012-07-13 20:35:15.000000000 +0200
michael@769: @@ -1534,7 +1534,7 @@
michael@454:  }
michael@454:  /* Text {{{2 */
michael@454:  static void
michael@454: -text (GMarkupParseContext  *context,
michael@454: +XXXtext (GMarkupParseContext  *context,
michael@454:        const gchar          *text,
michael@454:        gsize                 text_len,
michael@454:        gpointer              user_data,
michael@769: @@ -1699,7 +1699,7 @@
michael@454:  parse_gschema_files (gchar    **files,
michael@454:                       gboolean   strict)
michael@454:  {
michael@454: -  GMarkupParser parser = { start_element, end_element, text };
michael@454: +  GMarkupParser parser = { start_element, end_element, XXXtext };
michael@454:    ParseState state = { 0, };
michael@454:    const gchar *filename;
michael@454:    GError *error = NULL;
michael@454: Index: gio/tests/gdbus-peer.c
michael@454: --- gio/tests/gdbus-peer.c.orig	2012-05-14 23:58:01.000000000 +0200
michael@454: +++ gio/tests/gdbus-peer.c	2012-07-13 20:35:15.000000000 +0200
michael@454: @@ -39,6 +39,8 @@
michael@454:  #include <gio/gunixsocketaddress.h>
michael@454:  #include <gio/gunixfdlist.h>
michael@454:  
michael@454: +#include <sys/socket.h>
michael@454: +
michael@454:  #ifdef G_OS_UNIX
michael@454:  #include <gio/gunixconnection.h>
michael@769:  #include <errno.h>
michael@454: Index: gio/xdgmime/xdgmimecache.h
michael@454: --- gio/xdgmime/xdgmimecache.h.orig	2011-08-16 02:51:30.000000000 +0200
michael@454: +++ gio/xdgmime/xdgmimecache.h	2012-07-13 20:35:15.000000000 +0200
michael@454: @@ -46,6 +46,9 @@
michael@454:  #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
michael@454:  #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
michael@454:  #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
michael@454: +#define _xdg_mime_cache_is_valid_mime_type            XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
michael@454: +#define _xdg_mime_cache_mime_type_equal               XDG_RESERVED_ENTRY(cache_mime_type_equal)
michael@454: +#define _xdg_mime_cache_media_type_equal              XDG_RESERVED_ENTRY(cache_media_type_equal)
michael@454:  #endif
michael@454:  
michael@454:  extern XdgMimeCache **_caches;
michael@454: Index: glib/gatomic.c
michael@454: --- glib/gatomic.c.orig	2012-03-12 01:42:41.000000000 +0100
michael@454: +++ glib/gatomic.c	2012-07-13 20:35:15.000000000 +0200
michael@454: @@ -21,6 +21,7 @@
michael@454:  
michael@454:  #include "config.h"
michael@454:  
michael@454: +#include "gthread.h"
michael@454:  #include "gatomic.h"
michael@454:  
michael@454:  /**
michael@273: Index: gmodule/gmodule-dl.c
michael@454: --- gmodule/gmodule-dl.c.orig	2011-08-16 02:51:30.000000000 +0200
michael@454: +++ gmodule/gmodule-dl.c	2012-07-13 20:35:15.000000000 +0200
michael@273: @@ -107,6 +107,7 @@
michael@273:  static gpointer
michael@273:  _g_module_self (void)
michael@273:  {
michael@273: +#ifndef __FreeBSD__
michael@273:    gpointer handle;
michael@273:    
michael@273:    /* to query symbols from the program itself, special link options
michael@769: @@ -122,6 +123,9 @@
michael@273:      g_module_set_error (fetch_dlerror (TRUE));
michael@273:    
michael@273:    return handle;
michael@273: +#else
michael@273: +  return RTLD_DEFAULT;
michael@273: +#endif
michael@273:  }
michael@273:  
michael@273:  static void
michael@455: diff -Nau gio/gsocket.c.orig gio/gsocket.c
michael@455: Index: gio/gsocket.c
michael@455: --- gio/gsocket.c.orig	2012-08-03 11:38:08.419548195 +0200
michael@455: +++ gio/gsocket.c	2012-08-03 11:38:11.307357875 +0200
michael@769: @@ -52,6 +52,10 @@
michael@455:  #include <sys/uio.h>
michael@455:  #endif
michael@455:  
michael@455: +#if defined (__SVR4) && defined (__sun)
michael@455: +#include <sys/filio.h>
michael@455: +#endif
michael@455: +
michael@455:  #include "gcancellable.h"
michael@455:  #include "gioenumtypes.h"
michael@455:  #include "ginetaddress.h"
michael@455: diff -Nau gio/gresource-tool.c.orig gio/gresource-tool.c
michael@455: Index: gio/gresource-tool.c
michael@455: --- gio/gresource-tool.c.orig	2012-08-03 11:25:31.632225248 +0200
michael@455: +++ gio/gresource-tool.c	2012-08-03 11:38:12.657797557 +0200
michael@455: @@ -31,6 +31,11 @@
michael@455:  #include <locale.h>
michael@455:  
michael@455:  #ifdef HAVE_LIBELF
michael@455: +/* Solaris libelf does not support largefile in 32-bit mode */
michael@455: +#if defined (__SVR4) && defined (__sun) && defined (__i386)
michael@455: +#undef  _FILE_OFFSET_BITS
michael@455: +#define _FILE_OFFSET_BITS   32
michael@455: +#endif
michael@455:  #include <libelf.h>
michael@455:  #include <gelf.h>
michael@455:  #include <sys/mman.h>
michael@769: diff -Nau gio/glocalfile.c.orig gio/glocalfile.c
michael@769: Index: gio/glocalfile.c.orig
michael@769: --- gio/glocalfile.c.orig	2013-06-16 16:34:39.000000000 +0200
michael@769: +++ gio/glocalfile.c	2013-06-30 22:51:06.165031107 +0200
michael@769: @@ -2427,6 +2427,7 @@
michael@769:  is_remote_fs (const gchar *filename)
michael@769:  {
michael@769:    const char *fsname = NULL;
michael@769: +  int statfs_result = 0;
michael@769:  
michael@769:  #ifdef USE_STATFS
michael@769:    struct statfs statfs_buffer;