[136690] trunk/dports/gnome/gnome-keyring

[devans at macports.org]

Revision: 136690
          https://trac.macports.org/changeset/136690
Author:   devans at macports.org
Date:     2015-05-24 06:12:57 -0700 (Sun, 24 May 2015)
Log Message:
-----------
gnome-keyring: fix header guard error in egg-spawn.h apparently unfixed since 2009, thanks to jmr for the patch.

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

Added Paths:
-----------
    trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-keyring/


Property changes on: trunk/dports/gnome/gnome-keyring
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-136044
/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
   + /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-136689
/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673
/users/rmstonecipher/gnome/gnome-keyring:102363-103172

Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile	2015-05-24 13:10:58 UTC (rev 136689)
+++ trunk/dports/gnome/gnome-keyring/Portfile	2015-05-24 13:12:57 UTC (rev 136690)
@@ -26,10 +26,6 @@
 checksums           rmd160  a88558a07672ca1256140633ebee465bea430e48 \
                     sha256  15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5
 
-patchfiles          patch-egg-egg-asn1x.h.diff \
-                    patch-egg-egg-armor.c.diff \
-                    patch-pkcs11-wrap-layer-mock-secret-store.c.diff
-
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:gnome-common \
@@ -46,6 +42,11 @@
 # blacklist compilers that do not support C11 (redefinition of typedefs)
 compiler.blacklist  *gcc* {clang < 300}
 
+patchfiles          patch-egg-egg-asn1x.h.diff \
+                    patch-egg-egg-armor.c.diff \
+                    patch-egg-egg-spawn.h.diff \
+                    patch-pkcs11-wrap-layer-mock-secret-store.c.diff
+
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {

Copied: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff (from rev 136689, users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff)
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff	2015-05-24 13:12:57 UTC (rev 136690)
@@ -0,0 +1,11 @@
+--- egg/egg-spawn.h.orig	2014-09-23 17:45:13.000000000 +1000
++++ egg/egg-spawn.h	2015-05-20 15:27:47.000000000 +1000
+@@ -21,7 +21,7 @@
+ */
+ 
+ #ifndef EGG_SPAWN_H_
+-#define EGG_SUB_PROCESS_H_
++#define EGG_SPAWN_H_
+ 
+ #include <glib-object.h>
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150524/0ba240e8/attachment.html>