gentoo auto-resync : 17:03:2024 - 12:49:11

4 files changed, 115 insertions, 1 deletions

diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 9be2a146fc5c..e5f53ed34345 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -4,6 +4,9 @@ AUX silo-4.11-test-disable-largefile.patch 913 BLAKE2B b8c244bbe4df98e8a90af3068
 AUX silo-4.11-tests.patch 909 BLAKE2B 0472a4ea51ca60285415b4da0cdfb5cd0cc8b75289abdf6040640d39dd5f528797ec8a36cc1681785c0945f379cfe2ce3ef0d1b9998b36cf38f797f7c0cd173a SHA512 d29efc8b0edfb996e3a1d7a7dbab6f15a60d3481135625852084d30c2f89f5a9a7bcd937619f01c31a301bca3250e4632e87ea5056f54be5613ad6ead008c8eb
 AUX silo-4.11-testsuite-python-write.patch 827 BLAKE2B a2cfc512ff5aaffec6af29a5de16c9c827d7488dcaae8e808ead2a8d9d6dc5f0fddea821d9b6cd170d2657d98a13d9b79faa8bad0fbb11150099a1b7b489beb3 SHA512 6ff64305f7c72be9683494c8095fe192273d06bafe027d18ca0a71fcd1579af71100e31381b65d2f9d6b805bcb95a6a9b85aeec5e99bc4d2dac93b828977f98e
 AUX silo-4.11-widgets.patch 390 BLAKE2B 72a6e08cbbcfb17a11c3d56a59aaa5c5931f888eda64fc93b6e6ec07a78411bf3a3c51b848dd452da8cdb090cb3722d8e36806d5f350a35650be3487319bb3d9 SHA512 8485f49e84530f0212c680c370c562a2f77be16d0abcd7571ee8d0216da8992060c0fe7d90c819f6ac6560b655255e5d3f7ce11d9f4b56e2cf6aaceea55e0177
+AUX silo-4.11.1-gcc14-tests.patch 1422 BLAKE2B 2ffba46cf7630ac454527b4148d2693e0a950d176aff3e0295d6495657ec3b4ca355e6c5382ea0a0f7fbdf80e3525047e4e689764730b2a2cb68e72f5a7fd480 SHA512 f03ad4016e1f5b46492ef50880f229ce398fb466cf6bf5462167f7c7f9f2aaf6c6deb8713b0adefb0cd45ab9a8989a901e3637fb3ad9177ad6d7beb872f39fb3
 DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0
+DIST silo-4.11.1-bsd.tar.xz 4581480 BLAKE2B 577bb9e367cae08496ec2062ce7b1fc6ebd04a8221bfb304585ea8b338502793a8ba43c14dbf8a7fd1f61b3c8a3a7886da1e9a7f9a1972d2a9cb69d5e36362e3 SHA512 e4ecfc434b43ea0bd2e3cda469f5e232b0bdfd25a44da04e77f2213ff20fd4158bc085d16b10de22d9a4be0ce822899e2b7f20c53b4d4bd941f92357a873c4a2
 EBUILD silo-4.11-r1.ebuild 1547 BLAKE2B 1cda073f5fe092f44361ef5fed0874367990d48a1e11a66b6e1c6afdaf8d62fbf1a0fa96128edf7cb78e07f8309e4ef56e005ff91fd0c89f48dcc88d28f128d6 SHA512 6a7f6d2891dcffec9c49e89734daa0268d2e5fd6d2e2124d6f62eb4d6f74baa5dad747c849a45d7b155b0a266e139d51bb6df552293e1b7678cb7eefb9a0f713
