From fb4235b8bdf8a0e83bc877e2e32b76b563c9f005 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Thu, 30 Jul 2026 17:46:16 +0200
Subject: [PATCH] Restore bundled capnproto

Related: RHEL-188914
---
 .gitignore           |  1 +
 rust-sequoia-sq.spec | 17 ++++++++++++++---
 sources              |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c89bb8..d755518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /sequoia-sq-1.4.0.crate
 /sequoia-sq-1.4.0.2.crate
 /sequoia-sq-vendor-1.4.0.2.tar.gz
+/capnproto-c++-1.5.0.tar.gz
diff --git a/rust-sequoia-sq.spec b/rust-sequoia-sq.spec
index 420c995..d4a6966 100644
--- a/rust-sequoia-sq.spec
+++ b/rust-sequoia-sq.spec
@@ -31,6 +31,7 @@ Source0:        %{crates_source}
 #                         --all-features
 #   tar -czf ../%%{crate}-vendor-%%{version}.tar.gz vendor
 Source1:        %{crate}-vendor-%{version}.tar.gz
+Source2:        capnproto-c++-1.5.0.tar.gz
 Source3:        vendor.toml
 # Manually created patch for downstream crate metadata changes
 # * switch crypto backend from Nettle to OpenSSL
@@ -55,9 +56,9 @@ BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  openssl-devel
 # vendored rustqlite
 BuildRequires:  sqlite-devel
-# vendored capnp needs both cli and development libraries
-BuildRequires:  capnproto
-BuildRequires:  capnproto-devel
+
+BuildRequires:  gcc-c++
+BuildRequires:  cmake >= 3.1
 
 BuildRequires:  clang
 
@@ -131,8 +132,18 @@ cat %{SOURCE3} >> .cargo/config.toml
 rm -vr subplot/
 rm -v tests/sq-subplot.rs
 
+mkdir -p bundled_capnproto
+pushd bundled_capnproto
+tar --strip-components=1 -xf %{SOURCE2}
+popd
+
 %build
 export ASSET_OUT_DIR=target/assets
+pushd bundled_capnproto
+%cmake -DBUILD_TESTING=OFF
+%cmake_build
+export PATH="$PWD/%{__cmake_builddir}/src/capnp:$PATH"
+popd
 
 %cargo_build
 %{cargo_license_summary}
diff --git a/sources b/sources
index 837de0c..12dd71a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (sequoia-sq-1.4.0.2.crate) = 53a776ddd367e3d327770aff964f64010618a9ebc8380f57316fd65b3b76288bf8232ae4090d29b3bb57cc48092dfd932471dcef81b0672ba6e5ddbb060985f1
 SHA512 (sequoia-sq-vendor-1.4.0.2.tar.gz) = 11fdda1f6fdad08c254e8a5810e6b559ad037e3e95a94f2afc96904c66d10e653852d56d5a32ffe126ed8da9ef4093e38c50b32b1635a1ae6d848fcd7e3ea690
+SHA512 (capnproto-c++-1.5.0.tar.gz) = e287c6b9399a2495e3c98c99d3d7ec5756e64890bd7449da9ef88ee341bc3ceb1a7d176f7375cbba1fd3fb1d8c0733949e3c99bd50fe62066d6ab488abd7954d