[119365] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Wed Apr 23 10:48:18 PDT 2014
Revision: 119365
https://trac.macports.org/changeset/119365
Author: devans at macports.org
Date: 2014-04-23 10:48:18 -0700 (Wed, 23 Apr 2014)
Log Message:
-----------
GNOME-3/stable: sync with trunk.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gedit/
users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/
users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/
users/devans/GNOME-3/stable/dports/gnome/gnome3-core/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gedit
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gedit:108265-119026
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152
+ /trunk/dports/gnome/gedit:108265-119364
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152
Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2014-04-23 17:45:00 UTC (rev 119364)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2014-04-23 17:48:18 UTC (rev 119365)
@@ -99,6 +99,7 @@
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/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
/trunk/dports/gnome/gnome-keyring:108265-117914
/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156
/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
/trunk/dports/gnome/gnome-keyring:108265-119333
/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile 2014-04-23 17:45:00 UTC (rev 119364)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile 2014-04-23 17:48:18 UTC (rev 119365)
@@ -6,6 +6,7 @@
name gnome-keyring
epoch 1
version 3.12.0
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -27,10 +28,9 @@
sha256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f
patchfiles patch-egg-egg-asn1x.h.diff \
- patch-egg-egg-armor.c.diff
+ patch-egg-egg-armor.c.diff \
+ patch-pkcs11-wrap-layer-mock-secret-store.c.diff
-# patch-disable-pkcs11-tests.diff
-
depends_build port:pkgconfig \
port:intltool \
port:gnome-common \
@@ -51,6 +51,7 @@
autoreconf.args -fvi
configure.args --without-libcap-ng \
+ --disable-p11-tests \
--disable-silent-rules \
--disable-schemas-compile
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff 2014-04-23 17:45:00 UTC (rev 119364)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff 2014-04-23 17:48:18 UTC (rev 119365)
@@ -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: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff (from rev 119333, trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff 2014-04-23 17:48:18 UTC (rev 119365)
@@ -0,0 +1,46 @@
+--- pkcs11/wrap-layer/mock-secret-store.c.orig 2014-04-20 22:59:11.000000000 -0700
++++ pkcs11/wrap-layer/mock-secret-store.c 2014-04-20 23:09:50.000000000 -0700
+@@ -32,6 +32,43 @@
+
+ EGG_SECURE_DEFINE_GLIB_GLOBALS ();
+
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
++#define memmem mp_memmem
++#endif
++#endif
++
++static void *
++mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2);
++
++static void *
++mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2)
++{
++ /* Initialize search pointer */
++ char *sp = (char *) b1;
++
++ /* Initialize pattern pointer */
++ char *pp = (char *) b2;
++
++ /* Intialize end of search address space pointer */
++ char *eos = sp + len1 - len2;
++
++ /* Sanity check */
++ if(!(b1 && b2 && len1 && len2))
++ return NULL;
++
++ while (sp <= eos) {
++ if (*sp == *pp)
++ if (memcmp(sp, pp, len2) == 0)
++ return sp;
++
++ sp++;
++ }
++
++ return NULL;
++}
++
+ static CK_RV
+ mock_secret_C_Initialize (CK_VOID_PTR pInitArgs)
+ {
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome3-apps:113335-119090
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps:115850-118154
+ /trunk/dports/gnome/gnome3-apps:113335-119348
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps:115850-118154
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-04-23 17:45:00 UTC (rev 119364)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-04-23 17:48:18 UTC (rev 119365)
@@ -11,7 +11,7 @@
description The GNOME 3 Apps module set
long_description \
${description}
-homepage https://help.gnome.org/misc/release-notes/3.10/
+homepage https://help.gnome.org/misc/release-notes/3.12/
master_sites
platforms darwin
distfiles
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-core
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome3-core:113334-119090
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-core:115850-118154
+ /trunk/dports/gnome/gnome3-core:113334-119348
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-core:115850-118154
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-04-23 17:45:00 UTC (rev 119364)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-04-23 17:48:18 UTC (rev 119365)
@@ -11,7 +11,7 @@
description The Core GNOME 3 User Experience module set
long_description \
${description}
-homepage https://help.gnome.org/misc/release-notes/3.10/
+homepage https://help.gnome.org/misc/release-notes/3.12/
master_sites
platforms darwin
distfiles
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140423/192d22a3/attachment.html>
More information about the macports-changes
mailing list