[118922] trunk/dports/gnome/gnome-keyring
devans at macports.org
devans at macports.org
Sun Apr 13 18:57:41 PDT 2014
Revision: 118922
https://trac.macports.org/changeset/118922
Author: devans at macports.org
Date: 2014-04-13 18:57:41 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
gnome-keyring: update to version 3.12.0.
Modified Paths:
--------------
trunk/dports/gnome/gnome-keyring/Portfile
trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff
trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff
Added Paths:
-----------
trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.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-113174
/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-118732
/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile 2014-04-14 01:57:33 UTC (rev 118921)
+++ trunk/dports/gnome/gnome-keyring/Portfile 2014-04-14 01:57:41 UTC (rev 118922)
@@ -5,8 +5,7 @@
name gnome-keyring
epoch 1
-version 3.10.1
-revision 1
+version 3.12.0
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -24,13 +23,14 @@
use_xz yes
-checksums rmd160 beb643992eed921e82102669399ccf8e1fc423cd \
- sha256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8
+checksums rmd160 d0120237f09cd6d2c2a54dc0bdebb07ad8e2d7f7 \
+ sha256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f
patchfiles patch-egg-egg-asn1x.h.diff \
- patch-egg-egg-armor.c.diff \
- patch-disable-pkcs11-tests.diff
+ patch-egg-egg-armor.c.diff
+# patch-disable-pkcs11-tests.diff
+
depends_build port:pkgconfig \
port:intltool \
port:gnome-common \
@@ -41,7 +41,12 @@
port:gcr \
port:libgcrypt
-# Don't do intltool's INTLTOOL_PERL dance
+# update build/m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/build/m4
+}
+
use_autoreconf yes
autoreconf.args -fvi
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff 2014-04-14 01:57:33 UTC (rev 118921)
+++ trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff 2014-04-14 01:57:41 UTC (rev 118922)
@@ -1,8 +0,0 @@
---- pkcs11/wrap-layer/Makefile.am.orig 2013-11-15 16:46:09.000000000 -0800
-+++ pkcs11/wrap-layer/Makefile.am 2013-11-15 16:46:30.000000000 -0800
-@@ -30,4 +30,4 @@
-
- # ------------------------------------------------------------------------------
-
--SUBDIRS = . tests
-+SUBDIRS = .
Copied: trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff (from rev 118732, users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff)
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff 2014-04-14 01:57:41 UTC (rev 118922)
@@ -0,0 +1,8 @@
+--- pkcs11/wrap-layer/Makefile.am.orig 2013-11-15 16:46:09.000000000 -0800
++++ pkcs11/wrap-layer/Makefile.am 2013-11-15 16:46:30.000000000 -0800
+@@ -30,4 +30,4 @@
+
+ # ------------------------------------------------------------------------------
+
+-SUBDIRS = . tests
++SUBDIRS = .
Modified: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff 2014-04-14 01:57:33 UTC (rev 118921)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff 2014-04-14 01:57:41 UTC (rev 118922)
@@ -1,6 +1,6 @@
---- egg/egg-armor.c.orig 2013-08-15 13:10:37.000000000 -0700
-+++ egg/egg-armor.c 2013-08-15 13:12:47.000000000 -0700
-@@ -60,6 +60,27 @@
+--- egg/egg-armor.c.orig 2014-03-23 05:37:50.000000000 -0700
++++ egg/egg-armor.c 2014-03-23 16:24:23.000000000 -0700
+@@ -59,6 +59,27 @@
#define ARMOR_PREF_END "-----END "
#define ARMOR_PREF_END_L 9
Modified: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff 2014-04-14 01:57:33 UTC (rev 118921)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff 2014-04-14 01:57:41 UTC (rev 118922)
@@ -1,6 +1,6 @@
---- egg/egg-asn1x.h.orig 2013-08-15 14:58:31.000000000 -0700
-+++ egg/egg-asn1x.h 2013-08-15 14:58:51.000000000 -0700
-@@ -68,7 +68,7 @@
+--- egg/egg-asn1x.h.orig 2014-03-16 00:52:15.000000000 -0700
++++ egg/egg-asn1x.h 2014-03-19 00:41:13.000000000 -0700
+@@ -67,7 +67,7 @@
EGG_ASN1X_GENERALIZED_TIME = 37,
} EggAsn1xType;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/f698d7ee/attachment-0001.html>
More information about the macports-changes
mailing list