Sun Aug 19 18:32:27 2018 UTC ()
glib2: update to 2.56.2.

Overview of changes in GLib 2.56.2
==================================

* Support version 2 of the NetworkMonitor portal interface

* Bug fixes:
 740791 gio: cannot specify the source when joining a multicast group...
 755721 g_inotify_file_monitor_start called with nullpointer for dirn...
 773435 After g_get_home_dir() fails, a second use deadlocks
 793727 Use-after-free in emit_network_changed() of gnetworkmonitorba...
 794380 Build failure of gcocoanotificationbackend.c on OS X < 10.9
 794801 /network-monitor/add_networks fails if there is a proxy and g...
 795138 gobject build failure with gcc <= 4.7
 795234 Fix Jenkins CI build failures for network tests
 795406 Glib fails to build for Android
 795429 glib-genmarshal shows redundant "time" warning message agains...
 795711 gitlab-ci: update meson
 795735 Fix comparison for GVariant property values
 795802 gdbus-codegen doesn't accept --output-directory with --output...
 #1240 W32: g_get_system_data_dirs() works differently for C++ applic...
#1401 g_clear_handle_id: clear_func is nullable, despite documentatin...
#1452 GFileInfo: unable to retrieve correct modification time of link...
#1458 g_volume_get_mount returns NULL value after g_volume_mount_fini...

* Translation updates
 Russian
 Slovenian


(wiz)
diff -r1.240 -r1.241 pkgsrc/devel/glib2/Makefile
diff -r1.65 -r1.66 pkgsrc/devel/glib2/Makefile.common
diff -r1.100 -r1.101 pkgsrc/devel/glib2/PLIST
diff -r1.234 -r1.235 pkgsrc/devel/glib2/distinfo
diff -r1.18 -r1.19 pkgsrc/devel/glib2/patches/patch-an
diff -r1.14 -r1.15 pkgsrc/devel/glib2/patches/patch-cl
diff -r1.4 -r0 pkgsrc/devel/glib2/patches/patch-gio_gfile.c

cvs diff -r1.240 -r1.241 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2018/05/21 08:39:38 1.240
+++ pkgsrc/devel/glib2/Makefile 2018/08/19 18:32:27 1.241
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.240 2018/05/21 08:39:38 jperkin Exp $ 1# $NetBSD: Makefile,v 1.241 2018/08/19 18:32:27 wiz Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGREVISION= 1 
6CATEGORIES= devel gnome 5CATEGORIES= devel gnome
7 6
8COMMENT= Some useful routines for C programming (glib2) 7COMMENT= Some useful routines for C programming (glib2)
9 8
10USE_TOOLS+= msgfmt perl:run readlink 9USE_TOOLS+= msgfmt perl:run readlink
11 10
12PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 11PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
13PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 12PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
14PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 13PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
15PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 14PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
16PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 15PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
17PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 16PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
18PKGCONFIG_OVERRIDE+= gio-2.0.pc.in 17PKGCONFIG_OVERRIDE+= gio-2.0.pc.in

cvs diff -r1.65 -r1.66 pkgsrc/devel/glib2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile.common 2018/08/01 17:43:25 1.65
+++ pkgsrc/devel/glib2/Makefile.common 2018/08/19 18:32:27 1.66
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile.common,v 1.65 2018/08/01 17:43:25 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.66 2018/08/19 18:32:27 wiz Exp $
2# 2#
3# used by devel/glib2/Makefile 3# used by devel/glib2/Makefile
4# used by devel/gdbus-codegen/Makefile 4# used by devel/gdbus-codegen/Makefile
5# used by devel/glib2-tools/Makefile 5# used by devel/glib2-tools/Makefile
6# used by sysutils/gio-fam/Makefile 6# used by sysutils/gio-fam/Makefile
7 7
8# When updating this package, please apply patch-ak to configure.in and 8# When updating this package, please apply patch-ak to configure.in and
9# then run a matching version of autoconf to regen patch-aa. 9# then run a matching version of autoconf to regen patch-aa.
10DISTNAME= glib-2.56.1 10DISTNAME= glib-2.56.2
11PKGNAME= ${DISTNAME:S/glib/glib2/} 11PKGNAME= ${DISTNAME:S/glib/glib2/}
12CATEGORIES= # empty; redefined in Makefile 12CATEGORIES= # empty; redefined in Makefile
13MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/} 13MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= prlw1@cam.ac.uk 16MAINTAINER= prlw1@cam.ac.uk
17HOMEPAGE= https://developer.gnome.org/glib/ 17HOMEPAGE= https://developer.gnome.org/glib/
18COMMENT= # empty; redefined in Makefile 18COMMENT= # empty; redefined in Makefile
19LICENSE= gnu-lgpl-v2.1 19LICENSE= gnu-lgpl-v2.1
20 20
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22USE_TOOLS+= gmake pkg-config 22USE_TOOLS+= gmake pkg-config
23USE_LANGUAGES= c c++ c99 23USE_LANGUAGES= c c++ c99

