From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A96C15806E for ; Thu, 18 May 2023 03:15:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60224E0821; Thu, 18 May 2023 03:15:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4ACFAE0821 for ; Thu, 18 May 2023 03:15:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C0D7340C98 for ; Thu, 18 May 2023 03:15:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE74FA7E for ; Thu, 18 May 2023 03:14:58 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1684379684.2d98ac7635f457e5f1c74fa9f7cd8227cb059c35.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch X-VCS-Directories: dev-libs/c-blosc2/ dev-libs/c-blosc2/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2d98ac7635f457e5f1c74fa9f7cd8227cb059c35 X-VCS-Branch: master Date: Thu, 18 May 2023 03:14:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87fde973-7e6e-42cb-bdb6-a8ae2b770cf7 X-Archives-Hash: 26f4ac7341d0db15533b21c35db34980 commit: 2d98ac7635f457e5f1c74fa9f7cd8227cb059c35 Author: Michał Górny gentoo org> AuthorDate: Thu May 18 02:50:40 2023 +0000 Commit: Michał Górny gentoo 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 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+DimitriPapadopoulos@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,