public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ddnet] f44: Fix cxxbridge dependency
@ 2026-07-20 2:06 Rafael Fontenelle
0 siblings, 0 replies; only message in thread
From: Rafael Fontenelle @ 2026-07-20 2:06 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ddnet
Branch : f44
Commit : 2b9e89186be1de21601d50adbf735c913d8caa01
Author : Rafael Fontenelle <rafaelff@gnome.org>
Date : 2026-07-19T22:34:46-03:00
Stats : +7/-2 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ddnet/c/2b9e89186be1de21601d50adbf735c913d8caa01?branch=f44
Log:
Fix cxxbridge dependency
---
diff --git a/ddnet.spec b/ddnet.spec
index c156178..51e49f0 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -74,8 +74,7 @@ BuildRequires: spirv-tools
#BuildRequires: pkgconfig(libswscale)
#BuildRequires: pkgconfig(libswresample)
#BuildRequires: pkgconfig(x264)
-BuildRequires: (crate(cxx/default) >= 1.0.0 with crate(cxx/default) < 2.0.0~)
-BuildRequires: crate(libc)
+BuildRequires: cxxbridge
BuildRequires: gmock-devel
Requires: %{name}-data = %{version}-%{release}
@@ -118,6 +117,10 @@ Standalone server for %{name}.
%autosetup -p1 -n %{name}-%{version}
find -type f -exec sed -i 's|engine/external/md5/md5.h|md5/md5.h|g' {} +
find -type f -exec sed -i 's|engine/external/json-parser/json.h|json-parser/json.h|g' {} +
+find -type f -name Cargo.toml -exec sed -i '/^cxx\s=\s/s|"=|"|' {} +
+CXXBRIDGE_VERSION=$(cxxbridge --version | cut -d' ' -f2)
+sed -i "s|version=\".*\"|version=\"${CXXBRIDGE_VERSION}\"|" scripts/generate_rust_bridge.py
+python3 scripts/generate_rust_bridge.py
%cargo_prep
sed '/Cargo.lock/d' -i CMakeLists.txt
@@ -128,6 +131,8 @@ touch CMakeLists.txt
# Remove bundled stuff...
rm -rf src/engine/external
+%generate_buildrequires
+%cargo_generate_buildrequires
%build
# ensure standard Rust compiler flags are set
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-20 2:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-20 2:06 [rpms/ddnet] f44: Fix cxxbridge dependency Rafael Fontenelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox