Ticket #54543: glib2-devel-genmarshal-review.patch

devel/glib2-devel/Portfile

@@ -9 +9 @@
 conflicts                   glib2
 set my_name                 glib
 version                     2.53.4
+revision                    1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 {ryandesign @ryandesign} openmaintainer
@@ -36 +37 @@
 # patch-configure-switch-for-gappinfo-impl-mp.diff: understand comments inline!
 #   => https://trac.macports.org/ticket/53911
 #   => https://bugzilla.gnome.org/show_bug.cgi?id=781548
+# patch-gobject_glib-genmarshal.in-fix-CXX-projects.diff:
+#   => https://trac.macports.org/ticket/54543
+#   => https://bugzilla.gnome.org/show_bug.cgi?id=785554
 patchfiles                  patch-configure.diff \
                             patch-glib-2.0.pc.in.diff \
                             patch-glib-gmain.c.diff \
@@ -45 +49 @@
                             patch-gio_gdbusprivate.c.diff \
                             patch-get-launchd-dbus-session-address.diff \
                             patch-gmodule-gmodule-dl.c.diff \
-                            patch-configure-switch-for-gappinfo-impl-mp.diff
+                            patch-configure-switch-for-gappinfo-impl-mp.diff \
+                            patch-gobject_glib-genmarshal.in-fix-CXX-projects.diff
 
 depends_build               bin:xmllint:libxml2
 

new file devel/glib2-devel/files/patch-gobject_glib-genmarshal.in-fix-CXX-projects.diff

@@ +1 @@
+--- gobject/glib-genmarshal.in.old      2017-07-17 16:21:48.000000000 +0200
++++ gobject/glib-genmarshal.in  2017-07-29 09:22:31.000000000 +0200
+@@ -556,7 +556,7 @@ def generate_prototype(retval, params,
+                        va_marshal=False):
+     '''Generate a marshaller declaration with the given @visibility. If @va_marshal
+     is True, the marshaller will use variadic arguments in place of a GValue array.'''
+-    signature = []
++    signature = ['G_BEGIN_DECLS']
+ 
+     if visibility == Visibility.INTERNAL:
+         signature += ['G_GNUC_INTERNAL']
+@@ -585,6 +585,8 @@ def generate_prototype(retval, params,
+         signature += [indent('int       n_params,', level=width, fill=' ')]
+         signature += [indent('GType    *param_types);', level=width, fill=' ')]
+ 
++    signature += ['G_END_DECLS']
++
+     return signature
+ 
+