Ticket #53911: glib2-gtk3-select-appinfo-impl.patch

File glib2-gtk3-select-appinfo-impl.patch, 40.7 KB (added by Ionic (Mihai Moldovan), 7 years ago)

Make appinfo implementation selectible, fix errors caused by missing header files and switch to using the "generic" freedesktop-based implementation when building for X11.

  • devel/glib2-devel/Portfile 

    diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
index 13e9d5cb33..b2d2cfe905 100644
    a b name glib2-devel 
    99conflicts                   glib2
    1010set my_name                 glib
    1111version                     2.52.0
     12revision                    1
    1213set branch                  [join [lrange [split ${version} .] 0 1] .]
    1314categories                  devel
    1415maintainers                 {ryandesign @ryandesign} openmaintainer
    … … patchfiles patch-configure.diff \ 
    4142                            patch-gio_xdgmime_xdgmime.c.diff \
    4243                            patch-gio_gdbusprivate.c.diff \
    4344                            patch-get-launchd-dbus-session-address.diff \
    44                             patch-gmodule-gmodule-dl.c.diff
     45                            patch-gmodule-gmodule-dl.c.diff \
     46                            patch-configure-switch-for-gappinfo-impl-mp.diff
    4547
    4648depends_build               bin:xmllint:libxml2
    4749
    … … post-patch { 
    9294}
    9395
    9496pre-configure {
     97    if {![variant_isset quartz] && ![variant_isset x11]} {
     98        error "Either +x11 or +quartz is required"
     99    }
     100
    95101    set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
    96102    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
    97103                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
    … … platform darwin 8 { 
    124130    configure.python        ${prefix}/bin/python2.7
    125131}
    126132
     133variant quartz conflicts x11 {
     134    configure.args-append   --with-appinfo-impl=native
     135}
     136
     137variant x11 conflicts quartz {
     138    configure.args-append   --with-appinfo-impl=generic
     139}
     140
     141if {![variant_isset quartz]} {
     142    default_variants +x11
     143}
     144
    127145livecheck.type              gnome-with-unstable
    128146livecheck.name              ${my_name}

  • new file devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff 

    diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
new file mode 100644
index 0000000000..ce27df10f1
    - +  
     1This file includes a patch to support switching between native and generic
     2application information interfaces.
     3
     4The native interfaced is used for Quartz-based builds of GTK+ and uses
     5application bundle information, while the generic interface is the freedesktop
     6implementation working with standard .desktop files.
     7
     8Both options are mutually exclusive, as glib (so far) only supports one
     9specific implementation that must be compiled and linked statically into the
     10shared library at build time.
     11
     12For X11 builds of glib (our default), we want to support .desktop files.
     13
     14IMPORTANT: this file includes only changes as generated after running
     15           autoreconf, but not to the automake/autoconf templates
     16           (configure.ac, Makefile.am), since we cannot easily use
     17           autoreconf in MacPorts due to other patches changing the
     18           generated configure script directly.
     19           Any such changes after the patch phase would be overwritten by
     20           re-generating configure.
     21           If you intend to change this patch, follow these steps:
     22             - run NOCONFIGURE=1 ./autogen.sh
     23             - copy the source directory as glib-...-old
     24             - apply patch-configure-switch-for-gappinfo-impl.diff
     25             - make any changes necessary, but ONLY to files that are being
     26               used by autoconf/automake/libtool to generate other files
     27               (e.g., configure.ac, Makefile.am) - do not edit configure or
     28               Makefile.in manually!
     29             - run NOCONFIGURE=1 ./autogen.sh again
     30             - diff against glib-...-old and save as
     31               patch-configure-switch-for-gappinfo-impl-mp.diff
     32             - *move* any changes to files used by autoconf/automake to
     33               patch-configure-switch-for-gappinfo-impl.diff, so that
     34               the new patch-configure-switch-for-gappinfo-impl-mp.diff file
     35               only includes generated changes
     36
     37WARNING: changes to autoconf.ac will lead to the build system trying to
     38         re-generate and re-run the configure script, which will OVERWRITE
     39         MacPorts-specific changes!
     40
     41--- config.h.in.old     2017-04-04 13:18:10.000000000 +0200
     42+++ config.h.in 2017-04-04 13:31:31.000000000 +0200
     43@@ -696,6 +696,13 @@
     44 /* Use w32 threads */
     45 #undef THREADS_WIN32
     46 
     47+/* Prefer the generic (freedesktop-based) application information
     48+   implementation */
     49+#undef USE_APPINFO_GENERIC
     50+
     51+/* Prefer the native application information implementation */
     52+#undef USE_APPINFO_NATIVE
     53+
     54 /* Using GNU libiconv */
     55 #undef USE_LIBICONV_GNU
     56 
     57--- configure.old       2017-04-04 13:18:07.000000000 +0200
     58+++ configure   2017-04-04 13:31:28.000000000 +0200
     59@@ -722,6 +722,10 @@ LIBMOUNT_LIBS
     60 LIBMOUNT_CFLAGS
     61 LIBELF_LIBS
     62 LIBELF_CFLAGS
     63+APPINFO_IMPL_GENERIC_FALSE
     64+APPINFO_IMPL_GENERIC_TRUE
     65+APPINFO_IMPL_NATIVE_FALSE
     66+APPINFO_IMPL_NATIVE_TRUE
     67 XATTR_LIBS
     68 HAVE_FAM_FALSE
     69 HAVE_FAM_TRUE
     70@@ -998,6 +1002,7 @@ with_gio_module_dir
     71 enable_selinux
     72 enable_fam
     73 enable_xattr
     74+with_appinfo_impl
     75 enable_libelf
     76 enable_libmount
     77 with_threads
     78@@ -1730,6 +1735,8 @@ Optional Packages:
     79   --with-gio-module-dir=DIR
     80                           load gio modules from this directory
     81                           [LIBDIR/gio/modules]
     82+  --appinfo-impl=[native/generic]
     83+                          use appinfo implementation [native]
     84   --with-threads=[posix/win32]
     85                           specify a thread implementation to use
     86   --with-pcre=[internal/system]
     87@@ -26104,6 +26111,49 @@ fi
     88 fi
     89 
     90 
     91+
     92+# Check whether --with-appinfo-impl was given.
     93+if test "${with_appinfo_impl+set}" = set; then :
     94+  withval=$with_appinfo_impl;
     95+else
     96+  with_appinfo_impl='native'
     97+fi
     98+
     99+
     100+if test "$with_appinfo_impl" != "native" && test "$with_appinfo_impl" != "generic"; then
     101+  with_appinfo_impl="native"
     102+fi
     103+
     104+ if test "$with_appinfo_impl" = "native"; then
     105+  APPINFO_IMPL_NATIVE_TRUE=
     106+  APPINFO_IMPL_NATIVE_FALSE='#'
     107+else
     108+  APPINFO_IMPL_NATIVE_TRUE='#'
     109+  APPINFO_IMPL_NATIVE_FALSE=
     110+fi
     111+
     112+ if test "$with_appinfo_impl" = "generic"; then
     113+  APPINFO_IMPL_GENERIC_TRUE=
     114+  APPINFO_IMPL_GENERIC_FALSE='#'
     115+else
     116+  APPINFO_IMPL_GENERIC_TRUE='#'
     117+  APPINFO_IMPL_GENERIC_FALSE=
     118+fi
     119+
     120+
     121+case $with_appinfo_impl in
     122+  native)
     123+
     124+$as_echo "#define USE_APPINFO_NATIVE 1" >>confdefs.h
     125+
     126+    ;;
     127+  generic)
     128+
     129+$as_echo "#define USE_APPINFO_GENERIC 1" >>confdefs.h
     130+
     131+    ;;
     132+esac
     133+
     134 # Check whether --enable-libelf was given.
     135 if test "${enable_libelf+set}" = set; then :
     136   enableval=$enable_libelf;
     137@@ -29506,6 +29556,14 @@ if test -z "${HAVE_FAM_TRUE}" && test -z
     138   as_fn_error $? "conditional \"HAVE_FAM\" was never defined.
     139 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     140 fi
     141+if test -z "${APPINFO_IMPL_NATIVE_TRUE}" && test -z "${APPINFO_IMPL_NATIVE_FALSE}"; then
     142+  as_fn_error $? "conditional \"APPINFO_IMPL_NATIVE\" was never defined.
     143+Usually this means the macro was only invoked conditionally." "$LINENO" 5
     144+fi
     145+if test -z "${APPINFO_IMPL_GENERIC_TRUE}" && test -z "${APPINFO_IMPL_GENERIC_FALSE}"; then
     146+  as_fn_error $? "conditional \"APPINFO_IMPL_GENERIC\" was never defined.
     147+Usually this means the macro was only invoked conditionally." "$LINENO" 5
     148+fi
     149 if test -z "${HAVE_LIBMOUNT_TRUE}" && test -z "${HAVE_LIBMOUNT_FALSE}"; then
     150   as_fn_error $? "conditional \"HAVE_LIBMOUNT\" was never defined.
     151 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     152--- gio/Makefile.in.old 2017-04-04 13:18:18.000000000 +0200
     153+++ gio/Makefile.in     2017-04-04 13:31:37.000000000 +0200
     154@@ -160,55 +160,65 @@ TESTS = $(am__EXEEXT_2)
     155 @ENABLE_INSTALLED_TESTS_TRUE@  $(dist_installed_test_data)
     156 @ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
     157 @ENABLE_INSTALLED_TESTS_TRUE@am__append_14 = $(installed_test_meta_DATA)
     158-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_15 = xdgmime
     159-@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_16 = gio-2.0.lib
     160-@OS_WIN32_TRUE@am__append_17 = $(win32_settings_sources)
     161-@OS_COCOA_TRUE@am__append_18 = $(cocoa_settings_sources)
     162-@HAVE_INOTIFY_TRUE@am__append_19 = inotify
     163-@HAVE_INOTIFY_TRUE@am__append_20 = inotify/libinotify.la
     164+@APPINFO_IMPL_GENERIC_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_15 = xdgmime
     165+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_16 = xdgmime
     166+@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_17 = gio-2.0.lib
     167+@OS_WIN32_TRUE@am__append_18 = $(win32_settings_sources)
     168+@OS_COCOA_TRUE@am__append_19 = $(cocoa_settings_sources)
     169+@HAVE_INOTIFY_TRUE@am__append_20 = inotify
     170 @HAVE_INOTIFY_TRUE@am__append_21 = inotify/libinotify.la
     171-@HAVE_KQUEUE_TRUE@am__append_22 = kqueue
     172-@HAVE_KQUEUE_TRUE@am__append_23 = kqueue/libkqueue.la
     173+@HAVE_INOTIFY_TRUE@am__append_22 = inotify/libinotify.la
     174+@HAVE_KQUEUE_TRUE@am__append_23 = kqueue
     175 @HAVE_KQUEUE_TRUE@am__append_24 = kqueue/libkqueue.la
     176-@OS_WIN32_TRUE@am__append_25 = win32
     177-@OS_WIN32_TRUE@am__append_26 = win32/libgiowin32.la
     178+@HAVE_KQUEUE_TRUE@am__append_25 = kqueue/libkqueue.la
     179+@OS_WIN32_TRUE@am__append_26 = win32
     180 @OS_WIN32_TRUE@am__append_27 = win32/libgiowin32.la
     181-@HAVE_FAM_TRUE@am__append_28 = fam
     182-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
     183-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
     184-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
     185-@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
     186-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
     187+@OS_WIN32_TRUE@am__append_28 = win32/libgiowin32.la
     188+@HAVE_FAM_TRUE@am__append_29 = fam
     189+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_30 = gosxappinfo.h
     190+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
     191+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = xdgmime/libxdgmime.la
     192+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_33 = gdesktopappinfo.h
     193+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_34 = xdgmime/libxdgmime.la
     194+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = xdgmime/libxdgmime.la
     195+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.h
     196+@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_37 = gcocoanotificationbackend.c
     197+@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_38 = \
     198 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      gnetworkmonitornetlink.c \
     199 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      gnetworkmonitornetlink.h \
     200 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      gnetworkmonitornm.c      \
     201 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      gnetworkmonitornm.h      \
     202 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      $(NULL)
     203 
     204-@OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
     205-@OS_WIN32_TRUE@am__append_35 = gcontenttype-win32.c
     206-@OS_WIN32_TRUE@am__append_36 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
     207-@OS_COCOA_TRUE@am__append_37 = gosxcontenttype.c
     208-@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
     209-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
     210-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
     211+@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_39 = gwin32appinfo.h
     212+@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_40 = gwin32appinfo.c
     213+@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_41 = gdesktopappinfo.h
     214+@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_42 = gdesktopappinfo.c
     215+@OS_WIN32_TRUE@am__append_43 = gcontenttype-win32.c
     216+@OS_WIN32_TRUE@am__append_44 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
     217+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_45 = gosxcontenttype.c
     218+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_46 = gosxappinfo.c
     219+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_47 = gcontenttype.c
     220+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_48 = gdesktopappinfo.c
     221+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gcontenttype.c
     222+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_50 = gdesktopappinfo.c
     223 
     224 # This is dumb.  The ObjC source file should be properly named .m
     225-@OS_COCOA_TRUE@am__append_41 = -xobjective-c
     226-@OS_COCOA_TRUE@am__append_42 = -Wl,-framework,Foundation -Wl,-framework,AppKit
     227-@HAVE_LIBMOUNT_TRUE@am__append_43 = $(LIBMOUNT_CFLAGS)
     228-@HAVE_LIBMOUNT_TRUE@am__append_44 = $(LIBMOUNT_LIBS)
     229+@OS_COCOA_TRUE@am__append_51 = -xobjective-c
     230+@OS_COCOA_TRUE@am__append_52 = -Wl,-framework,Foundation -Wl,-framework,AppKit
     231+@HAVE_LIBMOUNT_TRUE@am__append_53 = $(LIBMOUNT_CFLAGS)
     232+@HAVE_LIBMOUNT_TRUE@am__append_54 = $(LIBMOUNT_LIBS)
     233 bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
     234        glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
     235        gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT) gio$(EXEEXT)
     236-@ENABLE_DTRACE_TRUE@am__append_45 = gio_probes.h gio_probes.lo
     237-@ENABLE_DTRACE_TRUE@am__append_46 = gio_probes.h gio_probes.h.tmp
     238-@ENABLE_DTRACE_TRUE@am__append_47 = gio_probes.lo
     239-@ENABLE_SYSTEMTAP_TRUE@am__append_48 = $(tapset_DATA)
     240+@ENABLE_DTRACE_TRUE@am__append_55 = gio_probes.h gio_probes.lo
     241+@ENABLE_DTRACE_TRUE@am__append_56 = gio_probes.h gio_probes.h.tmp
     242+@ENABLE_DTRACE_TRUE@am__append_57 = gio_probes.lo
     243+@ENABLE_SYSTEMTAP_TRUE@am__append_58 = $(tapset_DATA)
     244 
     245 # ------------------------------------------------------------------------
     246 # gapplication(1) tool
     247-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gapplication
     248+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_59 = gapplication
     249 subdir = gio
     250 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     251 am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
     252@@ -273,8 +283,9 @@ am__installdirs = "$(DESTDIR)$(installed
     253 LTLIBRARIES = $(installed_test_LTLIBRARIES) $(lib_LTLIBRARIES) \
     254        $(noinst_LTLIBRARIES)
     255 am__DEPENDENCIES_1 =
     256-am__DEPENDENCIES_2 = $(am__append_20) $(am__append_23) \
     257-       $(am__append_26) $(am__append_29) $(am__DEPENDENCIES_1)
     258+am__DEPENDENCIES_2 = $(am__append_21) $(am__append_24) \
     259+       $(am__append_27) $(am__append_31) $(am__append_34) \
     260+       $(am__DEPENDENCIES_1)
     261 @HAVE_LIBMOUNT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
     262 am__libgio_2_0_la_SOURCES_DIST = gappinfo.c gappinfoprivate.h \
     263        gasynchelper.c gasynchelper.h gasyncinitable.c gasyncresult.c \
     264@@ -359,25 +370,25 @@ am__libgio_2_0_la_SOURCES_DIST = gappinf
     265        glocalvfs.h gsocks4proxy.c gsocks4proxy.h gsocks4aproxy.c \
     266        gsocks4aproxy.h gsocks5proxy.c gsocks5proxy.h \
     267        thumbnail-verify.h thumbnail-verify.c gwin32appinfo.c \
     268-       gwin32appinfo.h gosxappinfo.c gosxappinfo.h gdesktopappinfo.c \
     269-       gcontenttype-win32.c gosxcontenttype.c gcontenttype.c \
     270-       gfiledescriptorbased.c gunixconnection.c \
     271-       gunixcredentialsmessage.c gunixfdlist.c gunixfdmessage.c \
     272-       gunixmount.c gunixmount.h gunixmounts.c gunixsocketaddress.c \
     273-       gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
     274-       gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
     275-       gcontenttypeprivate.h gfdonotificationbackend.c \
     276-       ggtknotificationbackend.c gportalnotificationbackend.c \
     277-       gdocumentportal.c gdocumentportal.h gportalsupport.c \
     278-       gportalsupport.h gnetworkmonitorportal.c \
     279-       gnetworkmonitorportal.h gproxyresolverportal.c \
     280-       gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \
     281-       gcocoanotificationbackend.c gnetworkmonitornetlink.c \
     282-       gnetworkmonitornetlink.h gnetworkmonitornm.c \
     283-       gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
     284-       gdbus-daemon-generated.c gdbus-daemon-generated.h \
     285-       gwin32registrykey.c gwin32registrykey.h gwin32mount.c \
     286-       gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
     287+       gdesktopappinfo.c gosxappinfo.c gcontenttype-win32.c \
     288+       gosxcontenttype.c gcontenttype.c gfiledescriptorbased.c \
     289+       gunixconnection.c gunixcredentialsmessage.c gunixfdlist.c \
     290+       gunixfdmessage.c gunixmount.c gunixmount.h gunixmounts.c \
     291+       gunixsocketaddress.c gunixvolume.c gunixvolume.h \
     292+       gunixvolumemonitor.c gunixvolumemonitor.h gunixinputstream.c \
     293+       gunixoutputstream.c gcontenttypeprivate.h \
     294+       gfdonotificationbackend.c ggtknotificationbackend.c \
     295+       gportalnotificationbackend.c gdocumentportal.c \
     296+       gdocumentportal.h gportalsupport.c gportalsupport.h \
     297+       gnetworkmonitorportal.c gnetworkmonitorportal.h \
     298+       gproxyresolverportal.c gproxyresolverportal.h xdp-dbus.c \
     299+       xdp-dbus.h gcocoanotificationbackend.c \
     300+       gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
     301+       gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
     302+       gdbusdaemon.h gdbus-daemon-generated.c \
     303+       gdbus-daemon-generated.h gwin32registrykey.c \
     304+       gwin32registrykey.h gwin32mount.c gwin32mount.h \
     305+       gwin32volumemonitor.c gwin32volumemonitor.h \
     306        gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
     307        gwin32networking.h gvdb/gvdb-format.h gvdb/gvdb-reader.h \
     308        gvdb/gvdb-reader.c gdelayedsettingsbackend.h \
     309@@ -523,24 +534,29 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
     310        libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
     311        libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
     312        $(am__objects_4) $(am__objects_1)
     313-@OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
     314-@OS_COCOA_TRUE@am__objects_7 = libgio_2_0_la-gosxappinfo.lo
     315-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gdesktopappinfo.lo
     316-am__objects_9 = $(am__objects_6) $(am__objects_7) $(am__objects_8)
     317-@OS_WIN32_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype-win32.lo
     318-@OS_COCOA_TRUE@am__objects_11 = libgio_2_0_la-gosxcontenttype.lo
     319-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_12 =  \
     320+@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
     321+@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
     322+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gosxappinfo.lo
     323+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_9 = libgio_2_0_la-gdesktopappinfo.lo
     324+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gdesktopappinfo.lo
     325+am__objects_11 = $(am__objects_6) $(am__objects_7) $(am__objects_8) \
     326+       $(am__objects_9) $(am__objects_10)
     327+@OS_WIN32_TRUE@am__objects_12 = libgio_2_0_la-gcontenttype-win32.lo
     328+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_13 = libgio_2_0_la-gosxcontenttype.lo
     329+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_14 = libgio_2_0_la-gcontenttype.lo
     330+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_15 =  \
     331 @OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo
     332-am__objects_13 = $(am__objects_10) $(am__objects_11) $(am__objects_12)
     333-am__objects_14 = libgio_2_0_la-xdp-dbus.lo
     334-am__objects_15 = libgio_2_0_la-gnetworkmonitorportal.lo \
     335-       libgio_2_0_la-gproxyresolverportal.lo $(am__objects_14) \
     336+am__objects_16 = $(am__objects_12) $(am__objects_13) $(am__objects_14) \
     337+       $(am__objects_15)
     338+am__objects_17 = libgio_2_0_la-xdp-dbus.lo
     339+am__objects_18 = libgio_2_0_la-gnetworkmonitorportal.lo \
     340+       libgio_2_0_la-gproxyresolverportal.lo $(am__objects_17) \
     341        $(am__objects_1)
     342-@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_16 = libgio_2_0_la-gcocoanotificationbackend.lo
     343-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_17 = libgio_2_0_la-gnetworkmonitornetlink.lo \
     344+@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_19 = libgio_2_0_la-gcocoanotificationbackend.lo
     345+@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_20 = libgio_2_0_la-gnetworkmonitornetlink.lo \
     346 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      libgio_2_0_la-gnetworkmonitornm.lo \
     347 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@      $(am__objects_1)
     348-@OS_UNIX_TRUE@am__objects_18 = libgio_2_0_la-gfiledescriptorbased.lo \
     349+@OS_UNIX_TRUE@am__objects_21 = libgio_2_0_la-gfiledescriptorbased.lo \
     350 @OS_UNIX_TRUE@ libgio_2_0_la-gunixconnection.lo \
     351 @OS_UNIX_TRUE@ libgio_2_0_la-gunixcredentialsmessage.lo \
     352 @OS_UNIX_TRUE@ libgio_2_0_la-gunixfdlist.lo \
     353@@ -557,17 +573,17 @@ am__objects_15 = libgio_2_0_la-gnetworkm
     354 @OS_UNIX_TRUE@ libgio_2_0_la-gportalnotificationbackend.lo \
     355 @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
     356 @OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
     357-@OS_UNIX_TRUE@ $(am__objects_15) $(am__objects_1) \
     358-@OS_UNIX_TRUE@ $(am__objects_16) $(am__objects_17)
     359-am__objects_19 = libgio_2_0_la-gdbusdaemon.lo \
     360+@OS_UNIX_TRUE@ $(am__objects_18) $(am__objects_1) \
     361+@OS_UNIX_TRUE@ $(am__objects_19) $(am__objects_20)
     362+am__objects_22 = libgio_2_0_la-gdbusdaemon.lo \
     363        libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_1)
     364-am__objects_20 = $(am__objects_19) libgio_2_0_la-gwin32registrykey.lo \
     365+am__objects_23 = $(am__objects_22) libgio_2_0_la-gwin32registrykey.lo \
     366        libgio_2_0_la-gwin32mount.lo \
     367        libgio_2_0_la-gwin32volumemonitor.lo \
     368        libgio_2_0_la-gwin32inputstream.lo \
     369        libgio_2_0_la-gwin32outputstream.lo $(am__objects_1)
     370-@OS_WIN32_TRUE@am__objects_21 = $(am__objects_20)
     371-am__objects_22 = libgio_2_0_la-gvdb-reader.lo \
     372+@OS_WIN32_TRUE@am__objects_24 = $(am__objects_23)
     373+am__objects_25 = libgio_2_0_la-gvdb-reader.lo \
     374        libgio_2_0_la-gdelayedsettingsbackend.lo \
     375        libgio_2_0_la-gkeyfilesettingsbackend.lo \
     376        libgio_2_0_la-gmemorysettingsbackend.lo \
     377@@ -575,16 +591,16 @@ am__objects_22 = libgio_2_0_la-gvdb-read
     378        libgio_2_0_la-gsettingsbackend.lo \
     379        libgio_2_0_la-gsettingsschema.lo \
     380        libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo
     381-@OS_WIN32_TRUE@am__objects_23 =  \
     382+@OS_WIN32_TRUE@am__objects_26 =  \
     383 @OS_WIN32_TRUE@        libgio_2_0_la-gregistrysettingsbackend.lo
     384-@OS_WIN32_TRUE@am__objects_24 = $(am__objects_23)
     385-@OS_COCOA_TRUE@am__objects_25 =  \
     386+@OS_WIN32_TRUE@am__objects_27 = $(am__objects_26)
     387+@OS_COCOA_TRUE@am__objects_28 =  \
     388 @OS_COCOA_TRUE@        libgio_2_0_la-gnextstepsettingsbackend.lo
     389-@OS_COCOA_TRUE@am__objects_26 = $(am__objects_25)
     390-am__objects_27 = $(am__objects_22) $(am__objects_24) $(am__objects_26)
     391-am_libgio_2_0_la_OBJECTS = $(am__objects_5) $(am__objects_9) \
     392-       $(am__objects_13) $(am__objects_18) $(am__objects_21) \
     393-       $(am__objects_27) $(am__objects_1)
     394+@OS_COCOA_TRUE@am__objects_29 = $(am__objects_28)
     395+am__objects_30 = $(am__objects_25) $(am__objects_27) $(am__objects_29)
     396+am_libgio_2_0_la_OBJECTS = $(am__objects_5) $(am__objects_11) \
     397+       $(am__objects_16) $(am__objects_21) $(am__objects_24) \
     398+       $(am__objects_30) $(am__objects_1)
     399 libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
     400 AM_V_lt = $(am__v_lt_@AM_V@)
     401 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     402@@ -723,9 +739,11 @@ DATA = $(completion_DATA) $(dist_its_DAT
     403 am__giounixinclude_HEADERS_DIST = gfiledescriptorbased.h \
     404        gunixconnection.h gunixcredentialsmessage.h gunixmounts.h \
     405        gunixfdlist.h gunixfdmessage.h gunixinputstream.h \
     406-       gunixoutputstream.h gunixsocketaddress.h gdesktopappinfo.h
     407+       gunixoutputstream.h gunixsocketaddress.h gosxappinfo.h \
     408+       gdesktopappinfo.h gwin32appinfo.h
     409 am__giowin32include_HEADERS_DIST = gwin32inputstream.h \
     410-       gwin32outputstream.h
     411+       gwin32outputstream.h gosxappinfo.h gdesktopappinfo.h \
     412+       gwin32appinfo.h
     413 HEADERS = $(gioinclude_HEADERS) $(giounixinclude_HEADERS) \
     414        $(giowin32include_HEADERS) $(nodist_gioinclude_HEADERS)
     415 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
     416@@ -1218,12 +1236,12 @@ NULL =
     417 BUILT_SOURCES = $(xdp_dbus_built_sources) gconstructor_as_data.h \
     418        gioenumtypes.h gioenumtypes.c gdbus-daemon-generated.c \
     419        gdbus-daemon-generated.h gnetworking.h $(NULL) \
     420-       $(am__append_45)
     421+       $(am__append_55)
     422 BUILT_EXTRA_DIST = gio.rc
     423 CLEANFILES = *.log *.trs $(am__append_14) $(xdp_dbus_built_sources) \
     424        gdbus-daemon-generated.c gdbus-daemon-generated.h \
     425-       gio-public-headers.txt gconstructor_as_data.h $(am__append_46) \
     426-       $(am__append_48)
     427+       gio-public-headers.txt gconstructor_as_data.h $(am__append_56) \
     428+       $(am__append_58)
     429 DISTCLEANFILES = gioenumtypes.h gioenumtypes.c
     430 MAINTAINERCLEANFILES =
     431 
     432@@ -1284,7 +1302,7 @@ installed_test_SCRIPTS = $(am__append_11
     433 nobase_installed_test_DATA = $(am__append_12)
     434 noinst_LTLIBRARIES = $(am__append_2)
     435 noinst_SCRIPTS = $(am__append_4)
     436-noinst_DATA = $(am__append_5) $(am__append_16)
     437+noinst_DATA = $(am__append_5) $(am__append_17)
     438 check_LTLIBRARIES = $(am__append_6)
     439 check_SCRIPTS = $(am__append_8)
     440 check_DATA = $(am__append_9)
     441@@ -1312,8 +1330,9 @@ all_test_ltlibs = $(test_ltlibraries) $(
     442 @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
     443 
     444 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
     445-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
     446-       $(am__append_22) $(am__append_25) . tests $(am__append_28)
     447+SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_16) \
     448+       $(am__append_20) $(am__append_23) $(am__append_26) . tests \
     449+       $(am__append_29)
     450 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
     451 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
     452 AM_CPPFLAGS = \
     453@@ -1403,8 +1422,8 @@ settings_base_sources = \
     454        gsettings-mapping.c             \
     455        gsettings.c
     456 
     457-settings_sources = $(settings_base_sources) $(am__append_17) \
     458-       $(am__append_18)
     459+settings_sources = $(settings_base_sources) $(am__append_18) \
     460+       $(am__append_19)
     461 @OS_WIN32_TRUE@win32_settings_sources = \
     462 @OS_WIN32_TRUE@        gregistrysettingsbackend.h      \
     463 @OS_WIN32_TRUE@        gregistrysettingsbackend.c
     464@@ -1490,14 +1509,16 @@ local_sources = \
     465        thumbnail-verify.c              \
     466        $(NULL)
     467 
     468-platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
     469-       $(am__append_29) $(am__append_36)
     470-platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
     471-       $(am__append_30)
     472-appinfo_sources = $(am__append_34) $(am__append_38) $(am__append_40)
     473-appinfo_headers = $(am__append_31)
     474-contenttype_sources = $(am__append_35) $(am__append_37) \
     475-       $(am__append_39)
     476+platform_libadd = $(am__append_21) $(am__append_24) $(am__append_27) \
     477+       $(am__append_31) $(am__append_34) $(am__append_44)
     478+platform_deps = $(am__append_22) $(am__append_25) $(am__append_28) \
     479+       $(am__append_32) $(am__append_35)
     480+appinfo_sources = $(am__append_40) $(am__append_42) $(am__append_46) \
     481+       $(am__append_48) $(am__append_50)
     482+appinfo_headers = $(am__append_30) $(am__append_33) $(am__append_36) \
     483+       $(am__append_39) $(am__append_41)
     484+contenttype_sources = $(am__append_43) $(am__append_45) \
     485+       $(am__append_47) $(am__append_49)
     486 @OS_UNIX_TRUE@unix_sources = gfiledescriptorbased.c gunixconnection.c \
     487 @OS_UNIX_TRUE@ gunixcredentialsmessage.c gunixfdlist.c \
     488 @OS_UNIX_TRUE@ gunixfdmessage.c gunixmount.c gunixmount.h \
     489@@ -1510,7 +1531,7 @@ contenttype_sources = $(am__append_35) $
     490 @OS_UNIX_TRUE@ gportalnotificationbackend.c gdocumentportal.c \
     491 @OS_UNIX_TRUE@ gdocumentportal.h gportalsupport.c \
     492 @OS_UNIX_TRUE@ gportalsupport.h $(portal_sources) $(NULL) \
     493-@OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
     494+@OS_UNIX_TRUE@ $(am__append_37) $(am__append_38)
     495 @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
     496 @OS_UNIX_TRUE@giounixinclude_HEADERS = \
     497 @OS_UNIX_TRUE@ gfiledescriptorbased.h  \
     498@@ -1522,7 +1543,7 @@ contenttype_sources = $(am__append_35) $
     499 @OS_UNIX_TRUE@ gunixinputstream.h      \
     500 @OS_UNIX_TRUE@ gunixoutputstream.h     \
     501 @OS_UNIX_TRUE@ gunixsocketaddress.h    \
     502-@OS_UNIX_TRUE@ $(appinfo_headers) \
     503+@OS_UNIX_TRUE@ $(appinfo_headers)      \
     504 @OS_UNIX_TRUE@ $(NULL)
     505 
     506 gdbus_daemon_sources = \
     507@@ -1562,6 +1583,7 @@ win32_more_sources_for_vcproj = \
     508 @OS_WIN32_TRUE@giowin32include_HEADERS = \
     509 @OS_WIN32_TRUE@        gwin32inputstream.h \
     510 @OS_WIN32_TRUE@        gwin32outputstream.h \
     511+@OS_WIN32_TRUE@        $(appinfo_headers) \
     512 @OS_WIN32_TRUE@        $(NULL)
     513 
     514 xdp_dbus_built_sources = xdp-dbus.c xdp-dbus.h
     515@@ -1744,16 +1766,16 @@ libgio_2_0_la_LIBADD = $(top_builddir)/g
     516        $(top_builddir)/gmodule/libgmodule-2.0.la \
     517        $(top_builddir)/glib/libglib-2.0.la $(platform_libadd) \
     518        $(ZLIB_LIBS) $(SELINUX_LIBS) $(GLIB_LIBS) $(XATTR_LIBS) \
     519-       $(NETWORK_LIBS) $(NULL) $(am__append_44) $(am__append_47)
     520+       $(NETWORK_LIBS) $(NULL) $(am__append_54) $(am__append_57)
     521 libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
     522 @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
     523 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
     524 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
     525 libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
     526-       $(am__append_41) $(am__append_43)
     527+       $(am__append_51) $(am__append_53)
     528 libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
     529        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
     530-       -export-dynamic $(no_undefined) $(am__append_42)
     531+       -export-dynamic $(no_undefined) $(am__append_52)
     532 libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
     533 gio_headers = \
     534        gappinfo.h              \
     535@@ -3825,13 +3847,6 @@ libgio_2_0_la-gwin32appinfo.lo: gwin32ap
     536 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     537 @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_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gwin32appinfo.lo `test -f 'gwin32appinfo.c' || echo '$(srcdir)/'`gwin32appinfo.c
     538 
     539-libgio_2_0_la-gosxappinfo.lo: gosxappinfo.c
     540-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gosxappinfo.Tpo -c -o libgio_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
     541-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_2_0_la-gosxappinfo.Plo
     542-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gosxappinfo.c' object='libgio_2_0_la-gosxappinfo.lo' libtool=yes @AMDEPBACKSLASH@
     543-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     544-@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_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
     545-
     546 libgio_2_0_la-gdesktopappinfo.lo: gdesktopappinfo.c
     547 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gdesktopappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Tpo -c -o libgio_2_0_la-gdesktopappinfo.lo `test -f 'gdesktopappinfo.c' || echo '$(srcdir)/'`gdesktopappinfo.c
     548 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Tpo $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Plo
     549@@ -3839,6 +3854,13 @@ libgio_2_0_la-gdesktopappinfo.lo: gdeskt
     550 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     551 @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_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gdesktopappinfo.lo `test -f 'gdesktopappinfo.c' || echo '$(srcdir)/'`gdesktopappinfo.c
     552 
     553+libgio_2_0_la-gosxappinfo.lo: gosxappinfo.c
     554+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gosxappinfo.Tpo -c -o libgio_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
     555+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_2_0_la-gosxappinfo.Plo
     556+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gosxappinfo.c' object='libgio_2_0_la-gosxappinfo.lo' libtool=yes @AMDEPBACKSLASH@
     557+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     558+@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_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
     559+
     560 libgio_2_0_la-gcontenttype-win32.lo: gcontenttype-win32.c
     561 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcontenttype-win32.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo -c -o libgio_2_0_la-gcontenttype-win32.lo `test -f 'gcontenttype-win32.c' || echo '$(srcdir)/'`gcontenttype-win32.c
     562 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo
     563--- gio/giomodule.c.old 2017-04-04 13:16:26.000000000 +0200
     564+++ gio/giomodule.c     2017-04-04 13:19:13.000000000 +0200
     565@@ -43,12 +43,13 @@
     566 #endif
     567 #include <glib/gstdio.h>
     568 
     569-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
     570+#if defined(G_OS_UNIX)
     571+#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
     572 #include "gdesktopappinfo.h"
     573-#endif
     574-#ifdef HAVE_COCOA
     575+#elif defined(HAVE_COCOA)
     576 #include "gosxappinfo.h"
     577 #endif
     578+#endif
     579 
     580 #ifdef HAVE_COCOA
     581 #include <AvailabilityMacros.h>
     582@@ -978,7 +979,7 @@ _g_io_modules_ensure_extension_points_re
     583     {
     584       registered_extensions = TRUE;
     585       
     586-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
     587+#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
     588 #if !GLIB_CHECK_VERSION (3, 0, 0)
     589       ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
     590       G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     591@@ -1119,8 +1120,10 @@ _g_io_modules_ensure_loaded (void)
     592 #endif
     593 #ifdef HAVE_COCOA
     594       g_type_ensure (g_nextstep_settings_backend_get_type ());
     595+#ifndef USE_APPINFO_GENERIC
     596       g_type_ensure (g_osx_app_info_get_type ());
     597 #endif
     598+#endif
     599 #ifdef G_OS_UNIX
     600       g_type_ensure (_g_unix_volume_monitor_get_type ());
     601       g_type_ensure (g_fdo_notification_backend_get_type ());

  • new file devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff 

    diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
new file mode 100644
index 0000000000..0949fc26c2
    - +  
     1--- configure.ac.old    2017-03-19 01:40:35.000000000 +0100
     2+++ configure.ac        2017-04-04 10:46:47.000000000 +0200
     3@@ -1702,6 +1702,31 @@ dnl   failure. try libattr
     4 ])
     5 AC_SUBST(XATTR_LIBS)
     6 
     7+dnl ***********************************************
     8+dnl *** Check for gappinfo implementation (GIO) ***
     9+dnl ***********************************************
     10+AC_ARG_WITH(appinfo-impl,
     11+           [AS_HELP_STRING([--appinfo-impl=@<:@native/generic@:>@],
     12+                           [use appinfo implementation [native]])],
     13+           [],
     14+           [with_appinfo_impl='native'])
     15+
     16+if test "$with_appinfo_impl" != "native" && test "$with_appinfo_impl" != "generic"; then
     17+  with_appinfo_impl="native"
     18+fi
     19+
     20+AM_CONDITIONAL(APPINFO_IMPL_NATIVE, [test "$with_appinfo_impl" = "native"])
     21+AM_CONDITIONAL(APPINFO_IMPL_GENERIC, [test "$with_appinfo_impl" = "generic"])
     22+
     23+case $with_appinfo_impl in
     24+  native)
     25+    AC_DEFINE(USE_APPINFO_NATIVE, 1, [Prefer the native application information implementation])
     26+    ;;
     27+  generic)
     28+    AC_DEFINE(USE_APPINFO_GENERIC, 1, [Prefer the generic (freedesktop-based) application information implementation])
     29+    ;;
     30+esac
     31+
     32 dnl ************************
     33 dnl *** check for libelf ***
     34 dnl ************************
     35--- gio/Makefile.am.old 2017-03-17 02:12:05.000000000 +0100
     36+++ gio/Makefile.am     2017-04-04 13:29:19.000000000 +0200
     37@@ -3,7 +3,11 @@ include $(top_srcdir)/glib.mk
     38 SUBDIRS = gdbus-2.0/codegen
     39 
     40 if OS_UNIX
     41-if !OS_COCOA
     42+if OS_COCOA
     43+if APPINFO_IMPL_GENERIC
     44+SUBDIRS += xdgmime
     45+endif
     46+else
     47 SUBDIRS += xdgmime
     48 endif
     49 endif
     50@@ -251,7 +255,16 @@ SUBDIRS += fam
     51 endif
     52 
     53 if OS_UNIX
     54-if !OS_COCOA
     55+if OS_COCOA
     56+if APPINFO_IMPL_NATIVE
     57+appinfo_headers += gosxappinfo.h
     58+else
     59+platform_libadd += xdgmime/libxdgmime.la
     60+platform_deps += xdgmime/libxdgmime.la
     61+
     62+appinfo_headers += gdesktopappinfo.h
     63+endif
     64+else
     65 platform_libadd += xdgmime/libxdgmime.la
     66 platform_deps += xdgmime/libxdgmime.la
     67 
     68@@ -303,7 +316,7 @@ giounixinclude_HEADERS = \
     69        gunixinputstream.h      \
     70        gunixoutputstream.h     \
     71        gunixsocketaddress.h    \
     72-       $(appinfo_headers) \
     73+       $(appinfo_headers)      \
     74        $(NULL)
     75 
     76 if HAVE_NETLINK
     77@@ -349,7 +362,13 @@ win32_more_sources_for_vcproj = \
     78        win32/gwin32filemonitor.c
     79 
     80 if OS_WIN32
     81-appinfo_sources += gwin32appinfo.c gwin32appinfo.h
     82+if APPINFO_IMPL_NATIVE
     83+appinfo_headers += gwin32appinfo.h
     84+appinfo_sources += gwin32appinfo.c
     85+else
     86+appinfo_headers += gdesktopappinfo.h
     87+appinfo_sources += gdesktopappinfo.c
     88+endif
     89 contenttype_sources += gcontenttype-win32.c
     90 platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
     91 win32_sources = $(win32_actual_sources)
     92@@ -358,6 +377,7 @@ giowin32includedir=$(includedir)/gio-win
     93 giowin32include_HEADERS = \
     94        gwin32inputstream.h \
     95        gwin32outputstream.h \
     96+       $(appinfo_headers) \
     97        $(NULL)
     98 
     99 endif
     100@@ -393,13 +413,16 @@ portal_sources = \
     101        $(xdp_dbus_built_sources)       \
     102        $(NULL)
     103 
     104+if OS_UNIX
     105 if OS_COCOA
     106+if APPINFO_IMPL_NATIVE
     107 contenttype_sources += gosxcontenttype.c
     108-appinfo_sources += gosxappinfo.c gosxappinfo.h
     109+appinfo_sources += gosxappinfo.c
     110+else
     111+contenttype_sources += gcontenttype.c
     112+appinfo_sources += gdesktopappinfo.c
     113 endif
     114-
     115-if OS_UNIX
     116-if !OS_COCOA
     117+else
     118 contenttype_sources += gcontenttype.c
     119 appinfo_sources += gdesktopappinfo.c
     120 endif
     121--- gio/giomodule.c.old 2017-03-13 15:33:34.000000000 +0100
     122+++ gio/giomodule.c     2017-04-04 10:19:47.000000000 +0200
     123@@ -43,12 +43,13 @@
     124 #endif
     125 #include <glib/gstdio.h>
     126 
     127-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
     128+#if defined(G_OS_UNIX)
     129+#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
     130 #include "gdesktopappinfo.h"
     131-#endif
     132-#ifdef HAVE_COCOA
     133+#elif defined(HAVE_COCOA)
     134 #include "gosxappinfo.h"
     135 #endif
     136+#endif
     137 
     138 #ifdef HAVE_COCOA
     139 #include <AvailabilityMacros.h>
     140@@ -978,7 +979,7 @@ _g_io_modules_ensure_extension_points_re
     141     {
     142       registered_extensions = TRUE;
     143       
     144-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
     145+#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
     146 #if !GLIB_CHECK_VERSION (3, 0, 0)
     147       ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
     148       G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     149@@ -1119,8 +1120,10 @@ _g_io_modules_ensure_loaded (void)
     150 #endif
     151 #ifdef HAVE_COCOA
     152       g_type_ensure (g_nextstep_settings_backend_get_type ());
     153+#ifndef USE_APPINFO_GENERIC
     154       g_type_ensure (g_osx_app_info_get_type ());
     155 #endif
     156+#endif
     157 #ifdef G_OS_UNIX
     158       g_type_ensure (_g_unix_volume_monitor_get_type ());
     159       g_type_ensure (g_fdo_notification_backend_get_type ());

  • gnome/gtk3/Portfile 

    diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
index 37d6f95596..c21b518e0d 100644
    a b name gtk3 
    1010set real_name       gtk+
    1111epoch               1
    1212version             3.22.11
     13revision            1
    1314set branch          [join [lrange [split ${version} .] 0 1] .]
    1415categories          gnome x11
    1516license             LGPL-2.1+
    … … variant quartz conflicts x11 { 
    228229    require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
    229230    require_active_variants port:gdk-pixbuf2 "" x11
    230231
     232    # This patch is part of #53911 and is backported from upstream's repository.
     233    # Can probably be removed the next time around.
     234    patchfiles-append       patch-gtk-launch-unbreak-osx.diff
     235
    231236    configure.args-append   --enable-quartz-backend
    232237}
    233238

  • new file gnome/gtk3/files/patch-gdk-launch-support-newer-glib.diff 

    diff --git a/gnome/gtk3/files/patch-gdk-launch-support-newer-glib.diff b/gnome/gtk3/files/patch-gdk-launch-support-newer-glib.diff
new file mode 100644
index 0000000000..45546f840b
    - +  
     1Binary files gtk+-3.22.11-orig/gdk/x11/.gdkapplaunchcontext-x11.c.swp and gtk+-3.22.11/gdk/x11/.gdkapplaunchcontext-x11.c.swp differ
     2--- gdk/x11/gdkapplaunchcontext-x11.c.old       2016-12-30 15:55:56.000000000 +0100
     3+++ gdk/x11/gdkapplaunchcontext-x11.c   2017-04-03 08:42:14.000000000 +0200
     4@@ -27,7 +27,11 @@
     5 #include "gdkprivate-x11.h"
     6 
     7 #include <glib.h>
     8+#if defined(__APPLE__) && GLIB_CHECK_VERSION(2,52,0)
     9+#include <gio/gosxappinfo.h>
     10+#else
     11 #include <gio/gdesktopappinfo.h>
     12+#endif
     13 
     14 #include <string.h>
     15 #include <unistd.h>