[rpms/ddnet] exclude-empty-files: Update patch and cxxbridge statements

[Rafael Fontenelle <rafaelff@gnome.org>]

A new commit has been pushed.

Repo   : rpms/ddnet
Branch : exclude-empty-files
Commit : 97b20319c387352401eb909ed2c2ba32ff2ab77c
Author : Rafael Fontenelle <rafaelff@gnome.org>
Date   : 2026-08-31T22:19:36-03:00
Stats  : +23/-22 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ddnet/c/97b20319c387352401eb909ed2c2ba32ff2ab77c?branch=exclude-empty-files

Log:
Update patch and cxxbridge statements

---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
index 61609e4..76c606b 100644
--- a/0001-Disabled-network-lookup-test.patch
+++ b/0001-Disabled-network-lookup-test.patch
@@ -1,12 +1,12 @@
---- ddnet-19.9.orig/src/test/jobs_test.cpp	2026-07-03 05:25:29.000000000 -0300
-+++ ddnet-19.9/src/test/jobs_test.cpp	2026-07-12 00:32:54.442476530 -0300
-@@ -86,53 +86,6 @@
+--- ddnet-20.0-orig/src/test/jobs_test.cpp	2026-08-26 17:21:27.000000000 -0300
++++ ddnet-20.0/src/test/jobs_test.cpp	2026-08-30 22:45:19.588351076 -0300
+@@ -86,54 +86,6 @@
  	EXPECT_NE(pJob->State(), IJob::STATE_ABORTED);
  }
  
 -TEST_F(Jobs, LookupHost)
 -{
--	static const char *HOST = "example.com";
+-	static const char *const HOST = "example.com";
 -	static const int NETTYPE = NETTYPE_ALL;
 -	auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
 -
@@ -30,7 +30,7 @@
 -
 -TEST_F(Jobs, LookupHostWebsocket)
 -{
--	static const char *HOST = "ws://example.com";
+-	static const char *const HOST = "ws://example.com";
 -	static const int NETTYPE = NETTYPE_ALL;
 -	auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
 -
@@ -51,6 +51,7 @@
 -		EXPECT_EQ(pJob->Addr().type & (NETTYPE_WEBSOCKET_IPV4 | NETTYPE_WEBSOCKET_IPV6), pJob->Addr().type);
 -	}
 -}
- 
+-
  TEST_F(Jobs, Many)
  {
+ 	std::atomic<int> ThreadsRunning(0);

diff --git a/0002-Unbundle-md5_and_json-parser.patch b/0002-Unbundle-md5_and_json-parser.patch
index ae1f2a1..dc42ef1 100644
--- a/0002-Unbundle-md5_and_json-parser.patch
+++ b/0002-Unbundle-md5_and_json-parser.patch
@@ -1,5 +1,5 @@
---- ddnet-19.9.orig/CMakeLists.txt	2026-07-03 05:25:29.000000000 -0300
-+++ ddnet-19.9/CMakeLists.txt	2026-07-12 00:37:14.742473450 -0300
+--- ddnet-20.0-orig/CMakeLists.txt	2026-08-22 10:10:17.000000000 -0300
++++ ddnet-20.0/CMakeLists.txt	2026-08-25 00:04:32.793575776 -0300
 @@ -569,6 +569,8 @@
    find_package(SSP)
  endif()
@@ -9,16 +9,15 @@
  if(TARGET_OS AND TARGET_OS STREQUAL "mac")
    find_program(CMAKE_OTOOL otool)
    find_program(DMGBUILD dmgbuild)
-@@ -647,6 +649,8 @@
+@@ -648,6 +650,7 @@
+ if(CLIENT AND VULKAN)
    show_dependency_status("Vulkan" VULKAN)
  endif()
- 
 +show_dependency_status("json-parser" JSONPARSER)
-+
- if(NOT(CURL_FOUND))
+ if(NOT(CURL_FOUND) AND NOT TARGET_OS STREQUAL "emscripten")
    message(SEND_ERROR "You must install Curl to compile ${CMAKE_PROJECT_NAME}")
  endif()
-@@ -846,19 +850,6 @@
+@@ -850,19 +853,6 @@
  # DEPENDENCY COMPILATION
  ########################################################################
  
@@ -38,7 +37,7 @@
  ########################################################################
  # RUST
  ########################################################################
-@@ -2338,7 +2329,7 @@
+@@ -2348,7 +2338,7 @@
    src/generated/protocolglue.h
    # tidy-alphabetical-end
  )
@@ -47,7 +46,7 @@
  
  # Libraries
  set(LIBS
-@@ -2346,6 +2337,7 @@
+@@ -2356,6 +2346,7 @@
    ${CRYPTO_LIBRARIES}
    ${CURL_LIBRARIES}
    ${SQLite3_LIBRARIES}

diff --git a/ddnet.spec b/ddnet.spec
index 7ffcdf6..e3f23fb 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -6,6 +6,9 @@ Version:        20.0
 Release:        1%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
+# Enable testing release candidate releases
+%global upstream_version %(echo %{version} | sed 's/rc/-rc/')
+
 #
 # CC-BY-SA
 # --------------------------------------
@@ -30,7 +33,7 @@ Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 # Automatically converted from old format: zlib and CC-BY-SA and ASL 2.0 and MIT and Public Domain - review is highly recommended.
 License:        Zlib AND CC-BY-SA-3.0 AND Apache-2.0 AND MIT AND LicenseRef-Fedora-Public-Domain
 URL:            https://ddnet.org/
-Source0:        https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/ddnet/ddnet/archive/%{upstream_version}/%{name}-%{upstream_version}.tar.gz
 
 # Disable network lookup test because without internet access tests not pass
 Patch1:         0001-Disabled-network-lookup-test.patch
@@ -114,18 +117,16 @@ Standalone server for %{name}.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{upstream_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
+find -type f -name Cargo.toml -exec sed -i "s|^cxx =.*|cxx = \"=${CXXBRIDGE_VERSION}\"|" {} +
 python3 scripts/generate_rust_bridge.py
 
 %cargo_prep
 sed '/Cargo.lock/d' -i CMakeLists.txt
 sed '/RUST_CARGO/s/--locked/--offline/' -i CMakeLists.txt
-sed '/foreach.*VULKAN_SHADER_/s/FILE_LIST/OUTPUT_PATHS/' -i CMakeLists.txt
 touch CMakeLists.txt
 
 # Remove bundled stuff...
@@ -190,10 +191,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 - Update to version 20.0
 - Resolves: rhbz#2524725
 
-* Thu Jul 19 2026 Packit <hello@packit.dev> - 19.9-1
+* Sun Jul 19 2026 Packit <hello@packit.dev> - 19.9-1
 - Update to version 19.9
 - Resolves: rhbz#2419773
-- migrated to SPDX license
+- Migrated to SPDX license
 
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 19.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild