<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150552] trunk/dports/devel/glib2-devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150552">150552</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-07-21 08:08:29 -0700 (Thu, 21 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>glib2-devel: update and simplify remove-gcocoanotificationbackend.patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2develPortfile">trunk/dports/devel/glib2-devel/Portfile</a></li>
<li><a href="#trunkdportsdevelglib2develfilesremovegcocoanotificationbackendpatch">trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglib2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2-devel/Portfile (150551 => 150552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/Portfile 2016-07-21 14:20:03 UTC (rev 150551)
+++ trunk/dports/devel/glib2-devel/Portfile 2016-07-21 15:08:29 UTC (rev 150552)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> name glib2-devel
</span><span class="cx"> conflicts glib2
</span><span class="cx"> set my_name glib
</span><del>-version 2.49.4
</del><ins>+version 2.49.4
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> maintainers ryandesign openmaintainer
</span></span></pre></div>
<a id="trunkdportsdevelglib2develfilesremovegcocoanotificationbackendpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch (150551 => 150552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2016-07-21 14:20:03 UTC (rev 150551)
+++ trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2016-07-21 15:08:29 UTC (rev 150552)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
</span><span class="cx"> And most of:
</span><span class="cx"> https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
</span><del>---- configure.orig 2015-09-21 07:39:10.000000000 -0500
-+++ configure 2015-10-10 18:33:12.000000000 -0500
-@@ -6029,30 +5969,6 @@
</del><ins>+--- configure.orig 2016-07-21 09:50:51.000000000 -0500
++++ configure 2016-07-21 09:50:52.000000000 -0500
+@@ -6042,30 +6042,6 @@
</ins><span class="cx"> COCOA_LIBS="-Wl,-framework,Foundation"
</span><span class="cx"> LDFLAGS="$LDFLAGS $COCOA_LIBS"
</span><span class="cx">
</span><span class="lines">@@ -36,193 +36,52 @@
</span><span class="cx"> else
</span><span class="cx"> COCOA_LIBS=""
</span><span class="cx"> fi
</span><del>---- gio/Makefile.in.orig 2015-09-21 07:39:06.000000000 -0500
-+++ gio/Makefile.in 2015-10-10 18:33:18.000000000 -0500
-@@ -181,27 +181,26 @@
- @OS_UNIX_TRUE@am__append_29 = gdesktopappinfo.c
</del><ins>+--- gio/Makefile.in.orig 2016-07-20 19:54:01.000000000 -0500
++++ gio/Makefile.in 2016-07-21 10:03:11.000000000 -0500
+@@ -172,7 +172,6 @@
+ @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
</ins><span class="cx"> @OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
</span><del>- @OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
</del><ins>+ @OS_UNIX_TRUE@am__append_31 = $(unix_appinfo_sources)
</ins><span class="cx"> -@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
</span><del>--@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
-+@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_32 = \
</del><ins>+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
</ins><span class="cx"> @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
</span><span class="cx"> @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
</span><del>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.c \
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.h \
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(NULL)
</del><ins>+@@ -185,7 +184,7 @@
</ins><span class="cx">
</span><del>--@OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
--@OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
-+@OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
-+@OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
-
</del><span class="cx"> # This is dumb. The ObjC source file should be properly named .m
</span><del>--@OS_COCOA_TRUE@am__append_36 = -xobjective-c
</del><ins>+ @OS_COCOA_TRUE@am__append_36 = -xobjective-c
</ins><span class="cx"> -@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
</span><del>-+@OS_COCOA_TRUE@am__append_35 = -xobjective-c
-+@OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
</del><ins>++@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation
</ins><span class="cx"> bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
</span><span class="cx"> glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
</span><del>- gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)
-
- # ------------------------------------------------------------------------
- # gapplication(1) tool
--@OS_UNIX_TRUE@am__append_38 = gapplication
-+@OS_UNIX_TRUE@am__append_37 = gapplication
- subdir = gio
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -317,17 +316,17 @@
- gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
- gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
- gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
-- ggtknotificationbackend.c gcocoanotificationbackend.c \
-- gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
-- gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
-- gdbusdaemon.h gdbus-daemon-generated.c \
-- gdbus-daemon-generated.h gwin32registrykey.c \
-- gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
-- gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
-- gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
-- gwin32networking.h gapplication.c gapplicationcommandline.c \
-- gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
-- gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
-+ ggtknotificationbackend.c gnetworkmonitornetlink.c \
-+ gnetworkmonitornetlink.h gnetworkmonitornm.c \
-+ gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
-+ gdbus-daemon-generated.c gdbus-daemon-generated.h \
-+ gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
-+ gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
-+ gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
-+ gwin32outputstream.h gwin32networking.h gapplication.c \
-+ gapplicationcommandline.c gapplicationimpl-dbus.c \
-+ gapplicationimpl.h gactiongroup.c gactionmap.c \
-+ gsimpleactiongroup.c gremoteactiongroup.c \
- gactiongroupexporter.c gdbusactiongroup-private.h \
- gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
- gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
-@@ -373,11 +372,10 @@
- @OS_WIN32_TRUE@am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
- am__objects_3 = $(am__objects_1) $(am__objects_2)
- am__objects_4 =
--@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
--@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
-+@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
</del><ins>+ gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT) gio$(EXEEXT)
+@@ -357,7 +356,7 @@
+ gportalsupport.h gnetworkmonitorportal.c \
+ gnetworkmonitorportal.h gproxyresolverportal.c \
+ gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \
+- gcocoanotificationbackend.c gnetworkmonitornetlink.c \
++ gnetworkmonitornetlink.c \
+ gnetworkmonitornetlink.h gnetworkmonitornm.c \
+ gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
+ gdbus-daemon-generated.c gdbus-daemon-generated.h \
+@@ -518,7 +517,6 @@
+ am__objects_12 = libgio_2_0_la-gnetworkmonitorportal.lo \
+ libgio_2_0_la-gproxyresolverportal.lo $(am__objects_11) \
+ $(am__objects_1)
+-@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_13 = libgio_2_0_la-gcocoanotificationbackend.lo
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_14 = libgio_2_0_la-gnetworkmonitornetlink.lo \
</ins><span class="cx"> @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ libgio_2_0_la-gnetworkmonitornm.lo \
</span><del>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(am__objects_4)
--@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
-+@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
- @OS_UNIX_TRUE@ libgio_2_0_la-gunixconnection.lo \
- @OS_UNIX_TRUE@ libgio_2_0_la-gunixcredentialsmessage.lo \
- @OS_UNIX_TRUE@ libgio_2_0_la-gunixfdlist.lo \
-@@ -392,18 +390,17 @@
- @OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo \
- @OS_UNIX_TRUE@ libgio_2_0_la-gfdonotificationbackend.lo \
- @OS_UNIX_TRUE@ libgio_2_0_la-ggtknotificationbackend.lo \
--@OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5) \
--@OS_UNIX_TRUE@ $(am__objects_6)
--am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
-+@OS_UNIX_TRUE@ $(am__objects_4) $(am__objects_5)
-+am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
- libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
--am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
-+am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
- libgio_2_0_la-gcontenttype-win32.lo \
- libgio_2_0_la-gwin32mount.lo \
- libgio_2_0_la-gwin32volumemonitor.lo \
- libgio_2_0_la-gwin32inputstream.lo \
- libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
--@OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
--am__objects_11 = libgio_2_0_la-gapplication.lo \
-+@OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
-+am__objects_10 = libgio_2_0_la-gapplication.lo \
- libgio_2_0_la-gapplicationcommandline.lo \
- libgio_2_0_la-gapplicationimpl-dbus.lo \
- libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
-@@ -416,11 +413,11 @@
- libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
- libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
- libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
--@OS_WIN32_TRUE@am__objects_12 = \
-+@OS_WIN32_TRUE@am__objects_11 = \
- @OS_WIN32_TRUE@ libgio_2_0_la-gregistrysettingsbackend.lo
--@OS_COCOA_TRUE@am__objects_13 = \
-+@OS_COCOA_TRUE@am__objects_12 = \
- @OS_COCOA_TRUE@ libgio_2_0_la-gnextstepsettingsbackend.lo
--am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
-+am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
- libgio_2_0_la-gdelayedsettingsbackend.lo \
- libgio_2_0_la-gkeyfilesettingsbackend.lo \
- libgio_2_0_la-gmemorysettingsbackend.lo \
-@@ -428,8 +425,8 @@
- libgio_2_0_la-gsettingsbackend.lo \
- libgio_2_0_la-gsettingsschema.lo \
- libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
-- $(am__objects_12) $(am__objects_13)
--am__objects_15 = libgio_2_0_la-gdbusutils.lo \
-+ $(am__objects_11) $(am__objects_12)
-+am__objects_14 = libgio_2_0_la-gdbusutils.lo \
- libgio_2_0_la-gdbusaddress.lo \
- libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
- libgio_2_0_la-gdbusauthmechanism.lo \
-@@ -451,7 +448,7 @@
- libgio_2_0_la-gdbusobjectmanagerclient.lo \
- libgio_2_0_la-gdbusobjectmanagerserver.lo \
- libgio_2_0_la-gtestdbus.lo $(am__objects_4)
--am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
-+am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
- libgio_2_0_la-glocalfile.lo \
- libgio_2_0_la-glocalfileenumerator.lo \
- libgio_2_0_la-glocalfileinfo.lo \
-@@ -545,9 +542,9 @@
- libgio_2_0_la-gzlibcompressor.lo \
- libgio_2_0_la-gzlibdecompressor.lo \
- libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
-- libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
-- $(am__objects_10) $(am__objects_11) $(am__objects_14) \
-- $(am__objects_15) $(am__objects_16) $(am__objects_4)
-+ libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
-+ $(am__objects_9) $(am__objects_10) $(am__objects_13) \
-+ $(am__objects_14) $(am__objects_15) $(am__objects_4)
- libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -1416,10 +1413,10 @@
- $(NULL)
-
- platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
-- $(am__append_30) $(am__append_35)
-+ $(am__append_30) $(am__append_34)
- platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
- $(am__append_31)
--appinfo_sources = $(am__append_29) $(am__append_34)
-+appinfo_sources = $(am__append_29) $(am__append_33)
- @OS_UNIX_TRUE@unix_sources = gfiledescriptorbased.c gunixconnection.c \
- @OS_UNIX_TRUE@ gunixcredentialsmessage.c gunixfdlist.c \
- @OS_UNIX_TRUE@ gunixfdmessage.c gunixmount.c gunixmount.h \
-@@ -1429,7 +1426,7 @@
- @OS_UNIX_TRUE@ gunixoutputstream.c gcontenttype.c \
- @OS_UNIX_TRUE@ gcontenttypeprivate.h gfdonotificationbackend.c \
- @OS_UNIX_TRUE@ ggtknotificationbackend.c $(NULL) \
--@OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
-+@OS_UNIX_TRUE@ $(am__append_32)
- @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
- @OS_UNIX_TRUE@giounixinclude_HEADERS = \
- @OS_UNIX_TRUE@ gdesktopappinfo.h \
-@@ -1650,10 +1647,10 @@
- @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
- @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
- libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
-- $(am__append_36)
-+ $(am__append_35)
- libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -export-dynamic $(no_undefined) $(am__append_37)
-+ -export-dynamic $(no_undefined) $(am__append_36)
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
- gio_headers = \
- gappinfo.h \
-@@ -2206,7 +2203,6 @@
</del><ins>+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(am__objects_1)
+@@ -541,7 +539,7 @@
+ @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
+ @OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
+ @OS_UNIX_TRUE@ $(am__objects_12) $(am__objects_1) \
+-@OS_UNIX_TRUE@ $(am__objects_13) $(am__objects_14)
++@OS_UNIX_TRUE@ $(am__objects_14)
+ am__objects_16 = libgio_2_0_la-gdbusdaemon.lo \
+ libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_1)
+ am__objects_17 = $(am__objects_16) libgio_2_0_la-gwin32registrykey.lo \
+@@ -2353,7 +2351,6 @@
</ins><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
</span><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
</span><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
</span><span class="lines">@@ -230,9 +89,9 @@
</span><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
</span><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
</span><span class="cx"> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
</span><del>-@@ -3324,13 +3320,6 @@
</del><ins>+@@ -3957,13 +3954,6 @@
</ins><span class="cx"> @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><del>- @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-ggtknotificationbackend.lo `test -f 'ggtknotificationbackend.c' || echo '$(srcdir)/'`ggtknotificationbackend.c
</del><ins>+ @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-xdp-dbus.lo `test -f 'xdp-dbus.c' || echo '$(srcdir)/'`xdp-dbus.c
</ins><span class="cx">
</span><span class="cx"> -libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
</span><span class="cx"> -@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-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
</span><span class="lines">@@ -244,10 +103,10 @@
</span><span class="cx"> libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
</span><span class="cx"> @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-gnetworkmonitornetlink.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo -c -o libgio_2_0_la-gnetworkmonitornetlink.lo `test -f 'gnetworkmonitornetlink.c' || echo '$(srcdir)/'`gnetworkmonitornetlink.c
</span><span class="cx"> @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
</span><del>---- gio/giomodule.c.orig 2015-08-18 22:35:30.000000000 -0500
-+++ gio/giomodule.c 2015-10-10 18:32:39.000000000 -0500
-@@ -911,10 +911,6 @@
- extern GType g_gtk_notification_backend_get_type (void);
</del><ins>+--- gio/giomodule.c.orig 2016-07-16 22:29:01.000000000 -0500
++++ gio/giomodule.c 2016-07-21 09:50:52.000000000 -0500
+@@ -918,10 +918,6 @@
+ extern GType g_network_monitor_portal_get_type (void);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> -#ifdef HAVE_COCOA
</span><span class="lines">@@ -257,9 +116,9 @@
</span><span class="cx"> #ifdef G_PLATFORM_WIN32
</span><span class="cx">
</span><span class="cx"> #include <windows.h>
</span><del>-@@ -1088,9 +1084,6 @@
- g_type_ensure (g_fdo_notification_backend_get_type ());
- g_type_ensure (g_gtk_notification_backend_get_type ());
</del><ins>+@@ -1121,9 +1117,6 @@
+ g_type_ensure (g_network_monitor_portal_get_type ());
+ g_type_ensure (g_proxy_resolver_portal_get_type ());
</ins><span class="cx"> #endif
</span><span class="cx"> -#ifdef HAVE_COCOA
</span><span class="cx"> - g_type_ensure (g_cocoa_notification_backend_get_type ());
</span></span></pre>
</div>
</div>
</body>
</html>