cvs diff -r1.100 -r1.101 pkgsrc/devel/glib2/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/glib2/PLIST 2018/05/21 08:39:38 1.100
+++ pkgsrc/devel/glib2/PLIST 2018/08/19 18:32:27 1.101
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.100 2018/05/21 08:39:38 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.101 2018/08/19 18:32:27 wiz Exp $
2bin/gapplication 2bin/gapplication
3bin/gdbus 3bin/gdbus
4bin/gio 4bin/gio
5bin/gio-querymodules 5bin/gio-querymodules
6bin/glib-compile-resources 6bin/glib-compile-resources
7bin/glib-compile-schemas 7bin/glib-compile-schemas
8bin/glib-gettextize 8bin/glib-gettextize
9bin/gobject-query 9bin/gobject-query
10bin/gresource 10bin/gresource
11bin/gsettings 11bin/gsettings
12bin/gtester 12bin/gtester
13bin/gtester-report 13bin/gtester-report
14include/glib/gio-unix-2.0/gio/gdesktopappinfo.h 14include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
@@ -284,28 +284,28 @@ lib/pkgconfig/gio-unix-2.0.pc @@ -284,28 +284,28 @@ lib/pkgconfig/gio-unix-2.0.pc
284lib/pkgconfig/glib-2.0.pc 284lib/pkgconfig/glib-2.0.pc
285lib/pkgconfig/gmodule-2.0.pc 285lib/pkgconfig/gmodule-2.0.pc
286lib/pkgconfig/gmodule-export-2.0.pc 286lib/pkgconfig/gmodule-export-2.0.pc
287lib/pkgconfig/gmodule-no-export-2.0.pc 287lib/pkgconfig/gmodule-no-export-2.0.pc
288lib/pkgconfig/gobject-2.0.pc 288lib/pkgconfig/gobject-2.0.pc
289lib/pkgconfig/gthread-2.0.pc 289lib/pkgconfig/gthread-2.0.pc
290share/aclocal/glib-2.0.m4 290share/aclocal/glib-2.0.m4
291share/aclocal/glib-gettext.m4 291share/aclocal/glib-gettext.m4
292share/aclocal/gsettings.m4 292share/aclocal/gsettings.m4
293share/bash-completion/completions/gapplication 293share/bash-completion/completions/gapplication
294share/bash-completion/completions/gdbus 294share/bash-completion/completions/gdbus
295share/bash-completion/completions/gresource 295share/bash-completion/completions/gresource
296share/bash-completion/completions/gsettings 296share/bash-completion/completions/gsettings
297share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5600.1-gdb.py 297share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5600.2-gdb.py
298share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.1-gdb.py 298share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.2-gdb.py
299share/gettext/its/gschema.its 299share/gettext/its/gschema.its
300share/gettext/its/gschema.loc 300share/gettext/its/gschema.loc
301share/glib-2.0/gdb/glib_gdb.py 301share/glib-2.0/gdb/glib_gdb.py
302share/glib-2.0/gdb/gobject_gdb.py 302share/glib-2.0/gdb/gobject_gdb.py
303share/glib-2.0/gettext/po/Makefile.in.in 303share/glib-2.0/gettext/po/Makefile.in.in
304share/glib-2.0/schemas/gschema.dtd 304share/glib-2.0/schemas/gschema.dtd
305share/glib-2.0/valgrind/glib.supp 305share/glib-2.0/valgrind/glib.supp
306share/gtk-doc/html/gio/GAction.html 306share/gtk-doc/html/gio/GAction.html
307share/gtk-doc/html/gio/GActionGroup.html 307share/gtk-doc/html/gio/GActionGroup.html
308share/gtk-doc/html/gio/GActionMap.html 308share/gtk-doc/html/gio/GActionMap.html
309share/gtk-doc/html/gio/GAppInfo.html 309share/gtk-doc/html/gio/GAppInfo.html
310share/gtk-doc/html/gio/GAppInfoMonitor.html 310share/gtk-doc/html/gio/GAppInfoMonitor.html
311share/gtk-doc/html/gio/GApplication.html 311share/gtk-doc/html/gio/GApplication.html

