<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/d4ad34728e2b697314ad96a43b4ded25c28cde74">https://github.com/macports/macports-ports/commit/d4ad34728e2b697314ad96a43b4ded25c28cde74</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 d4ad34728e2 grilo: update to version 0.3.13
</span>d4ad34728e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4ad34728e2b697314ad96a43b4ded25c28cde74
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jul 9 17:19:40 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> grilo: update to version 0.3.13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * port build to meson
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * add build fix
</span><span style='display:block; white-space:pre;color:#404040;'> * enable tests
</span>---
gnome/grilo/Portfile | 60 ++++++++++++++++--------------------
gnome/grilo/files/autogen.sh | 23 --------------
gnome/grilo/files/no-undefined.patch | 10 ++++++
3 files changed, 36 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/grilo/Portfile b/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bb7199f79f..24d787626db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name grilo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.3.13
</span> license LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Framework for discovering and browsing media.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,46 +19,38 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a48fd9346a3001a96efc72fa64600a1c2437cfb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1e65ca82dd58020451417fde79310d4b940adc3f63ab59997419c52ed3bc9c91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 653864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5dd7ad20531e51f99f9a4e43cd128c3890e8ae17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 236420
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-common \
</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;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gobject-introspection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span> port:liboauth \
port:libsoup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vala \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:totem-pl-parser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-compile-warnings=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-grl-net \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-grl-pls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-test-ui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:totem-pl-parser \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-undefined.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span>
# plugin directory, initially empty, populated by grilo-plugins
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot.keepdirs ${destroot}${prefix}/lib/grilo-0.3
livecheck.type gnome-with-unstable
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/grilo/files/autogen.sh b/gnome/grilo/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4fdb0398f47..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/grilo/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,23 +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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME="grilo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/configure.ac) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " top-level 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;'>-which gnome-autogen.sh || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You need to install gnome-common from the GNOME CVS"
</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;'>-REQUIRED_AUTOMAKE_VERSION=1.10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USE_GNOME2_MACROS=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USE_COMMON_DOC_BUILD=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-. gnome-autogen.sh "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/grilo/files/no-undefined.patch b/gnome/grilo/files/no-undefined.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f73eb8d66ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/grilo/files/no-undefined.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/meson.build.orig 2020-09-03 13:51:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build 2020-09-03 13:52:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: grilo_lt_version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: libgrl_deps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: c_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: '-Wl,--no-undefined',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: libgrl_inc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgrl_dep = declare_dependency(link_with: libgrl,
</span></pre><pre style='margin:0'>
</pre>