[129083] trunk/dports/gnome/gcr

[jeremyhu at macports.org]

Revision: 129083
          https://trac.macports.org/changeset/129083
Author:   jeremyhu at macports.org
Date:     2014-12-04 22:15:42 -0800 (Thu, 04 Dec 2014)
Log Message:
-----------
gcr: Fix build failure (#45293)

Modified Paths:
--------------
    trunk/dports/gnome/gcr/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff

Modified: trunk/dports/gnome/gcr/Portfile
===================================================================
--- trunk/dports/gnome/gcr/Portfile	2014-12-05 05:28:23 UTC (rev 129082)
+++ trunk/dports/gnome/gcr/Portfile	2014-12-05 06:15:42 UTC (rev 129083)
@@ -41,7 +41,8 @@
 
 patchfiles      patch-egg-egg-asn1x.h.diff \
                 patch-egg-egg-armor.c.diff \
-                patch-ui-gcr.pc.in.diff
+                patch-ui-gcr.pc.in.diff \
+                patch-gcr-Makefile.am.diff
 
 # gcr uses X11 specific code in UI (#41839)
 # https://bugzilla.gnome.org/show_bug.cgi?id=734366
@@ -67,6 +68,7 @@
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
 
 pre-activate {
     if {![catch {set installed [lindex [registry_active gnome-keyring] 0]}]} {

Added: trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff	2014-12-05 06:15:42 UTC (rev 129083)
@@ -0,0 +1,19 @@
+--- gcr/Makefile.am.orig	2014-09-23 00:40:08.000000000 -0700
++++ gcr/Makefile.am	2014-12-04 21:59:38.000000000 -0800
+@@ -159,13 +159,13 @@ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEF
+ 	$(AM_V_GEN) $(GDBUS_CODEGEN) --interface-prefix org.gnome.keyring.internal. \
+ 		--generate-c-code gcr/gcr-dbus-generated --c-namespace GcrDBus $^
+ 	$(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
++		gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
++	mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
++	$(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+ 		gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \
+ 	mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c
+ 
+ gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
+-	$(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+-		gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
+-	mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
+ 
+ pkgconfig_DATA += \
+ 	gcr-base-$(GCR_MAJOR).pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141204/d3a0d9e1/attachment.html>