cvs diff -r1.234 -r1.235 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2018/08/01 17:43:25 1.234
+++ pkgsrc/devel/glib2/distinfo 2018/08/19 18:32:27 1.235
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1$NetBSD: distinfo,v 1.234 2018/08/01 17:43:25 jperkin Exp $ 1$NetBSD: distinfo,v 1.235 2018/08/19 18:32:27 wiz Exp $
2 2
3SHA1 (glib-2.56.1.tar.xz) = 4db098c15b9d57c37bb504a6f58ebe717994e6f2 3SHA1 (glib-2.56.2.tar.xz) = 8b18a92f81a8d033abfb43a628bae3bbaf71800c
4RMD160 (glib-2.56.1.tar.xz) = da4e45bf52d28b610a71bed8b4331bfb0b5c8d56 4RMD160 (glib-2.56.2.tar.xz) = 8fe9fd51a84ebe0f61b5cb2ab97325baa51c4eb3
5SHA512 (glib-2.56.1.tar.xz) = 7e96cc23f3fa42a41b1974ae8fa2a7b123449643f265763d464620afcb011668e2de013ed2a6e5f13b6bd1bf3ab8eab43c05bf4a8ee0d99b7808767ab4fa69f4 5SHA512 (glib-2.56.2.tar.xz) = 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
6Size (glib-2.56.1.tar.xz) = 8028716 bytes 6Size (glib-2.56.2.tar.xz) = 8041756 bytes
7SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced 7SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
8SHA1 (patch-aa) = 5aac049588b3f2cb63d86259cf9ebeed61081c52 8SHA1 (patch-aa) = 5aac049588b3f2cb63d86259cf9ebeed61081c52
9SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544 9SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
10SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 10SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
11SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 11SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
12SHA1 (patch-af) = f21f5c5f799189885a3826fde8ad079f599ae26b 12SHA1 (patch-af) = f21f5c5f799189885a3826fde8ad079f599ae26b
13SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2 13SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2
14SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c 14SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
15SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26 15SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26
16SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50 16SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
17SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293 17SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
18SHA1 (patch-an) = e8bd585b4865ebac574de895c05531c8ec1773c1 18SHA1 (patch-an) = 47986cfa2374ad4a89887bee5896d477a31f651f
19SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac 19SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
20SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3 20SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
21SHA1 (patch-cl) = abe77225b2013b40d48a419b58ef4970165d0398 21SHA1 (patch-cl) = 58e5b4a3e8cf0750ceadba30e379954d800f77f7
22SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93 22SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
23SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050 23SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
24SHA1 (patch-gio_gfile.c) = 70ab8e438358c917958ef81c18f9f1d0c0ce37ff 
25SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa 24SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
26SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f 25SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
27SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 26SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
28SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0 27SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
29SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511 28SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
30SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888 29SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
31SHA1 (patch-glib_gtimezone.c) = 3f72bc2ed4447d60871e66984a5e3a80ca8c75f4 30SHA1 (patch-glib_gtimezone.c) = 3f72bc2ed4447d60871e66984a5e3a80ca8c75f4
32SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75 31SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
33SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18 32SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
34SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a 33SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
35SHA1 (patch-gobject_glib-mkenums.in) = 651713a9c1fd83aea5060f996b58b35fbe3a43c7 34SHA1 (patch-gobject_glib-mkenums.in) = 651713a9c1fd83aea5060f996b58b35fbe3a43c7

