<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/6689ea1a07c58fc5bf0e8dfe151479c108e3c9ee">https://github.com/macports/macports-ports/commit/6689ea1a07c58fc5bf0e8dfe151479c108e3c9ee</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 6689ea1a07c gnome-maps: update to version 3.38.6
</span>6689ea1a07c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6689ea1a07c58fc5bf0e8dfe151479c108e3c9ee
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Aug 9 23:19:52 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-maps: update to version 3.38.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * port from autotools to meson build
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix i18n issues with meson 0.60+
</span><span style='display:block; white-space:pre;color:#404040;'> * fix runtime introspection issues by adding symlinks from
</span><span style='display:block; white-space:pre;color:#404040;'> standard install locations to resources installed in private package dirs
</span>---
gnome/gnome-maps/Portfile | 64 ++++++++++------------
gnome/gnome-maps/files/autogen.sh | 24 --------
.../gnome-maps/files/i18n-fix-for-meson-0.60.patch | 10 ++++
3 files changed, 40 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-maps/Portfile b/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2e6d19589e..172e4dc1192 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</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> PortGroup yelp 1.0
name gnome-maps
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.28.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.38.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Map application for GNOME 3.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,26 +21,25 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ead613ad5df157ef73b192965dfd1cfb2866b875 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e787d92bb151314e5234156c2819f6f0c18ee9c7e00baa1fbdd284911402f1fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1195508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7fa46e8b30ece1d0e442631c199f74582c6aee21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c81097e81ddbe57cd7c135b673a0df14222f79d582454ffbf49f7bf232a1f19a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4030300
</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:gnome-common \
</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:appstream-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span>
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:folks \
</span> port:geoclue2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:geocode-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> port:gfbgraph \
path:lib/pkgconfig/gjs-1.0.pc:gjs \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gio-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsettings-desktop-schemas \
</span> path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:folks \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geocode-glib \
</span> port:libchamplain \
port:libgee \
port:libgweather \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,29 +48,26 @@ depends_lib port:desktop-file-utils \
</span>
depends_run port:adwaita-icon-theme
<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:#e0ffe0;'>+patchfiles i18n-fix-for-meson-0.60.patch
</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;'>+# gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [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;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/girepository-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/gir-1.0
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.18.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites gnome:sources/${name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8e7dbaea863239d139e3f21776ea4baf66636d92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 76a3e49867a474afbe3835ce4f2d49472567ad610e839d0c6808ce1d11ccf2b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "LATEST-IS-(${branch}(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/gnome-maps/libgnome-maps.0.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/gnome-maps/girepository-1.0/GnomeMaps-1.0.typelib ${destroot}${prefix}/lib/girepository-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/gnome-maps/gir-1.0/GnomeMaps-1.0.gir ${destroot}${prefix}/share/gir-1.0
</span> }
# port installs desktop application file, icons, and gschemas
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-maps/files/autogen.sh b/gnome/gnome-maps/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd729eb3a5f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-maps/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,24 +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="gnome-maps"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/src/main.js) || {
</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 $PKG_NAME 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 git"
</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_AUTOCONF_VERSION=2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_AUTOMAKE_VERSION=1.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_INTLTOOL_VERSION=0.40.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_PKG_CONFIG_VERSION=0.22
</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/gnome-maps/files/i18n-fix-for-meson-0.60.patch b/gnome/gnome-maps/files/i18n-fix-for-meson-0.60.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..37a3b2d4335
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-maps/files/i18n-fix-for-meson-0.60.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;'>+--- data/meson.build.orig 2022-08-09 22:43:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build 2022-08-09 22:43:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata = app_id + '.appdata.xml'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_file = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- appdata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: appdata + '.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: appdata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ po_dir: po_dir,
</span></pre><pre style='margin:0'>
</pre>