<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00e5ad18fda27d1675cd675fda7a5ffeef8d252c">https://github.com/macports/macports-ports/commit/00e5ad18fda27d1675cd675fda7a5ffeef8d252c</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 00e5ad18fda gnome-chemistry-utils: Fix build with gnumeric >= 1.12.42
</span>00e5ad18fda is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00e5ad18fda27d1675cd675fda7a5ffeef8d252c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Feb 14 01:19:18 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> gnome-chemistry-utils: Fix build with gnumeric >= 1.12.42
</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/69336
</span>---
gnome/gnome-chemistry-utils/Portfile | 23 ++++++++-------
.../files/gnumeric-1.12.42.patch | 34 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-chemistry-utils/Portfile b/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 613b49a5210..ba8849298c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,12 @@ PortGroup yelp 1.0
</span>
name gnome-chemistry-utils
version 0.14.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set major [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 096bf5606326ee894885a81a0160b9600a1f4477 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 add1433fcaa9861b59426d8db236e51047752b47fd788575ee0fe2dc3af3926e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5911248
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set major [join [lrange [split ${version} .] 0 1] .]
</span> categories gnome science chemistry
platforms darwin linux freebsd
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,19 +29,16 @@ long_description This package provides the following programs: \
</span> \n- GSpectrum displays spectra files (NMR, IR, etc) \
\n- Includes plugins for Gnumeric spreadsheet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gchemutils.nongnu.org/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gchemutils.nongnu.org
</span> master_sites https://download.savannah.gnu.org/releases/gchemutils/${major}/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 add1433fcaa9861b59426d8db236e51047752b47fd788575ee0fe2dc3af3926e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 096bf5606326ee894885a81a0160b9600a1f4477
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span> port:intltool \
port:gnome-common \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><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;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib port:desktop-file-utils \
port:rarian \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,12 +57,13 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:adwaita-icon-theme
patchfiles patch-libs-gcr-document.cc.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnumeric-1.12.42.patch \
</span> patch-plugins-loaders.diff
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<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:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/autogen.sh ${worksrcpath}
</span> reinplace "s|/usr|${prefix}|" ${worksrcpath}/autogen.sh
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-chemistry-utils/files/gnumeric-1.12.42.patch b/gnome/gnome-chemistry-utils/files/gnumeric-1.12.42.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0bc5cce7900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-chemistry-utils/files/gnumeric-1.12.42.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with gnumeric >= 1.12.42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/?54500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnumeric/functions.cc.orig 2017-02-12 10:10:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnumeric/functions.cc 2018-08-12 10:49:00.226920779 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,23 +195,23 @@ gnumeric_elementsymbol (GnmFuncEvalInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const GnmFuncDescriptor Chemistry_functions[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { N_("molarmass"), "s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_molarmass, gnumeric_molarmass, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_molarmass, gnumeric_molarmass, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { N_("monoisotopicmass"), "s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_monoisotopicmass, gnumeric_monoisotopicmass, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { N_("chemcomposition"), "ss",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_chemcomposition, gnumeric_chemcomposition, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_chemcomposition, gnumeric_chemcomposition, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { N_("elementnumber"), "s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_elementnumber, gnumeric_elementnumber, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_elementnumber, gnumeric_elementnumber, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { N_("elementsymbol"), "f",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_elementsymbol, gnumeric_elementsymbol, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_elementsymbol, gnumeric_elementsymbol, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
</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;'>+- {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {NULL, NULL, NULL, NULL, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNM_FUNC_IS_PLACEHOLDER, GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>