commit: 2d98ac7635f457e5f1c74fa9f7cd8227cb059c35 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu May 18 02:50:40 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu May 18 03:14:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d98ac76
dev-libs/c-blosc2: Backport a header fix Closes: https://bugs.gentoo.org/906644 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...losc2-2.9.1.ebuild => c-blosc2-2.9.1-r1.ebuild} | 5 +++++ .../c-blosc2/files/c-blosc2-2.9.1-header.patch | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild similarity index 94% rename from dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild rename to dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild index 1a7c40ef0f55..842752b8909c 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild @@ -31,6 +31,11 @@ RDEPEND=" ${DEPEND} " +PATCHES=( + # https://bugs.gentoo.org/906644 + "${FILESDIR}/${P}-header.patch" +) + src_configure() { # remove bundled libs (just in case) rm -rf internal-complibs || die diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch new file mode 100644 index 000000000000..5ec28e936de7 --- /dev/null +++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch @@ -0,0 +1,26 @@ +From 04035a3759b8c100e4808918e44a3eaef4969875 Mon Sep 17 00:00:00 2001 +From: Dimitri Papadopoulos + <3234522+dimitripapadopou...@users.noreply.github.com> +Date: Sat, 13 May 2023 21:40:32 +0200 +Subject: [PATCH] BLOSC_STUNE is not defined in c-blosc + +Therefore, do not guard it with BLOSC_H, the include guard of blosc.h +from previous version c-blosc. +--- + include/blosc2.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/blosc2.h b/include/blosc2.h +index dc6d1fc7..ef035f07 100644 +--- a/include/blosc2.h ++++ b/include/blosc2.h +@@ -211,9 +211,7 @@ enum { + * @brief Codes for the different tunes shipped with Blosc + */ + enum { +-#ifndef BLOSC_H + BLOSC_STUNE = 0, +-#endif // BLOSC_H + BLOSC_LAST_TUNE = 1, + //!< Determine the last tune defined by Blosc. + BLOSC_LAST_REGISTERED_TUNE = BLOSC2_GLOBAL_REGISTERED_TUNE_START + BLOSC2_GLOBAL_REGISTERED_TUNES - 1,
