<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/9f55710b4ce42f546b3563c9d99c421adcc4f987">https://github.com/macports/macports-ports/commit/9f55710b4ce42f546b3563c9d99c421adcc4f987</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 9f55710b4ce meld: update to version 3.21.0, dependencies
</span>9f55710b4ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f55710b4ce42f546b3563c9d99c421adcc4f987
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Sep 18 16:19:43 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> meld: update to version 3.21.0, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update homepage to use https:
</span><span style='display:block; white-space:pre;color:#404040;'> * set default python to python38
</span><span style='display:block; white-space:pre;color:#404040;'> * skip build phase - everything occurs (again) in destroot
</span><span style='display:block; white-space:pre;color:#404040;'> * drop post-activate processing for outdated HighContrast icons
</span><span style='display:block; white-space:pre;color:#404040;'> * use gnome-with-unstable livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/61148
</span>---
textproc/meld/Portfile | 66 ++++++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/meld/Portfile b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa2ae76aaf5..b33909adc09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,13 +6,14 @@ PortGroup app 1.0
</span> PortGroup active_variants 1.1
name meld
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.18.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories textproc devel
license GPL-2+
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://meldmerge.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://meldmerge.org/
</span> description Visual diff and merge tool.
long_description Meld is a visual diff and merge tool. You can compare \
two or three files and edit them in place (diffs \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,14 +23,17 @@ long_description Meld is a visual diff and merge tool. You can compare \
</span> systems such such as CVS, Subversion, Bazaar-ng and \
Mercurial.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${name}/[join [lrange [split $version .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${name}/${branch}/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 92e0d17b0b60843a8f7de72d4923a5287e76489e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3af68caeab5f38e82de66567346722db47ed6a6fa6d9d595de4ae7e15c88e879 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 563516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a9d550eda6acbff962941a30a60e9b2a9f655678 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 614744
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable build phase - everything occurs (again) in destroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span>
# see #55092
# prevent running gtk-update-icon-cache and glib-compile-schema during install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,35 +41,24 @@ destroot.cmd-append --no-update-icon-cache --no-compile-schemas
</span> # install everything under prefix, except libraries, that go under Library/Frameworks/Python...
destroot.destdir --prefix=${prefix} --install-lib=${python.pkgd} --root=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:itstool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:itstool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-distro
</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:gtksourceview3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cairo \
</span> port:py${python.version}-gobject3 \
port:shared-mime-info
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsettings-desktop-schemas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/HighContrast"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</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;'>-# yelp is a heavy dependency (webkit2-gtk3, gstreamer, etc.) so only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# require it as an option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant help description {Meld user manual (requires yelp)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:yelp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/scrollkeeper-update"
</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:#e0ffe0;'>+depends_run port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yelp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon data/icons/hicolor/scalable/apps/meld.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon data/icons/hicolor/scalable/apps/org.gnome.meld.svg
</span> app.use_launch_script yes
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,3 +72,12 @@ variant quartz conflicts x11 {
</span> if {![variant_isset quartz]} {
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome-with-unstable
</span></pre><pre style='margin:0'>
</pre>