<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/e5a53bb03b3ea7f4813bdd2bbc7303764033655b">https://github.com/macports/macports-ports/commit/e5a53bb03b3ea7f4813bdd2bbc7303764033655b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e5a53bb03b3ea7f4813bdd2bbc7303764033655b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri May 4 13:12:59 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnumeric: update to version 1.12.40
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply perl5.26 python27 build fixes as required.
</span>---
gnome/gnumeric/Portfile | 13 ++++++++-----
gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff | 11 +++++++++++
gnome/gnumeric/files/patch-python-gi-config-fix.diff | 11 +++++++++++
.../files/patch-python-introspection-install-fix.diff | 12 ++++++++++++
4 files changed, 42 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/Portfile b/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7331af6..cbc754b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span> PortGroup gobject_introspection 1.0
name gnumeric
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.12.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.12.40
</span> set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ homepage http://www.gnumeric.org/
</span> master_sites gnome:sources/${name}/${branch}/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2d8f1935aacd7939414d0b93f017cfea2807fea2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20040688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b8264c69737ed4129fb8e9189749b383a02e0a36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7d2451ab9ea29bb8d6fe8173e6d3c9380cf64b140f4210943543e2353254ae7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18096164
</span>
# set pbranch to desired perl version
# currently 5.26 (#55208)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,10 @@ depends_run port:adwaita-icon-theme
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-dont-build-broken-sstest.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-python-gi-config-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-perl5.26-Makefile-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-dont-build-broken-sstest.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python-introspection-install-fix.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff b/gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..378694d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2018-05-04 10:05:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2018-05-04 10:12:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-typelib-dir=\$${libdir}/girepository-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gi-overrides-dir=\$${libdir}/gi/overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DIST_SAMPLES = $(shell (cd $(srcdir)/test && perl -e 'use GnumericTest; foreach (&GnumericTest::corpus("dist")) { print "$$_\n"; }'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DIST_SAMPLES = $(shell (cd $(srcdir)/test && $(PERL) -e 'use lib "."; use GnumericTest; foreach (&GnumericTest::corpus("dist")) { print "$$_\n"; }'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_DIST = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/files/patch-python-gi-config-fix.diff b/gnome/gnumeric/files/patch-python-gi-config-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..235fc88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/files/patch-python-gi-config-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-05-04 08:02:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-04 08:03:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -879,7 +879,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for python module gi])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if $PYTHON -c 'import gi' 2>/dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_python_gi=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [PYTHON_GIOVERRIDESDIR=`python -c 'import gi; import os.path; print(os.path.dirname(gi.__file__)+"/overrides")'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [PYTHON_GIOVERRIDESDIR=`$PYTHON -c 'import gi; import os.path; print(os.path.dirname(gi.__file__)+"/overrides")'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT($have_python_gi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/files/patch-python-introspection-install-fix.diff b/gnome/gnumeric/files/patch-python-introspection-install-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..691b7e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/files/patch-python-introspection-install-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- introspection/Makefile.am.orig 2018-05-04 12:51:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ introspection/Makefile.am 2018-05-04 12:53:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_INTROSPECTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_PYTHON_GI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-data-local:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install -m 0444 -t @GIOVERRIDESDIR@ gi/overrides/Gnm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -d -m 0755 $(DESTDIR)@GIOVERRIDESDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -m 0444 gi/overrides/Gnm.py $(DESTDIR)@GIOVERRIDESDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall-local:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f @GIOVERRIDESDIR@/Gnm.py
</span></pre><pre style='margin:0'>
</pre>