<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b03e84b8ef8cdd0b064ad5bda58202686de4613b">https://github.com/macports/macports-ports/commit/b03e84b8ef8cdd0b064ad5bda58202686de4613b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b03e84b gcr: update to version 3.34.0, dependencies
</span>b03e84b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b03e84b8ef8cdd0b064ad5bda58202686de4613b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Oct 21 16:34:50 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcr: update to version 3.34.0, dependencies
</span>---
gnome/gcr/Portfile | 25 ++++------------
gnome/gcr/files/autogen.sh | 46 ------------------------------
gnome/gcr/files/patch-egg-egg-armor.c.diff | 30 -------------------
3 files changed, 6 insertions(+), 95 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gcr/Portfile b/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1000b50..03c063d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span> PortGroup gobject_introspection 1.0
name gcr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.28.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.34.0
</span> license LGPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description GCR is a library for displaying certificates, and crypto UI, accessing \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,16 +23,12 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8180637d78b7ca893aff5bca6d6050fb7e14d4be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1329044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bbed32a9ff6c8a0320368e9602860cd44a826128 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1454244
</span>
depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span>
depends_lib port:desktop-file-utils \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +39,7 @@ depends_lib port:desktop-file-utils \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-egg-egg-armor.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ui-gcr.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ui-gcr.pc.in.diff
</span>
# gcr uses X11 specific code in UI (#41839)
# https://bugzilla.gnome.org/show_bug.cgi?id=734366
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,14 +47,6 @@ patchfiles patch-egg-egg-armor.c.diff \
</span>
require_active_variants port:gtk3 x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --enable-vala=yes \
--disable-schemas-compile \
--disable-update-mime \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gcr/files/autogen.sh b/gnome/gcr/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 590b435..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcr/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=`dirname "$0"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f configure.ac) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** WARNING: I am going to run \`configure' with no arguments." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** If you wish to pass any to it, please specify them on the" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** \`$0\' command line." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocal --install || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gtkdocize --copy || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy --automake || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $olddir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$NOCONFIGURE" = "" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $srcdir/configure "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$1" = "--help" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Now type \`make\' to compile $PKG_NAME" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Skipping configure process."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Put a redirect makefile here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ ! -f $srcdir/Makefile ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat $srcdir/build/Makefile.redirect > $srcdir/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "\nREDIRECT = %s\n" "$(realpath $olddir)" >> $srcdir/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gcr/files/patch-egg-egg-armor.c.diff b/gnome/gcr/files/patch-egg-egg-armor.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b2c6ff0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcr/files/patch-egg-egg-armor.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- egg/egg-armor.c.orig 2014-03-16 07:12:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ egg/egg-armor.c 2014-03-23 16:04:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,6 +59,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ARMOR_PREF_END "-----END "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ARMOR_PREF_END_L 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Reverse memchr()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+memrchr(const void *s, int c, size_t n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const unsigned char *cp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp = (const unsigned char *)s + n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*(--cp) == (unsigned char)c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return((void *)cp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } while (--n != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return(NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parse_header_lines (const gchar *hbeg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const gchar *hend,
</span></pre><pre style='margin:0'>
</pre>