<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9357696d65ca987ca83e20e375034219361c6e1a">https://github.com/macports/macports-ports/commit/9357696d65ca987ca83e20e375034219361c6e1a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9357696d65ca987ca83e20e375034219361c6e1a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jul 15 12:08:46 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> glibmm: update version 2.44.0->2.52.0
</span>---
devel/glibmm/Portfile | 31 ++++++++--
devel/glibmm/files/patch-add_cocoa_test.diff | 91 ++++++++++++++++++++++++++++
devel/glibmm/files/patch-no_cocoa.diff | 11 ++++
devel/glibmm/files/patch-use_cocoa_test.diff | 55 +++++++++++++++++
4 files changed, 183 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm/Portfile b/devel/glibmm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df3d365..efdb0e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glibmm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name glibmm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.44.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.52.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description C++ interface to glib
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +18,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bdfa028a5451b4cfffdc824d3f5515a976151e19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c8ba6cb946a8012d0374826010bc43a29ca4d07c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81b8abf21c645868c06779abc5f34efc1a51d5e61589dab2a2ed67faa8d4811e
</span>
depends_build port:pkgconfig \
port:mm-common
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +37,28 @@ post-destroot {
</span> set mmdoctooldir ${prefix}/share/glibmm-2.4/doctool
xinstall -d ${destroot}${mmdoctooldir}
xinstall -m 0644 -W ${worksrcpath}/docs doc-install.pl doc-postprocess.pl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- doxygen.css tagfile-to-devhelp2.xsl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tagfile-to-devhelp2.xsl \
</span> ${destroot}${mmdoctooldir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/docs/reference/html doxygen.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${mmdoctooldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://bugzilla.gnome.org/show_bug.cgi?id=781947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-add_cocoa_test.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use_cocoa_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-no_cocoa.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm/files/patch-add_cocoa_test.diff b/devel/glibmm/files/patch-add_cocoa_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..59065d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm/files/patch-add_cocoa_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d4ff521d7d40fd984215353a1c6097729a867308 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 3 Jul 2017 13:32:54 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Gio: Exclude DesktopAppInfo from wrap_init.cc on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Modify the conditional inclusion of desktopappinfo.h in giomm.h and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wrap_init.cc. It shall not be included when running under MacOS. This should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+have been fixed by commit dd671f29ff9a005776ebd9e7cf20fdc5e44c14b8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug 781947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/giomm.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/src/desktopappinfo.hg | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/glibmmconfig.h.in | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 13 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 744e50b1..85fb4711 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,8 @@ AS_CASE([$host_os], [mingw*], [glibmm_host_windows=yes], [glibmm_host_windows=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([$glibmm_host_windows])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$glibmm_host_windows" = xyes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This test for Mac OS is copied from glib. If the result of glib's test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# is ever made available outside glib, use glib's result instead of this test.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_have_cocoa=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for Mac OS X Cocoa support])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_TRY_CPP([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,6 +68,10 @@ AC_TRY_CPP([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([$glib_have_cocoa])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AS_IF([test "$glib_have_cocoa" = "yes"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_DEFINE([GLIBMM_OS_COCOA], [1], [Define only on Mac OS, COCOA])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: This makes no sense. --danielk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "x$enable_static" = xyes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gio/giomm.h b/gio/giomm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b79ed1e..d39df608 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <giomm/dbussubtreevtable.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <giomm/dbusutils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <giomm/dbuswatchname.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <giomm/desktopappinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <giomm/drive.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ba654289..6a9f1305 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/src/desktopappinfo.hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/src/desktopappinfo.hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,9 @@ _CONFIGINCLUDE(giommconfig.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _DEFS(giomm,gio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _PINCLUDE(glibmm/private/object_p.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This file is not used on Windows and Mac OS Cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_GMMPROC_WRAP_CONDITIONALLY(if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace Glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +47,6 @@ class DesktopAppInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _CLASS_GOBJECT(DesktopAppInfo, GDesktopAppInfo, G_DESKTOP_APP_INFO, Glib::Object, GObject)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _IMPLEMENTS_INTERFACE(AppInfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _GTKMMPROC_WIN32_NO_WRAP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // TODO: should use _WRAP_CREATE(), but these functions do more than just call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a36c293b..e5639cb7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glibmmconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/glibmmconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLIBMM_CONFIGURE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define only on Mac OS, COCOA */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef GLIBMM_OS_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define if extern "C" and extern "C++" function pointers are compatible. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.11.0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm/files/patch-no_cocoa.diff b/devel/glibmm/files/patch-no_cocoa.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..75784b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm/files/patch-no_cocoa.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-07-15 08:57:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-07-15 09:41:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_have_cocoa=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for Mac OS X Cocoa support])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_TRY_CPP([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#error "Detecte Mac OS X Cocoa support"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GNUSTEP_BASE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "Detected GNUstep, not Cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm/files/patch-use_cocoa_test.diff b/devel/glibmm/files/patch-use_cocoa_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a25b60b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm/files/patch-use_cocoa_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomm/wrap_init.cc.orig 2017-06-23 00:19:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomm/wrap_init.cc 2017-07-15 09:12:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,9 +52,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dbussubtreevtable.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dbusutils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dbuswatchname.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "desktopappinfo.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "drive.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "emblem.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "emblemedicon.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,9 +186,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_dbus_method_invocation_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_dbus_proxy_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_dbus_server_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_desktop_app_info_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_emblem_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_emblemed_icon_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType g_file_enumerator_get_type(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -429,9 +429,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_dbus_method_invocation_get_type(), &DBus::MethodInvocation_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_dbus_proxy_get_type(), &DBus::Proxy_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_dbus_server_get_type(), &DBus::Server_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_desktop_app_info_get_type(), &DesktopAppInfo_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_emblem_get_type(), &Emblem_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_emblemed_icon_get_type(), &EmblemedIcon_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::wrap_register(g_file_enumerator_get_type(), &FileEnumerator_Class::wrap_new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -533,9 +533,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBus::MethodInvocation::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBus::Proxy::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBus::Server::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DesktopAppInfo::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // if !defined(G_OS_WIN32) && !defined(GLIBMM_OS_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Emblem::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EmblemedIcon::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FileEnumerator::get_type();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -618,4 +618,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // wrap_init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // Gio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span></pre><pre style='margin:0'>
</pre>