<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/972188618530faf635888ddce9846e76bcefc520">https://github.com/macports/macports-ports/commit/972188618530faf635888ddce9846e76bcefc520</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 972188618530faf635888ddce9846e76bcefc520
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Aug 11 16:43:53 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnumeric: update to version 1.12.42
</span>---
gnome/gnumeric/Portfile | 11 ++++++-----
gnome/gnumeric/files/patch-dont-build-broken-sstest.diff | 10 +++++-----
gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff | 14 +++++++-------
gnome/gnumeric/files/patch-plugins-psiconv.diff | 8 ++++++++
gnome/gnumeric/files/patch-python-gi-config-fix.diff | 2 +-
5 files changed, 27 insertions(+), 18 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 d9d9ae3..7d0b856 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.41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.12.42
</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 6aa95b9f075f2c17ac47a640cbadb49173e32445 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66f6e665b7b6d708537295d8cbd00c5cb4efe31f605d5e646f38a7beab565969 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18101260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 335759fbba33f217662cd6cfd67c62d258298e18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54def8f93ab4858e2ed6499e2731c4393c1e94993696c944bd755a7a0879146d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18031748
</span>
# set pbranch to desired perl version
# currently 5.26 (#55208)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,8 @@ gobject_introspection yes
</span> patchfiles patch-python-gi-config-fix.diff \
patch-perl5.26-Makefile-fix.diff \
patch-dont-build-broken-sstest.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python-introspection-install-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python-introspection-install-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-plugins-psiconv.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-dont-build-broken-sstest.diff b/gnome/gnumeric/files/patch-dont-build-broken-sstest.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b651792..742edc2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnumeric/files/patch-dont-build-broken-sstest.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/files/patch-dont-build-broken-sstest.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.orig 2017-12-02 14:33:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2017-12-02 14:38:29.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.orig 2018-05-18 14:59:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2018-08-11 16:02:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,8 @@
</span>
bin_PROGRAMS =
check_PROGRAMS =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,5 +8,5 @@
</span> +# disable building of broken sstest which is not installed anyway
+# noinst_PROGRAMS = sstest
<span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if WITH_GTK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin_PROGRAMS += gnumeric
</span><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><span style='display:block; white-space:pre;color:#808080;'>index 378694d..d15d34b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnumeric/files/patch-perl5.26-Makefile-fix.diff
</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;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2018-05-04 10:05:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2018-05-04 10:12:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-typelib-dir=\$${libdir}/girepository-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gi-overrides-dir=\$${libdir}/gi/overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2018-08-09 15:50:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2018-08-11 16:01:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</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;'>+ --with-goffice-plugins-dir=\$${libdir}/goffice
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>-+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;'>+-DIST_SAMPLES = $(shell (cd $(srcdir)/test && perl -I. -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) -I. -e 'use lib "."; use GnumericTest; foreach (&GnumericTest::corpus("dist")) { print "$$_\n"; }'))
</span>
EXTRA_DIST = \
README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/files/patch-plugins-psiconv.diff b/gnome/gnumeric/files/patch-plugins-psiconv.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ac826c4
</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-plugins-psiconv.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;'>+--- plugins/psiconv/boot.c.orig 2018-08-11 16:14:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/psiconv/boot.c 2018-08-11 16:14:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * $Id$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* $Id$
</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;'>+ /*
</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><span style='display:block; white-space:pre;color:#808080;'>index 235fc88..4a4bf95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnumeric/files/patch-python-gi-config-fix.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- configure.ac.orig 2018-05-04 08:02:09.000000000 -0700
+++ configure.ac 2018-05-04 08:03:27.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -879,7 +879,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,7 +870,7 @@
</span> AC_MSG_CHECKING([for python module gi])
if $PYTHON -c 'import gi' 2>/dev/null; then
have_python_gi=yes
</pre><pre style='margin:0'>
</pre>