cvs diff -r1.18 -r1.19 pkgsrc/devel/glib2/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-an 2018/05/21 08:39:38 1.18
+++ pkgsrc/devel/glib2/patches/Attic/patch-an 2018/08/19 18:32:27 1.19
@@ -1,176 +1,181 @@ @@ -1,176 +1,181 @@
1$NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $ 1$NetBSD: patch-an,v 1.19 2018/08/19 18:32:27 wiz Exp $
2 2
3- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package. 3- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
4- Don't compile tests as they include gdbus-codegen tests. 4- Don't compile tests as they include gdbus-codegen tests.
5- Don't install completion data. 5- Don't install completion data.
6- Re-enable gdesktopappinfo on Darwin. 6- Re-enable gdesktopappinfo on Darwin.
7 7
8--- gio/Makefile.in.orig 2018-04-07 02:37:14.000000000 +0000 8--- gio/Makefile.in.orig 2018-08-17 00:27:41.000000000 +0000
9+++ gio/Makefile.in 9+++ gio/Makefile.in
10@@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2) 10@@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2)
11 @HAVE_FAM_TRUE@am__append_27 = fam 11 @HAVE_FAM_TRUE@am__append_27 = fam
12 @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la 12 @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la
13 @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la 13 @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
14-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h 14-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
15+@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h 15+@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
16 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \ 16 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \
17 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \ 17 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
18 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \ 18 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
19@@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2) 19@@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2)
20 @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h 20 @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h
21 @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c 21 @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c
22 @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi 22 @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
23-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c 23-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
24-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c 24-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
25+@OS_UNIX_TRUE@am__append_35 = gcontenttype.c 25+@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
26+@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c 26+@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
27 @OS_COCOA_TRUE@am__append_37 = libgio-objc-2.0.la 27 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__append_37 = \
28 @OS_COCOA_TRUE@am__append_38 = libgio-objc-2.0.la 28 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@ gcocoanotificationbackend.c
29 @HAVE_LIBMOUNT_TRUE@am__append_39 = $(LIBMOUNT_CFLAGS) 29
30@@ -202,7 +202,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT) 30@@ -205,7 +205,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
31  31
32 # ------------------------------------------------------------------------ 32 # ------------------------------------------------------------------------
33 # gapplication(1) tool 33 # gapplication(1) tool
34-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_45 = gapplication 34-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gapplication
35+@OS_UNIX_TRUE@am__append_45 = gapplication 35+@OS_UNIX_TRUE@am__append_46 = gapplication
36 subdir = gio 36 subdir = gio
37 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 37 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
38 am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \ 38 am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
39@@ -526,11 +526,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l 39@@ -231,7 +231,7 @@ mkinstalldirs = $(install_sh) -d
 40 CONFIG_HEADER = $(top_builddir)/config.h
 41 CONFIG_CLEAN_FILES = gnetworking.h gio.rc
 42 CONFIG_CLEAN_VPATH_FILES =
 43-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
 44+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
 45 am__installdirs = "$(DESTDIR)$(bindir)" \
 46 "$(DESTDIR)$(installed_testdir)" \
 47 "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" \
 48@@ -535,11 +535,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
40 libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \ 49 libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
41 $(am__objects_4) $(am__objects_1) 50 $(am__objects_4) $(am__objects_1)
42 @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo 51 @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
43-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo 52-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
44+@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo 53+@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
45 am__objects_8 = $(am__objects_6) $(am__objects_7) 54 am__objects_8 = $(am__objects_6) $(am__objects_7)
46 @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo 55 @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo
47-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = \ 56-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = \
48-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo 57-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo
49+@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo 58+@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo
50 am__objects_11 = $(am__objects_9) $(am__objects_10) 59 am__objects_11 = $(am__objects_9) $(am__objects_10)
51 am__objects_12 = libgio_2_0_la-xdp-dbus.lo 60 am__objects_12 = libgio_2_0_la-xdp-dbus.lo
52 am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \ 61 am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \
53@@ -594,12 +593,9 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l 62@@ -603,13 +602,10 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l
54 $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ 63 $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
55 libgio_objc_2_0_la_LIBADD = 64 libgio_objc_2_0_la_LIBADD =
56 am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \ 65 am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \
57- gosxcontenttype.c gosxappinfo.c gosxappinfo.h \ 66- gosxcontenttype.c gosxappinfo.c gosxappinfo.h \
58 gcocoanotificationbackend.c 67 gcocoanotificationbackend.c
 68 @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__objects_23 = libgio_objc_2_0_la-gcocoanotificationbackend.lo