-MISC metadata.xml 729 BLAKE2B 0bab9cb0101f967456a70472cb819b0eb43eb8444ae5260d33c3dc3f8f49480594609698110155dc6a12ef93ff6acf539b02f2cbfebc496fa0b641ed36738715 SHA512 3131fb65d7c9048d5a3b49ca9ce1ce790ca4b34c588b8bd72fc48a9facc995b1da1a8ac7ae4601db1c6cd14313f6d32084eaf101e95f2279df8e3316c3467514
+EBUILD silo-4.11.1.ebuild 1726 BLAKE2B 61b78cf03e445cad4732c7e644becfc7897875df04a46c8fd9ce1a62ae34463598b99893e9824de8d8f9f2c79b5abaa5dc6a2a01ed12e496cfe10ef578a2a962 SHA512 27b3a57f86d721ee5c2dc741b5ceb38ad3c5f0814d407827ad9ce9361e8fb67e7347d79722b9bca821f8127c7a760641bdaad5450212305e560d0f50a4ec237b
+MISC metadata.xml 807 BLAKE2B b5d98ef9db8a72de3bacab38667e5c35c47ee5cf095dd37731be1ece1ee79c8cea32569ed53132c1a4c55bfc11c58a12e44c6093b348ba0fb518963cef12520e SHA512 5dddf9fdad80a1bc7a0de8db597d7fd101e452c6af700add0e2c96848d14c1eb2c59368ce854783da6be7e3fc6b55229b2af19f7ce301948816f5ba7a9344476
diff --git a/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch b/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch
new file mode 100644
index 000000000000..1e729ee74e32
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch
@@ -0,0 +1,45 @@
+https://github.com/LLNL/Silo/pull/371
+
+From f0737787eb02093defc30de05a731ffe63c4c6f4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 17 Mar 2024 07:35:36 +0000
+Subject: [PATCH] tests: add missing header for `difftime`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With GCC 14, which makes implicit function declarations an error by default:
+```
+TestReadMask.c: In function ‘ElapsedTime’:
+TestReadMask.c:746:15: error: implicit declaration of function ‘difftime’ [-Wimplicit-function-declaration]
+  746 |     ms = (int)difftime(end_time.tv_sec, start_time.tv_sec);
+      |               ^~~~~~~~
+TestReadMask.c:62:1: note: ‘difftime’ is defined in header ‘<time.h>’; this is probably fixable by adding ‘#include <time.h>’
+   61 | #include <std.c>
+  +++ |+#include <time.h>
+   62 |
+```
+
+Fix the include guards and include <time.h> unconditionally (for difftime) and <string.h>
+unconditionally too (for memcpy).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/tests/TestReadMask.c
++++ b/tests/TestReadMask.c
+@@ -51,13 +51,12 @@ product endorsement purposes.
+ */
+ #include <stdio.h>
+ #include <silo.h>
++#include <string.h>
+ #ifndef WIN32
+ #include <sys/time.h>
+-#else
+-#include <string.h>
+-#include <time.h>
+ #endif
+ #include <sys/timeb.h>
++#include <time.h>
+ #include <std.c>
+ 
+ /* To compile this program on hyper, here is the command:
+
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
index ebaabb67af86..a60d491c0107 100644
--- a/sci-libs/silo/metadata.xml
+++ b/sci-libs/silo/metadata.xml
@@ -16,4 +16,7 @@
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">LLNL/Silo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/silo/silo-4.11.1.ebuild b/sci-libs/silo/silo-4.11.1.ebuild
new file mode 100644
index 000000000000..78b80eb13d33
--- /dev/null
+++ b/sci-libs/silo/silo-4.11.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic fortran-2 qmake-utils
+
+DESCRIPTION="A mesh and field I/O library and scientific database"
+HOMEPAGE="https://software.llnl.gov/Silo/"
+SRC_URI="https://github.com/LLNL/Silo/releases/download/${PV}/${P}-bsd.tar.xz"
+S="${WORKDIR}/${P}-bsd"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="browser +hdf5 +silex"
+
+# see bugs 656432 and 741741
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-dialup/lrzsz
+	virtual/szip
+	hdf5? ( sci-libs/hdf5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.11-test-disable-largefile.patch
+	"${FILESDIR}"/${PN}-4.11-tests.patch
+	"${FILESDIR}"/${PN}-4.11-testsuite-python-write.patch
+	"${FILESDIR}"/${PN}-4.11-widgets.patch
+	"${FILESDIR}"/${PN}-4.11-qtbindir.patch
+	"${FILESDIR}"/${PN}-4.11.1-gcc14-tests.patch
+)
+
+src_configure() {
+	# bug #862927 and https://github.com/LLNL/Silo/issues/248
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# add fflags for fixing test bug on matf77.f
+	# see https://github.com/LLNL/Silo/issues/234
+	append-fflags $(test-flags-F77 -fallow-argument-mismatch)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash \
+	QMAKE=$(qt5_get_bindir)/qmake \
+	QT_BIN_DIR=$(qt5_get_bindir) \
+	econf \
+		--enable-install-lite-headers \
+		--enable-shared \
+		$(use_enable silex silex ) \
+		$(use_enable browser browser ) \
+		$(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) )
+}
+
+src_test() {
+	# see https://github.com/LLNL/Silo/issues/236
+	# some tests are skipped by default so we are gonna drop them directly
+	emake ATARGS="1-34 36-44 50-51 66-76 78-81" -C tests check
+}