<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/7564bef6b458495ee4fb99017b8873cf416d9a67">https://github.com/macports/macports-ports/commit/7564bef6b458495ee4fb99017b8873cf416d9a67</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 7564bef6b45 gnome-desktop: update to version 3.36.3.1, dependencies
</span>7564bef6b45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7564bef6b458495ee4fb99017b8873cf416d9a67
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jun 18 23:48:30 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-desktop: update to version 3.36.3.1, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now uses meson build.
</span>---
gnome/gnome-desktop/Portfile | 63 ++++++++++------------
gnome/gnome-desktop/files/autogen.sh | 16 ------
.../files/patch-disable-broken-tests.diff | 10 ++++
3 files changed, 38 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/Portfile b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f7b012ae5e..bec82aceb30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,10 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<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 gnome-desktop
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.28.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.36.3.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
maintainers {devans @dbevans} openmaintainer
categories gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,53 +24,46 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9b23d42157786d29ea9ede65532121f27ed4d614 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 605087bff17c61bc167ccb5a61ed4d06eab922fcce384576ed2a3577214c8330 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1077556
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 413f82aba6e0427e00e7062dc0cf69345bc2b3b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4bed119fa25ea0ff7880928142365c3c8726585fc072bc147157e66b63e96b7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 738784
</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:yelp-tools \
</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>
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gsettings-desktop-schemas \
port:gtk3 \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span> port:xorg-libXext \
port:xorg-libXrandr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xkeyboard-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxkbfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xkeyboard-config
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-disable-broken-tests.diff
</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:#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><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-maintainer-mode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-desktop-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-compile-warnings=minimum \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gnome-distributor=MacPorts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> # portions of this port are strictly X11 specific
# so a +quartz build is not possible (fails in configure if X11 is absent)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> require_active_variants port:gtk3 x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dgnome_distributor=MacPorts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddesktop_docs=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dudev=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsystemd=disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 {[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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/files/autogen.sh b/gnome/gnome-desktop/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bcd77a94984..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-desktop/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,16 +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-desktop"
</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_M4MACROS=
</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."
</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;'>-. gnome-autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/files/patch-disable-broken-tests.diff b/gnome/gnome-desktop/files/patch-disable-broken-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a241e0c75bc
</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-desktop/files/patch-disable-broken-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-06-19 23:55:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2020-06-19 23:55:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('libgnome-desktop')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('po')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-subdir('tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_option('desktop_docs')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('desktop-docs/fdl')
</span></pre><pre style='margin:0'>
</pre>