59 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS = \ 69 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS = \
60 @OS_COCOA_TRUE@ libgio_objc_2_0_la-gnextstepsettingsbackend.lo \ 70 @OS_COCOA_TRUE@ libgio_objc_2_0_la-gnextstepsettingsbackend.lo \
61-@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxcontenttype.lo \ 71-@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxcontenttype.lo \
62-@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxappinfo.lo \ 72-@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxappinfo.lo \
63 @OS_COCOA_TRUE@ libgio_objc_2_0_la-gcocoanotificationbackend.lo 73 @OS_COCOA_TRUE@ $(am__objects_23)
64 libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS) 74 libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS)
65 libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ 75 libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
66@@ -607,22 +603,20 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A 76@@ -618,15 +614,15 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A
67 $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) \ 
68 $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ 77 $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
69 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath = 78 @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath =
70-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) 
71+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) 
72 am__EXEEXT_2 = 
73 @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2) 
74 @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2) 
75 PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \ 
76 $(noinst_PROGRAMS) 
77 am__gapplication_SOURCES_DIST = gapplication-tool.c 79 am__gapplication_SOURCES_DIST = gapplication-tool.c
78-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \ 80-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
79-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT) 81-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
80+@OS_UNIX_TRUE@am_gapplication_OBJECTS = gapplication-tool.$(OBJEXT) 82+@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
 83+@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
81 gapplication_OBJECTS = $(am_gapplication_OBJECTS) 84 gapplication_OBJECTS = $(am_gapplication_OBJECTS)
82-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \ 85-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
83-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \ 86-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \
84-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ 87-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
85-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ 88-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
86-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ 89-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
87-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) 90-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
88+@OS_UNIX_TRUE@gapplication_DEPENDENCIES = libgio-2.0.la \ 91+@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
 92+@OS_UNIX_TRUE@ libgio-2.0.la \
89+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ 93+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
90+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ 94+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
91+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ 95+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
92+@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) 96+@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
93 am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT) 97 am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
94 gdbus_OBJECTS = $(am_gdbus_OBJECTS) 98 gdbus_OBJECTS = $(am_gdbus_OBJECTS)
95 gdbus_DEPENDENCIES = libgio-2.0.la \ 99 gdbus_DEPENDENCIES = libgio-2.0.la \
96@@ -945,8 +939,7 @@ am__set_b = \ 100@@ -1189,8 +1185,7 @@ am__set_b = \
97 *) \ 101 *) \
98 b='$*';; \ 102 b='$*';; \
99 esac 103 esac
100-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \ 104-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \
101- fam 105- fam
102+DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam 106+DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam
103 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \ 107 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
104 $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \ 108 $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
105 $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \ 109 $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
106@@ -1050,6 +1043,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ 110@@ -1294,6 +1289,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
107 GTKDOC_MKPDF = @GTKDOC_MKPDF@ 111 GTKDOC_MKPDF = @GTKDOC_MKPDF@
108 GTKDOC_REBASE = @GTKDOC_REBASE@ 112 GTKDOC_REBASE = @GTKDOC_REBASE@
109 G_LIBS_EXTRA = @G_LIBS_EXTRA@ 113 G_LIBS_EXTRA = @G_LIBS_EXTRA@
110+G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@ 114+G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@
111 G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@ 115 G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@
112 G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@ 116 G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@
113 G_MODULE_IMPL = @G_MODULE_IMPL@ 117 G_MODULE_IMPL = @G_MODULE_IMPL@
114@@ -1327,8 +1321,8 @@ all_test_ltlibs = $(test_ltlibraries) $( 118@@ -1571,8 +1567,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
115 @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) 119 @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
116  120
117 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) 121 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
118-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \ 122-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \
119- $(am__append_21) $(am__append_24) . tests $(am__append_27) 123- $(am__append_21) $(am__append_24) . tests $(am__append_27)
120+SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \ 124+SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \
121+ $(am__append_24) . $(am__append_27) 125+ $(am__append_24) . $(am__append_27)
122 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) 126 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
123 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib 127 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
124 AM_CPPFLAGS = \ 128 AM_CPPFLAGS = \
125@@ -1793,9 +1787,6 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG 129@@ -2036,8 +2032,8 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
 130 @OS_COCOA_TRUE@libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
