public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rafael Fontenelle <rafaelff@gnome.org>
To: git-commits@fedoraproject.org
Subject: [rpms/ddnet] rawhide: Fix cxxbridge dependency
Date: Mon, 20 Jul 2026 02:06:01 GMT	[thread overview]
Message-ID: <178451316139.1.15913906867372691928.rpms-ddnet-2b9e89186be1@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/ddnet
Branch : rawhide
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=rawhide

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

                 reply	other threads:[~2026-07-20  2:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178451316139.1.15913906867372691928.rpms-ddnet-2b9e89186be1@fedoraproject.org \
    --to=rafaelff@gnome.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox