<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce2931ea40608d7439cf615d9257f5f776f7869d">https://github.com/macports/macports-ports/commit/ce2931ea40608d7439cf615d9257f5f776f7869d</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 ce2931e epiphany: update to 3.28.3.1
</span>ce2931e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce2931ea40608d7439cf615d9257f5f776f7869d
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Jun 23 14:02:40 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> epiphany: update to 3.28.3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> pretty much wholesale rebuild
</span><span style='display:block; white-space:pre;color:#404040;'> meson, ninja
</span><span style='display:block; white-space:pre;color:#404040;'> have to workaround some bugs in ninja at present
</span>---
gnome/epiphany/Portfile | 136 ++++++++++++---------
.../epiphany/files/patch-post-install-python.diff | 8 ++
2 files changed, 83 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/Portfile b/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fec252..55afb39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name epiphany
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.28.3.1
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A GNOME Web browser.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +19,32 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7bbeb9d6b6a4b87eedbc048ea605d7b3ba9314b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a15b7ec19644eec8d40ce11286bbca28ac188202b47e2b9fc593ab0974e9c784
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3.28.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 82cf228a8c45699cf0cfdded63de3e5a51cd968d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4475124
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3.29.0 - requires libdazzle, not yet in MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#checksums rmd160 2d453899321ae23e26604d6ffa7992861b109c81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sha256 d360d9301da8a834f4fee56e246a1bfc7641a3c8d5ed78090e550deea5ad3ee8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# size 4493268
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:meson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ninja \
</span> port:intltool \
port:gnome-common \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:itstool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yelp-tools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span> port:gtk3 \
port:gnome-desktop \
port:libxslt\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,32 +56,63 @@ depends_lib port:desktop-file-utils \
</span> port:gcr \
port:avahi \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:iso-codes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:iso-codes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libhttpseverywhere \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-keyring
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gnome-keyring
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using our intltool.m4 and upstream autogen.sh for intltool 0.51 compatibility
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# specify a python3 version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-post-install-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3@@|${prefix}/bin/python3.6|g" 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-distributor-name=MacPorts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-compile-warnings=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tests
</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;'>-# nss is not universal
</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;'>-if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-nss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:nss
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd meson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args . build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# meson requires builds be in build subdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# DESTDIR must come before ninja command rather than after
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd DESTDIR=${destroot} ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# meson ninja backend improperly sets shared library install name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# based on build_dir rather than install_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libname ${prefix}/lib/epiphany/libephymain.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${libname} ${destroot}${libname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libname ${prefix}/lib/epiphany/libephymisc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${libname} ${destroot}${libname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libname ${prefix}/lib/epiphany/libephysync.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${libname} ${destroot}${libname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/lib/epiphany/libephymain.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/sync/libephysync.dylib ${prefix}/lib/epiphany/libephysync.dylib ${destroot}${prefix}/lib/epiphany/libephymain.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/lib/epiphany/libephysync.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/bin/epiphany"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/src/libephymain.dylib ${prefix}/lib/epiphany/libephymain.dylib ${destroot}${prefix}/bin/epiphany"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/sync/libephysync.dylib ${prefix}/lib/epiphany/libephysync.dylib ${destroot}${prefix}/bin/epiphany"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/sync/libephysync.dylib ${prefix}/lib/epiphany/libephysync.dylib ${destroot}${prefix}/libexec/epiphany/ephy-profile-migrator"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/src/libephymain.dylib ${prefix}/lib/epiphany/libephymain.dylib ${destroot}${prefix}/libexec/epiphany/ephy-profile-migrator"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/libexec/epiphany/ephy-profile-migrator"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/sync/libephysync.dylib ${prefix}/lib/epiphany/libephysync.dylib ${destroot}${prefix}/libexec/epiphany-search-provider"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/src/libephymain.dylib ${prefix}/lib/epiphany/libephymain.dylib ${destroot}${prefix}/libexec/epiphany-search-provider"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/libexec/epiphany-search-provider"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/sync/libephysync.dylib ${prefix}/lib/epiphany/libephysync.dylib ${destroot}${prefix}/lib/epiphany/web-extensions/libephywebextension.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${build.dir}/lib/libephymisc.dylib ${prefix}/lib/epiphany/libephymisc.dylib ${destroot}${prefix}/lib/epiphany/web-extensions/libephywebextension.dylib"
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,36 +120,5 @@ post-activate {
</span> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<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.8.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2aacd8b02f456e345b9f23ff6114d341bbf0013a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libwnck3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-snapshot-service-stop-using-gnome_desktop_thumbnail_.patch
</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-3.8.2 ${worksrcpath}/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:appstream-glib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:itstool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yelp-tools
</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:#ffe0e0;'>- patchfiles patch-fix-null-or-empty-string-check.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-crash-when-download-fails.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-snapshot-service-stop-using-gnome_desktop_thumbnail_.patch
</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;'>- livecheck.type gnome
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/patch-post-install-python.diff b/gnome/epiphany/files/patch-post-install-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..db45f0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/epiphany/files/patch-post-install-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- post_install.py.orig 2017-11-11 18:20:51.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ post_install.py 2017-11-11 18:21:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@@PYTHON3@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import subprocess
</span></pre><pre style='margin:0'>
</pre>