126 @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit 131 @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
127 @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \ 132 @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \
128 @OS_COCOA_TRUE@ gnextstepsettingsbackend.c \ 133-@OS_COCOA_TRUE@ gnextstepsettingsbackend.c gosxcontenttype.c \
129-@OS_COCOA_TRUE@ gosxcontenttype.c \ 134-@OS_COCOA_TRUE@ gosxappinfo.c gosxappinfo.h $(am__append_37)
130-@OS_COCOA_TRUE@ gosxappinfo.c \ 135+@OS_COCOA_TRUE@ gnextstepsettingsbackend.c \
131-@OS_COCOA_TRUE@ gosxappinfo.h \ 136+@OS_COCOA_TRUE@ $(am__append_37)
132 @OS_COCOA_TRUE@ gcocoanotificationbackend.c 
133  
134 EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps) 137 EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
135@@ -1966,12 +1957,12 @@ gdbus_LDADD = libgio-2.0.la \ 138 gio_headers = \
 139 gappinfo.h \
 140@@ -2206,12 +2202,12 @@ gdbus_LDADD = libgio-2.0.la \
136 $(top_builddir)/glib/libglib-2.0.la \ 141 $(top_builddir)/glib/libglib-2.0.la \
137 $(NULL) 142 $(NULL)
138  143
139-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c 144-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
140-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ 145-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
141-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ 146-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
142-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ 147-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
143-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ 148-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
144-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL) 149-@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL)
145+@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c 150+@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
146+@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ 151+@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
147+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ 152+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
148+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ 153+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
149+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ 154+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
150+@OS_UNIX_TRUE@ $(NULL) 155+@OS_UNIX_TRUE@ $(NULL)
151  156
152 completiondir = $(datadir)/bash-completion/completions 157 completiondir = $(datadir)/bash-completion/completions
153 completion_DATA = \ 158 completion_DATA = \
154@@ -2637,8 +2628,6 @@ distclean-compile: 159@@ -2877,8 +2873,6 @@ distclean-compile:
155 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ 160 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ # am--include-marker
156 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ 161 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ # am--include-marker
157 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ 162 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ # am--include-marker
158-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ 163-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ # am--include-marker
159-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ 164-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ # am--include-marker
160 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ 165 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ # am--include-marker
161 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ 166 @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ # am--include-marker
162  167
163@@ -4213,20 +4202,6 @@ libgio_objc_2_0_la-gnextstepsettingsback 168@@ -4459,20 +4453,6 @@ libgio_objc_2_0_la-gnextstepsettingsback
164 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 169 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
165 @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 170 @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
166  171
167-libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c 172-libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c
168-@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 173-@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
169-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo 174-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo
170-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@ 175-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@
171-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 176-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
172-@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 177-@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
173- 178-
174-libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c 179-libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c
175-@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 180-@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
176-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo 181-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo

