<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/741622d232cd7553534cce686614e1f80d3e2ad0">https://github.com/macports/macports-ports/commit/741622d232cd7553534cce686614e1f80d3e2ad0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 741622d232cd7553534cce686614e1f80d3e2ad0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jun 15 11:48:19 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gexiv2: update to version 0.10.6, python36 support
</span>---
gnome/gexiv2/Portfile | 25 ++++++++++++++-----------
gnome/gexiv2/files/patch-configure.ac.diff | 24 ------------------------
2 files changed, 14 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gexiv2/Portfile b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56b33d6..279917e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup gobject_introspection 1.0
name gexiv2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.10.6
</span> license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description gexiv2 is a GObject-based wrapper around the exiv2 library.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0dbaf2e988c4516240b007d0bc7db74c180605c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ad8d31afdc0a1932cc44c4cfcea449497c0d0b445c0ad2f9735707b306e71ca4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c90b0edbed9d2d1af9f3a0bb40eab6d9dcc8c215 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 132788919667254b42c026ab39ab3c3a5be59be8575c05fa4b371ca8aed55825
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,6 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:vala \
port:exiv2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gobject_introspection yes
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,22 +42,27 @@ configure.args --enable-compile-warnings=no \
</span>
variant python27 description {Build Python2 bindings using Python 2.7} {
depends_lib-append port:py27-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON2=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON2_PATH=${prefix}/bin/python2.7
</span> }
default_variants +python27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python35 description {Build Python3 bindings using Python 3.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python35 python36 description {Build Python3 bindings using Python 3.4} {
</span> depends_lib-append port:py34-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON3=${prefix}/bin/python3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON3_PATH=${prefix}/bin/python3.4
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python34 description {Build Python3 bindings using Python 3.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python34 python36 description {Build Python3 bindings using Python 3.5} {
</span> depends_lib-append port:py35-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON3=${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON3_PATH=${prefix}/bin/python3.5
</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;'>+variant python36 conflicts python34 python35 description {Build Python3 bindings using Python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON3_PATH=${prefix}/bin/python3.6
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python35] && ![variant_isset python36]} {
</span> default_variants +python34
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gexiv2/files/patch-configure.ac.diff b/gnome/gexiv2/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ea1d61..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gexiv2/files/patch-configure.ac.diff
</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;'>---- configure.ac.orig 2016-08-15 10:54:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-08-15 13:49:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,10 +137,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$found_introspection" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Used to determine where Python wants the .gi file to be installed ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if Python is not installed, PYTHON2 and PYTHON3 will be empty
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON="import gi; print(gi._overridesdir)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_SCRIPT="import gi; print(gi._overridesdir)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x$ac_py2girdir" = "x"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON2_GIDIR=$(python2 -c "$PYTHON")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON2_GIDIR=$("$PYTHON2" -c "$PYTHON_SCRIPT")
</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;'>- PYTHON2_GIDIR=$ac_py2girdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x$ac_py3girdir" = "x"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON3_GIDIR=$(python3 -c "$PYTHON")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON3_GIDIR=$("$PYTHON3" -c "$PYTHON_SCRIPT")
</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;'>- PYTHON3_GIDIR=$ac_py3girdir
</span></pre><pre style='margin:0'>
</pre>