[129090] users/devans/GNOME-3/stable/dports/gnome/gcr

devans at macports.org devans at macports.org
Fri Dec 5 08:33:53 PST 2014


Revision: 129090
          https://trac.macports.org/changeset/129090
Author:   devans at macports.org
Date:     2014-12-05 08:33:53 -0800 (Fri, 05 Dec 2014)
Log Message:
-----------
GNOME-3/stable: gcr, merge sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gcr/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gcr
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gcr:113249-126090
/users/devans/GNOME-3/unstable/dports/gnome/gcr:117866-118152,125236-125720
   + /trunk/dports/gnome/gcr:113249-129089
/users/devans/GNOME-3/unstable/dports/gnome/gcr:117866-118152,125236-125720

Modified: users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile	2014-12-05 16:14:52 UTC (rev 129089)
+++ users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile	2014-12-05 16:33:53 UTC (rev 129090)
@@ -40,7 +40,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
@@ -65,7 +66,8 @@
                     --disable-silent-rules
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
-build.args-append   CC="${configure.cc} ${configure.cc_archflags}"
+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]}]} {

Copied: users/devans/GNOME-3/stable/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff (from rev 129089, trunk/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gcr/files/patch-gcr-Makefile.am.diff	2014-12-05 16:33:53 UTC (rev 129090)
@@ -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/20141205/f08018f5/attachment.html>


More information about the macports-changes mailing list