Received: by mail.netbsd.org (Postfix, from userid 605) id 8E97284E73; Mon, 21 May 2018 08:39:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 168E684E74 for ; Mon, 21 May 2018 08:39:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jbQZ_Oufssf3 for ; Mon, 21 May 2018 08:39:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5C46F84C81 for ; Mon, 21 May 2018 08:39:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 56D59FBEC; Mon, 21 May 2018 08:39:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526891978220630" MIME-Version: 1.0 Date: Mon, 21 May 2018 08:39:38 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/glib2 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180521083938.56D59FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526891978220630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon May 21 08:39:38 UTC 2018 Modified Files: pkgsrc/devel/glib2: Makefile PLIST distinfo pkgsrc/devel/glib2/patches: patch-an patch-cl Added Files: pkgsrc/devel/glib2/patches: patch-gio_giomodule.c patch-gio_glocalfileinfo.c Log Message: glib2: Restore gdesktopappinfo fix for macOS, unbreaks gtk. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.239 -r1.240 pkgsrc/devel/glib2/Makefile cvs rdiff -u -r1.99 -r1.100 pkgsrc/devel/glib2/PLIST cvs rdiff -u -r1.231 -r1.232 pkgsrc/devel/glib2/distinfo cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/glib2/patches/patch-an cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/glib2/patches/patch-cl cvs rdiff -u -r0 -r1.3 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c \ pkgsrc/devel/glib2/patches/patch-gio_glocalfileinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1526891978220630 Content-Disposition: inline Content-Length: 20643 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/glib2/Makefile diff -u pkgsrc/devel/glib2/Makefile:1.239 pkgsrc/devel/glib2/Makefile:1.240 --- pkgsrc/devel/glib2/Makefile:1.239 Mon Apr 23 08:26:50 2018 +++ pkgsrc/devel/glib2/Makefile Mon May 21 08:39:38 2018 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.239 2018/04/23 08:26:50 adam Exp $ +# $NetBSD: Makefile,v 1.240 2018/05/21 08:39:38 jperkin Exp $ .include "Makefile.common" +PKGREVISION= 1 CATEGORIES= devel gnome COMMENT= Some useful routines for C programming (glib2) @@ -41,11 +42,6 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2 LIBS.SunOS+= -lnsl -lsocket CPPFLAGS.SunOS+= -DBSD_COMP -PLIST_VARS+= unix -.if ${OPSYS} != "Darwin" -PLIST.unix= yes -.endif - .if ${OBJECT_FMT} == "ELF" . if ${OPSYS} == "SunOS" . if empty(ABI:U:M64) Index: pkgsrc/devel/glib2/PLIST diff -u pkgsrc/devel/glib2/PLIST:1.99 pkgsrc/devel/glib2/PLIST:1.100 --- pkgsrc/devel/glib2/PLIST:1.99 Mon Apr 23 08:26:50 2018 +++ pkgsrc/devel/glib2/PLIST Mon May 21 08:39:38 2018 @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.99 2018/04/23 08:26:50 adam Exp $ -${PLIST.unix}bin/gapplication +@comment $NetBSD: PLIST,v 1.100 2018/05/21 08:39:38 jperkin Exp $ +bin/gapplication bin/gdbus bin/gio bin/gio-querymodules @@ -11,7 +11,7 @@ bin/gresource bin/gsettings bin/gtester bin/gtester-report -${PLIST.unix}include/glib/gio-unix-2.0/gio/gdesktopappinfo.h +include/glib/gio-unix-2.0/gio/gdesktopappinfo.h include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h include/glib/gio-unix-2.0/gio/gunixconnection.h include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h Index: pkgsrc/devel/glib2/distinfo diff -u pkgsrc/devel/glib2/distinfo:1.231 pkgsrc/devel/glib2/distinfo:1.232 --- pkgsrc/devel/glib2/distinfo:1.231 Tue Apr 17 14:58:28 2018 +++ pkgsrc/devel/glib2/distinfo Mon May 21 08:39:38 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.231 2018/04/17 14:58:28 wiz Exp $ +$NetBSD: distinfo,v 1.232 2018/05/21 08:39:38 jperkin Exp $ SHA1 (glib-2.56.1.tar.xz) = 4db098c15b9d57c37bb504a6f58ebe717994e6f2 RMD160 (glib-2.56.1.tar.xz) = da4e45bf52d28b610a71bed8b4331bfb0b5c8d56 @@ -15,12 +15,14 @@ SHA1 (patch-aha) = ade66edd87a5e76a1256b SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26 SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293 -SHA1 (patch-an) = 69edd1d40e3c8d9cc6744954e89e92c286bc6f58 +SHA1 (patch-an) = e8bd585b4865ebac574de895c05531c8ec1773c1 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3 -SHA1 (patch-cl) = f3b69b3b60290cde33e532dc5697dacd5537e7ce +SHA1 (patch-cl) = abe77225b2013b40d48a419b58ef4970165d0398 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93 SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050 +SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa +SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511 Index: pkgsrc/devel/glib2/patches/patch-an diff -u pkgsrc/devel/glib2/patches/patch-an:1.17 pkgsrc/devel/glib2/patches/patch-an:1.18 --- pkgsrc/devel/glib2/patches/patch-an:1.17 Tue Apr 17 14:58:29 2018 +++ pkgsrc/devel/glib2/patches/patch-an Mon May 21 08:39:38 2018 @@ -1,27 +1,183 @@ -$NetBSD: patch-an,v 1.17 2018/04/17 14:58:29 wiz Exp $ +$NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin 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-04-07 02:37:14.000000000 +0000 +++ gio/Makefile.in -@@ -945,7 +945,7 @@ am__set_b = \ +@@ -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 + @OS_COCOA_TRUE@am__append_37 = libgio-objc-2.0.la + @OS_COCOA_TRUE@am__append_38 = libgio-objc-2.0.la + @HAVE_LIBMOUNT_TRUE@am__append_39 = $(LIBMOUNT_CFLAGS) +@@ -202,7 +202,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT) + + # ------------------------------------------------------------------------ + # gapplication(1) tool +-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_45 = gapplication ++@OS_UNIX_TRUE@am__append_45 = gapplication + subdir = gio + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \ +@@ -526,11 +526,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 \ +@@ -594,12 +593,9 @@ 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 + @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@ libgio_objc_2_0_la-gcocoanotificationbackend.lo + 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 \ +@@ -607,22 +603,20 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A + $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) \ + $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ + @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath = +-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) ++@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) + am__EXEEXT_2 = + @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2) + @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2) + PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \ + $(noinst_PROGRAMS) + 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 = 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 = 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 \ +@@ -945,8 +939,7 @@ am__set_b = \ *) \ b='$*';; \ esac -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \ -+DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . \ - fam +- 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 \ -@@ -1327,8 +1327,8 @@ all_test_ltlibs = $(test_ltlibraries) $( + $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \ +@@ -1050,6 +1043,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@ +@@ -1327,8 +1321,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) ++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 = \ +@@ -1793,9 +1787,6 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG + @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 \ +-@OS_COCOA_TRUE@ gosxcontenttype.c \ +-@OS_COCOA_TRUE@ gosxappinfo.c \ +-@OS_COCOA_TRUE@ gosxappinfo.h \ + @OS_COCOA_TRUE@ gcocoanotificationbackend.c + + EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps) +@@ -1966,12 +1957,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 = \ +@@ -2637,8 +2628,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ + +@@ -4213,20 +4202,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 Index: pkgsrc/devel/glib2/patches/patch-cl diff -u pkgsrc/devel/glib2/patches/patch-cl:1.13 pkgsrc/devel/glib2/patches/patch-cl:1.14 --- pkgsrc/devel/glib2/patches/patch-cl:1.13 Tue Apr 17 08:03:38 2018 +++ pkgsrc/devel/glib2/patches/patch-cl Mon May 21 08:39:38 2018 @@ -1,7 +1,9 @@ -$NetBSD: patch-cl,v 1.13 2018/04/17 08:03:38 wiz Exp $ +$NetBSD: patch-cl,v 1.14 2018/05/21 08:39:38 jperkin 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.am.orig 2018-03-12 16:23:37.000000000 +0000 +++ gio/Makefile.am @@ -22,3 +24,51 @@ $NetBSD: patch-cl,v 1.13 2018/04/17 08:0 if HAVE_FAM SUBDIRS += fam +@@ -255,9 +255,7 @@ endif + if OS_UNIX + platform_libadd += xdgmime/libxdgmime.la + platform_deps += xdgmime/libxdgmime.la +-if !OS_COCOA + appinfo_headers += gdesktopappinfo.h +-endif + + + unix_sources = \ +@@ -396,11 +394,9 @@ portal_sources = \ + $(NULL) + + if OS_UNIX +-if !OS_COCOA + contenttype_sources += gcontenttype.c + appinfo_sources += gdesktopappinfo.c + endif +-endif + + gio_base_sources = \ + gappinfo.c \ +@@ -610,9 +606,6 @@ libgio_objc_2_0_la_CPPFLAGS = $(libgio_2 + libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit + libgio_objc_2_0_la_SOURCES = \ + gnextstepsettingsbackend.c \ +- gosxcontenttype.c \ +- gosxappinfo.c \ +- gosxappinfo.h \ + gcocoanotificationbackend.c + + noinst_LTLIBRARIES += libgio-objc-2.0.la +@@ -890,7 +883,6 @@ gdbus_LDADD = libgio-2.0.la \ + $(NULL) + + if OS_UNIX +-if !OS_COCOA + # ------------------------------------------------------------------------ + # gapplication(1) tool + bin_PROGRAMS += gapplication +@@ -901,7 +893,6 @@ gapplication_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) + endif +-endif + + completiondir = $(datadir)/bash-completion/completions + completion_DATA = \ Added files: Index: pkgsrc/devel/glib2/patches/patch-gio_giomodule.c diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.3 --- /dev/null Mon May 21 08:39:38 2018 +++ pkgsrc/devel/glib2/patches/patch-gio_giomodule.c Mon May 21 08:39:38 2018 @@ -0,0 +1,37 @@ +$NetBSD: patch-gio_giomodule.c,v 1.3 2018/05/21 08:39:38 jperkin Exp $ + +Re-enable gdesktopappinfo on Darwin. + +--- gio/giomodule.c.orig 2017-06-22 12:52:49.000000000 +0000 ++++ gio/giomodule.c +@@ -43,12 +43,9 @@ + #endif + #include + +-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) ++#if defined(G_OS_UNIX) + #include "gdesktopappinfo.h" + #endif +-#ifdef HAVE_COCOA +-#include "gosxappinfo.h" +-#endif + + #ifdef HAVE_COCOA + #include +@@ -978,7 +975,7 @@ _g_io_modules_ensure_extension_points_re + { + registered_extensions = TRUE; + +-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) ++#if defined(G_OS_UNIX) + #if !GLIB_CHECK_VERSION (3, 0, 0) + ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +@@ -1119,7 +1116,6 @@ _g_io_modules_ensure_loaded (void) + #endif + #ifdef HAVE_COCOA + g_type_ensure (g_nextstep_settings_backend_get_type ()); +- g_type_ensure (g_osx_app_info_get_type ()); + #endif + #ifdef G_OS_UNIX + g_type_ensure (_g_unix_volume_monitor_get_type ()); Index: pkgsrc/devel/glib2/patches/patch-gio_glocalfileinfo.c diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_glocalfileinfo.c:1.3 --- /dev/null Mon May 21 08:39:38 2018 +++ pkgsrc/devel/glib2/patches/patch-gio_glocalfileinfo.c Mon May 21 08:39:38 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-gio_glocalfileinfo.c,v 1.3 2018/05/21 08:39:38 jperkin Exp $ + +Re-enable gdesktopappinfo on Darwin. + +--- gio/glocalfileinfo.c.orig 2018-01-08 21:34:19.000000000 +0000 ++++ gio/glocalfileinfo.c +@@ -1290,7 +1290,7 @@ get_content_type (const char *b + + content_type = g_content_type_guess (basename, NULL, 0, &result_uncertain); + +-#if !defined(G_OS_WIN32) && !defined(HAVE_COCOA) ++#if !defined(G_OS_WIN32) + if (!fast && result_uncertain && path != NULL) + { + guchar sniff_buffer[4096]; --_----------=_1526891978220630--