[gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/, sci-physics/lhapdf/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/, sci-physics/lhapdf/files/

[Sam James]

commit:     3fb82ca8c2c89b551977fe98aee0f578bdf6ace4
Author:     Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Thu Aug 15 13:47:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 14:06:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb82ca8

sci-physics/lhapdf: Fix compilation on GCC 15

- Include patch from upstream MR (refer to patch file)

Closes: https://bugs.gentoo.org/937778
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/38162
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/lhapdf-6.5.4-include-cstdint.patch       | 31 ++++++++++++++++++++++
 sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild          |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch b/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch
new file mode 100644
index 000000000000..2afed53f210b
--- /dev/null
+++ b/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch
@@ -0,0 +1,31 @@
+https://gitlab.com/hepcedar/lhapdf/merge_requests/96
+
+From: Christopher Fore <csfore@posteo.net>
+Date: Wed, 14 Aug 2024 20:38:03 -0400
+Subject: [PATCH] yamlcpp: Explicitly include <cstdint>
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope
+  221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) {
+      |           ^~~~~~~~
+emitterutils.cpp:13:1:
+note: 'uint16_t' is defined in header '<cstdint>';
+this is probably fixable by adding '#include <cstdint>'
+   12 | #include "yaml-cpp/null.h"
+  +++ |+#include <cstdint>
+   13 | #include "yaml-cpp/ostream_wrapper.h"
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937778
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+--- a/src/yamlcpp/emitterutils.cpp
++++ b/src/yamlcpp/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ 

diff --git a/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
index 7e3801a3d0e3..f5d5eb09c594 100644
--- a/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.4-include-cstdint.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/, sci-physics/lhapdf/files/

[Andrew Ammerlaan]

commit:     8e83cf53a8150ce3bafe1c3f2538352a8f67c5b4
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Sun Oct 20 10:08:42 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 12:19:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e83cf53

sci-physics/lhapdf: Add python3_13

Closes: https://bugs.gentoo.org/929255
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/39052
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../lhapdf/files/lhapdf-6.5.4-cxxflags.patch       | 25 ++++++++++++++++++++++
 sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild          |  5 +++--
 sci-physics/lhapdf/lhapdf-9999.ebuild              |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/sci-physics/lhapdf/files/lhapdf-6.5.4-cxxflags.patch b/sci-physics/lhapdf/files/lhapdf-6.5.4-cxxflags.patch
new file mode 100644
index 000000000000..8e7144c37ac9
--- /dev/null
+++ b/sci-physics/lhapdf/files/lhapdf-6.5.4-cxxflags.patch
@@ -0,0 +1,25 @@
+From ab6861f88b781b3e95ee67c01889b2c3f9f23e4d Mon Sep 17 00:00:00 2001
+From: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
+Date: Sun, 14 Apr 2024 11:18:52 +0200
+Subject: [PATCH] Fix missing quotes on CXXFLAGS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8bd5411..5c940ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_CONFIG_HEADERS([config/config.h include/LHAPDF/Version.h])
+ 
+ 
+ ## Set default C++ optimisation level to -O3 and drop the -g debug flag
+-if test -z $CXXFLAGS; then
++if test -z "$CXXFLAGS"; then
+     CXXFLAGS='-O3'
+ fi
+ 
+-- 
+GitLab
+

diff --git a/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
index fe5288384d06..24a87d0d71bd 100644
--- a/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	dev-texlive/texlive-bibtexextra
@@ -45,7 +45,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.4-include-cstdint.patch
+	"${FILESDIR}"/${P}-include-cstdint.patch # https://gitlab.com/hepcedar/lhapdf/-/merge_requests/96
+	"${FILESDIR}"/${P}-cxxflags.patch # https://gitlab.com/hepcedar/lhapdf/-/merge_requests/87
 )
 
 pkg_setup() {

diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild b/sci-physics/lhapdf/lhapdf-9999.ebuild
index fc2455e2129f..d950f1329d20 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	dev-texlive/texlive-bibtexextra