$NetBSD: patch-an,v 1.19 2018/08/19 18:32:27 wiz Exp $

- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
- Don't compile tests as they include gdbus-codegen tests.
- Don't install completion data.
- Re-enable gdesktopappinfo on Darwin.

--- gio/Makefile.in.orig	2018-08-17 00:27:41.000000000 +0000
+++ gio/Makefile.in
@@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2)
 @HAVE_FAM_TRUE@am__append_27 = fam
 @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la
 @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
+@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \
 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@	gnetworkmonitornetlink.c \
 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@	gnetworkmonitornetlink.h \
@@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2)
 @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h
 @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c
 @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
+@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
+@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__append_37 = \
 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@	gcocoanotificationbackend.c
 
@@ -205,7 +205,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
 
 # ------------------------------------------------------------------------
 # gapplication(1) tool
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gapplication
+@OS_UNIX_TRUE@am__append_46 = gapplication
 subdir = gio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
@@ -231,7 +231,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gnetworking.h gio.rc
 CONFIG_CLEAN_VPATH_FILES =
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(installed_testdir)" \
 	"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" \
@@ -535,11 +535,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
 	libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
 	$(am__objects_4) $(am__objects_1)
 @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
+@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
 am__objects_8 = $(am__objects_6) $(am__objects_7)
 @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 =  \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	libgio_2_0_la-gcontenttype.lo
+@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo
 am__objects_11 = $(am__objects_9) $(am__objects_10)
 am__objects_12 = libgio_2_0_la-xdp-dbus.lo
 am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \
@@ -603,13 +602,10 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l
 	$(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
 libgio_objc_2_0_la_LIBADD =
 am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \
-	gosxcontenttype.c gosxappinfo.c gosxappinfo.h \
 	gcocoanotificationbackend.c
 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__objects_23 = libgio_objc_2_0_la-gcocoanotificationbackend.lo
 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS =  \
 @OS_COCOA_TRUE@	libgio_objc_2_0_la-gnextstepsettingsbackend.lo \
-@OS_COCOA_TRUE@	libgio_objc_2_0_la-gosxcontenttype.lo \
-@OS_COCOA_TRUE@	libgio_objc_2_0_la-gosxappinfo.lo \
 @OS_COCOA_TRUE@	$(am__objects_23)
 libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS)
 libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -618,15 +614,15 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A
 	$(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath =
 am__gapplication_SOURCES_DIST = gapplication-tool.c
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	gapplication-tool.$(OBJEXT)
+@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
+@OS_UNIX_TRUE@	gapplication-tool.$(OBJEXT)
 gapplication_OBJECTS = $(am_gapplication_OBJECTS)
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	libgio-2.0.la \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/gobject/libgobject-2.0.la \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la \
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(am__DEPENDENCIES_1)
+@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
+@OS_UNIX_TRUE@	libgio-2.0.la \
+@OS_UNIX_TRUE@	$(top_builddir)/gobject/libgobject-2.0.la \
+@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la \
+@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la \
+@OS_UNIX_TRUE@	$(am__DEPENDENCIES_1)
 am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
 gdbus_OBJECTS = $(am_gdbus_OBJECTS)
 gdbus_DEPENDENCIES = libgio-2.0.la \
@@ -1189,8 +1185,7 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \
-	fam
+DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
 	$(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
 	$(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
@@ -1294,6 +1289,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 G_LIBS_EXTRA = @G_LIBS_EXTRA@
+G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@
 G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@
 G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@
 G_MODULE_IMPL = @G_MODULE_IMPL@
@@ -1571,8 +1567,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
 @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
 
 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \
-	$(am__append_21) $(am__append_24) . tests $(am__append_27)
+SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \
+	$(am__append_24) . $(am__append_27)
 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
 AM_CPPFLAGS = \
@@ -2036,8 +2032,8 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
 @OS_COCOA_TRUE@libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
 @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
 @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES =  \
-@OS_COCOA_TRUE@	gnextstepsettingsbackend.c gosxcontenttype.c \
-@OS_COCOA_TRUE@	gosxappinfo.c gosxappinfo.h $(am__append_37)
+@OS_COCOA_TRUE@	gnextstepsettingsbackend.c \
+@OS_COCOA_TRUE@	$(am__append_37)
 EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
 gio_headers = \
 	gappinfo.h 		\
@@ -2206,12 +2202,12 @@ gdbus_LDADD = libgio-2.0.la 				\
 	$(top_builddir)/glib/libglib-2.0.la		\
 	$(NULL)
 
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la 			\
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/gobject/libgobject-2.0.la	\
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la 	\
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la		\
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(NULL)
+@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
+@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la 			\
+@OS_UNIX_TRUE@	$(top_builddir)/gobject/libgobject-2.0.la	\
+@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la 	\
+@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la		\
+@OS_UNIX_TRUE@	$(NULL)
 
 completiondir = $(datadir)/bash-completion/completions
 completion_DATA = \
@@ -2877,8 +2873,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ # am--include-marker
 
@@ -4459,20 +4453,6 @@ libgio_objc_2_0_la-gnextstepsettingsback
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gnextstepsettingsbackend.lo `test -f 'gnextstepsettingsbackend.c' || echo '$(srcdir)/'`gnextstepsettingsbackend.c
 
-libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxcontenttype.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c
-
-libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gosxappinfo.c' object='libgio_objc_2_0_la-gosxappinfo.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
-
 libgio_objc_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_objc_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo
