[MacPorts] #37774: webkit-gtk @1.10.2+universal: WebKitDOMNavigator.h header merged incorrectly

[MacPorts]

#37774: webkit-gtk @1.10.2+universal: WebKitDOMNavigator.h header merged
incorrectly
--------------------------+------------------------
 Reporter:  ryandesign@…  |      Owner:  jeremyhu@…
     Type:  defect        |     Status:  new
 Priority:  Normal        |  Milestone:
Component:  ports         |    Version:  2.1.2
 Keywords:                |       Port:  webkit-gtk
--------------------------+------------------------
 I have webkit-gtk @1.10.2+universal installed and am working on a
 [ticket:25261 portfile for gphpedit @0.9.98] and the build fails with:

 {{{
 /opt/local/include/webkitgtk-1.0/webkit/WebKitDOMNavigator.h:81:50: error:
 expected ';' after top level declarator
  * webkit_dom_navigator_register_protocol_handler:
                                                  ^
                                                  ;
 }}}

 Looking in /opt/local/include/webkitgtk-1.0/webkit/WebKitDOMNavigator.h I
 see that the muniversal portgroup has mangled this header; these are lines
 68 thru 90 of that header:

 {{{
 /**
 #ifndef __LP64__
  * webkit_dom_navigator_webkit_get_gamepads:
  * @self: A #WebKitDOMNavigator
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMGamepadList*
 webkit_dom_navigator_webkit_get_gamepads(WebKitDOMNavigator* self);

 /**
 #endif /* ! __LP64__ */
  * webkit_dom_navigator_register_protocol_handler:
  * @self: A #WebKitDOMNavigator
  * @scheme: A #gchar
  * @url: A #gchar
  * @title: A #gchar
  * @error: #GError
  *
  * Returns:
  *
 **/
 }}}

 The "`/* ! __LP64__ */`" comment innocently inserted by the muniversal
 portgroup was unfortunately inserted inside an existing block comment,
 thus ending the block comment prematurely.

 I think this is the only header that got mangled; it's the only file
 installed by the port that contains "`__LP64__`".

 The solution should be to tell muniversal to not diff that file but to
 employ an alternate strategy, by setting "`merger_dont_diff`" to the list
 of files not to diff. I'll test and then attach a patch to do this.

-- 
Ticket URL: <https://trac.macports.org/ticket/37774>
MacPorts <http://www.macports.org/>
Ports system for Mac OS