graphene 1.8.2: difficulty building +universal

[kencu (Ken)]

I've had graphene built as +universal since forever I believe, but on this last update it fails to build. I see it was recently altered to help it build universal. I'm not sure how I had it built universal before, in fact, but I did.

The error comes with three text files that don't lipo, of course. The following fixes it, possibly incorrectly:

# gobject-introspection uses g-ir-scanner, which uses $CC from env
if {[variant_isset universal]} {
    foreach arch ${configure.universal_archs} {
        lappend merger_build_env(${arch})  CC='${configure.cc} -arch ${arch}'
        lappend merger_destroot_env(${arch})  CC='${configure.cc} -arch ${arch}'
    }
+    global merger_dont_diff
+    lappend merger_dont_diff    "${prefix}/lib/pkgconfig/graphene-1.0.pc"
+    lappend merger_dont_diff    "${prefix}/lib/pkgconfig/graphene-gobject-1.0.pc"
+    lappend merger_dont_diff    "${prefix}/lib/graphene-1.0/include/graphene-config.h"
} else {