commit:     68d57460dfa410c788f5c788324341f4d73d3a3d
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed May 21 12:22:51 2025 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Wed May 21 12:28:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d57460

net-mail/stalwart-mail: Fix rocksdb build

Closes: https://bugs.gentoo.org/947231
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 .../files/rocksdb-10.1-fixincludes.patch           | 47 ++++++++++++++++++++++
 ....11.8.ebuild => stalwart-mail-0.11.8-r1.ebuild} |  8 ++++
 2 files changed, 55 insertions(+)

diff --git a/net-mail/stalwart-mail/files/rocksdb-10.1-fixincludes.patch 
b/net-mail/stalwart-mail/files/rocksdb-10.1-fixincludes.patch
new file mode 100644
index 000000000000..07c073df4d96
--- /dev/null
+++ b/net-mail/stalwart-mail/files/rocksdb-10.1-fixincludes.patch
@@ -0,0 +1,47 @@
+From e780f74a97ca2fada2a6efe5ccc6f8ecc7564d22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <[email protected]>
+Date: Wed, 5 Mar 2025 15:42:46 +0200
+Subject: [PATCH] Add missing include (#13365)
+
+---
+ db/blob/blob_file_meta.h           | 1 +
+ include/rocksdb/trace_record.h     | 1 +
+ include/rocksdb/write_batch_base.h | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h
+index d7c8a124336..2e47726f8d1 100644
+--- a/db/blob/blob_file_meta.h
++++ b/db/blob/blob_file_meta.h
+@@ -6,6 +6,7 @@
+ #pragma once
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <iosfwd>
+ #include <memory>
+ #include <string>
+diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h
+index 8f9c3ee2f0f..d321f538745 100644
+--- a/include/rocksdb/trace_record.h
++++ b/include/rocksdb/trace_record.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <vector>
+diff --git a/include/rocksdb/write_batch_base.h 
b/include/rocksdb/write_batch_base.h
+index 3334a129256..43b18602980 100644
+--- a/include/rocksdb/write_batch_base.h
++++ b/include/rocksdb/write_batch_base.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include <cstddef>
++#include <cstdint>
+ 
+ #include "rocksdb/attribute_groups.h"
+ #include "rocksdb/rocksdb_namespace.h"

diff --git a/net-mail/stalwart-mail/stalwart-mail-0.11.8.ebuild 
b/net-mail/stalwart-mail/stalwart-mail-0.11.8-r1.ebuild
similarity index 98%
rename from net-mail/stalwart-mail/stalwart-mail-0.11.8.ebuild
rename to net-mail/stalwart-mail/stalwart-mail-0.11.8-r1.ebuild
index 2800e7b0cc15..933562a9b9e7 100644
--- a/net-mail/stalwart-mail/stalwart-mail-0.11.8.ebuild
+++ b/net-mail/stalwart-mail/stalwart-mail-0.11.8-r1.ebuild
@@ -785,6 +785,14 @@ src_unpack() {
        sed -i -e "s%__PATH__/bin/%/usr/bin/%g" 
"${S}"/resources/systemd/stalwart-mail.service || die
 }
 
+src_prepare() {
+       pushd .
+       cd "${WORKDIR}/cargo_home/gentoo/librocksdb-sys-0.17.1+9.9.3/rocksdb"
+       eapply "${FILESDIR}/rocksdb-10.1-fixincludes.patch"
+       popd
+       eapply_user
+}
+
 src_configure() {
        local myfeatures=(
                $(usev sqlite)

Reply via email to