cvs diff -r1.14 -r1.15 pkgsrc/devel/glib2/patches/Attic/patch-cl (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-cl 2018/05/21 08:39:38 1.14
+++ pkgsrc/devel/glib2/patches/Attic/patch-cl 2018/08/19 18:32:27 1.15
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-cl,v 1.14 2018/05/21 08:39:38 jperkin Exp $ 1$NetBSD: patch-cl,v 1.15 2018/08/19 18:32:27 wiz Exp $
2 2
3- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package. 3- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
4- Don't compile tests as they include gdbus-codegen tests. 4- Don't compile tests as they include gdbus-codegen tests.
5- Don't install completion data. 5- Don't install completion data.
6- Re-enable gdesktopappinfo on Darwin. 6- Re-enable gdesktopappinfo on Darwin.
7 7
8--- gio/Makefile.am.orig 2018-03-12 16:23:37.000000000 +0000 8--- gio/Makefile.am.orig 2018-08-17 00:03:20.000000000 +0000
9+++ gio/Makefile.am 9+++ gio/Makefile.am
10@@ -1,6 +1,6 @@ 10@@ -1,6 +1,6 @@
11 include $(top_srcdir)/glib.mk 11 include $(top_srcdir)/glib.mk
12  12
13-SUBDIRS = gdbus-2.0/codegen 13-SUBDIRS = gdbus-2.0/codegen
14+SUBDIRS =  14+SUBDIRS =
15  15
16 if OS_UNIX 16 if OS_UNIX
17 SUBDIRS += xdgmime 17 SUBDIRS += xdgmime
18@@ -246,7 +246,7 @@ platform_libadd += win32/libgiowin32.la 18@@ -246,7 +246,7 @@ platform_libadd += win32/libgiowin32.la
19 platform_deps += win32/libgiowin32.la 19 platform_deps += win32/libgiowin32.la
20 endif 20 endif
21  21
@@ -42,33 +42,33 @@ $NetBSD: patch-cl,v 1.14 2018/05/21 08:3 @@ -42,33 +42,33 @@ $NetBSD: patch-cl,v 1.14 2018/05/21 08:3
42 contenttype_sources += gcontenttype.c 42 contenttype_sources += gcontenttype.c
43 appinfo_sources += gdesktopappinfo.c 43 appinfo_sources += gdesktopappinfo.c
44 endif 44 endif
45-endif 45-endif
46  46
47 gio_base_sources = \ 47 gio_base_sources = \
48 gappinfo.c \ 48 gappinfo.c \
49@@ -610,9 +606,6 @@ libgio_objc_2_0_la_CPPFLAGS = $(libgio_2 49@@ -610,9 +606,6 @@ libgio_objc_2_0_la_CPPFLAGS = $(libgio_2
50 libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit 50 libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
51 libgio_objc_2_0_la_SOURCES = \ 51 libgio_objc_2_0_la_SOURCES = \
52 gnextstepsettingsbackend.c \ 52 gnextstepsettingsbackend.c \
53- gosxcontenttype.c \ 53- gosxcontenttype.c \
54- gosxappinfo.c \ 54- gosxappinfo.c \
55- gosxappinfo.h \ 55- gosxappinfo.h
 56 if MAC_OS_X_9
 57 libgio_objc_2_0_la_SOURCES += \
56 gcocoanotificationbackend.c 58 gcocoanotificationbackend.c
57  59@@ -893,7 +886,6 @@ gdbus_LDADD = libgio-2.0.la \
58 noinst_LTLIBRARIES += libgio-objc-2.0.la 
59@@ -890,7 +883,6 @@ gdbus_LDADD = libgio-2.0.la \ 
60 $(NULL) 60 $(NULL)
61  61
62 if OS_UNIX 62 if OS_UNIX
63-if !OS_COCOA 63-if !OS_COCOA
64 # ------------------------------------------------------------------------ 64 # ------------------------------------------------------------------------
65 # gapplication(1) tool 65 # gapplication(1) tool
66 bin_PROGRAMS += gapplication 66 bin_PROGRAMS += gapplication
67@@ -901,7 +893,6 @@ gapplication_LDADD = libgio-2.0.la \ 67@@ -904,7 +896,6 @@ gapplication_LDADD = libgio-2.0.la \
68 $(top_builddir)/glib/libglib-2.0.la \ 68 $(top_builddir)/glib/libglib-2.0.la \
69 $(NULL) 69 $(NULL)
70 endif 70 endif
71-endif 71-endif
72  72
73 completiondir = $(datadir)/bash-completion/completions 73 completiondir = $(datadir)/bash-completion/completions
74 completion_DATA = \ 74 completion_DATA = \

File Deleted: pkgsrc/devel/glib2/patches/Attic/patch-gio_gfile.c