<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/4abee813402a28a6a18d3049d96b54b7df37a057">https://github.com/macports/macports-ports/commit/4abee813402a28a6a18d3049d96b54b7df37a057</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 4abee813402 libgweather: update to version 3.36.1
</span>4abee813402 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4abee813402a28a6a18d3049d96b54b7df37a057
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jul 9 17:32:45 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgweather: update to version 3.36.1
</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, configuration
</span>---
net/libgweather/Portfile | 58 +++++++++++++++++++++-------------------
net/libgweather/files/autogen.sh | 29 --------------------
2 files changed, 30 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libgweather/Portfile b/net/libgweather/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 60fc5f2b34b..c0cb9c7eb62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libgweather/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libgweather/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 libgweather
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.26.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.36.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
maintainers {devans @dbevans} openmaintainer
categories net gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,49 +21,51 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 030b32d9ccc67ce174a944737111e0be67c1b9c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3add156fc57585e4b59c0be384f72f189f4b18fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2702144
</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: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:#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:#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:#e0ffe0;'>+ port:python38
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:geocode-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gtk3 \
port:libxml2 \
port:libsoup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geocode-glib \
</span> port:vala
<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;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<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;'>- file delete -force ${worksrcpath}/m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|^#!.*python3|#!${prefix}/bin/python3.8|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data/update-locations.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data/check-observations.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data/locations_diff.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson/meson_post_install.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dglade_catalog=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dzoneinfo_dir=${prefix}/share/zoneinfo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-compile-warnings=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-glade-catalog=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-glibtest
</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:#e0ffe0;'>+}
</span>
variant glade description {Enable building of glade catalog items} {
depends_lib-append port:glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --enable-glade-catalog=no --enable-glade-catalog=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dglade_catalog=false -Dglade_catalog=true
</span> }
# glade expects catalog modules and libraries to have a .so suffix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
if {[variant_isset glade]} {
set libdir ${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libgweather/files/autogen.sh b/net/libgweather/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d7ff5339da3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libgweather/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,29 +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;'>-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;'>-sed -e 's/subdir = po/subdir = po-locations/' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e 's/GETTEXT_PACKAGE = @GETTEXT_PACKAGE@/GETTEXT_PACKAGE = libgweather-locations/' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po/Makefile.in.in > po-locations/Makefile.in.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install -Wno-portability || 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;'>- echo "Now type 'make' to compile."
</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></pre><pre style='margin:0'>
</pre>