[rpms/ddnet] exclude-empty-files: Update ddnet to 16.7.2 (#2136968)

[rpms/ddnet] exclude-empty-files: Update ddnet to 16.7.2 (#2136968)

[@ 2026-09-03 0:10 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/ddnet
Branch : exclude-empty-files
Commit : 6b72109508bfe1cfc1dc398e55a5bdefe0bd8cff
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2023-01-25T14:14:43+00:00
Stats  : +23/-24 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ddnet/c/6b72109508bfe1cfc1dc398e55a5bdefe0bd8cff?branch=exclude-empty-files

Log:
Update ddnet to 16.7.2 (#2136968)

---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
index b021c43..402a8f7 100644
--- a/0001-Disabled-network-lookup-test.patch
+++ b/0001-Disabled-network-lookup-test.patch
@@ -1,18 +1,6 @@
-From 88f25a6ece1bd2ad09fd426123643f24b346b2fc Mon Sep 17 00:00:00 2001
-From: ElXreno <elxreno@gmail.com>
-Date: Fri, 6 Dec 2019 23:23:50 +0300
-Subject: [PATCH 1/3] Disabled network lookup test
-
-Signed-off-by: ElXreno <elxreno@gmail.com>
----
- src/test/jobs.cpp | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/src/test/jobs.cpp b/src/test/jobs.cpp
-index aaa12c497..1ac420f62 100644
---- a/src/test/jobs.cpp
-+++ b/src/test/jobs.cpp
-@@ -66,50 +66,6 @@ TEST_F(Jobs, Wait)
+--- ./src/test/jobs.cpp.orig	2022-12-11 23:42:08.839685999 +0000
++++ ./src/test/jobs.cpp	2022-12-11 23:42:57.100549213 +0000
+@@ -66,54 +66,6 @@ TEST_F(Jobs, Wait)
  	sphore_destroy(&sphore);
  }
  
@@ -34,8 +22,10 @@ index aaa12c497..1ac420f62 100644
 -
 -	EXPECT_STREQ(pJob->m_aHostname, HOST);
 -	EXPECT_EQ(pJob->m_Nettype, NETTYPE);
--	ASSERT_EQ(pJob->m_Result, 0);
--	EXPECT_EQ(pJob->m_Addr.type & NETTYPE, pJob->m_Addr.type);
+-	if(pJob->m_Result == 0)
+-	{
+-		EXPECT_EQ(pJob->m_Addr.type & NETTYPE, pJob->m_Addr.type);
+-	}
 -}
 -
 -TEST_F(Jobs, LookupHostWebsocket)
@@ -56,8 +46,10 @@ index aaa12c497..1ac420f62 100644
 -
 -	EXPECT_STREQ(pJob->m_aHostname, HOST);
 -	EXPECT_EQ(pJob->m_Nettype, NETTYPE);
--	ASSERT_EQ(pJob->m_Result, 0);
--	EXPECT_EQ(pJob->m_Addr.type & NETTYPE_WEBSOCKET_IPV4, pJob->m_Addr.type);
+-	if(pJob->m_Result == 0)
+-	{
+-		EXPECT_EQ(pJob->m_Addr.type & NETTYPE_WEBSOCKET_IPV4, pJob->m_Addr.type);
+-	}
 -}
 -
  TEST_F(Jobs, Many)

diff --git a/0002-Unbundle-md5_and_json-parser.patch b/0002-Unbundle-md5_and_json-parser.patch
index a36ee01..c99a779 100644
--- a/0002-Unbundle-md5_and_json-parser.patch
+++ b/0002-Unbundle-md5_and_json-parser.patch
@@ -38,7 +38,7 @@ diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
 -endif()
 -
  ########################################################################
- # DATA
+ # RUST
  ########################################################################
 @@ -1861,13 +1852,14 @@ set(GAME_GENERATED_SHARED
    src/game/generated/protocol7.h

diff --git a/ddnet.spec b/ddnet.spec
index 93a27be..a0ffc35 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,8 +2,8 @@
 %bcond_without ninja_build
 
 Name:           ddnet
-Version:        16.4
-Release:        2%{?dist}
+Version:        16.7.2
+Release:        1%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
 # Disabled while can't fix build
@@ -49,7 +49,9 @@ BuildRequires:  ninja-build
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  cargo
 BuildRequires:  python3
+BuildRequires:  rust-packaging
 
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(glew)
@@ -73,7 +75,7 @@ BuildRequires:  glslang
 #BuildRequires:  pkgconfig(libswscale)
 #BuildRequires:  pkgconfig(libswresample)
 #BuildRequires:  pkgconfig(x264)
-
+BuildRequires:  (crate(cxx/default) >= 1.0.0 with crate(cxx/default) < 2.0.0~)
 BuildRequires:  gmock-devel
 # pkgconfig not available
 BuildRequires:  pnglite-devel
@@ -116,6 +118,8 @@ Standalone server for %{name}.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
+%cargo_prep
+sed '/Cargo.lock/d' -i CMakeLists.txt
 touch CMakeLists.txt
 
 # Remove bundled stuff...
@@ -172,6 +176,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Wed Jan 25 2023 Sérgio Basto <sergio@serjux.com> - 16.7.2-1
+- Update ddnet to 16.7.2 (#2136968)
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

diff --git a/sources b/sources
index d056ba3..4578329 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-16.4.tar.gz) = a1215f052a42e346510c2303dcf008f00b78bd99fa869ff65b8383c473c3d09fd53066264ba826f0a4462232f9ad860792a1d5f8fd96417d3118f311e527070d
+SHA512 (ddnet-16.7.2.tar.gz) = 92846b82ea4501d7bb00ff947ea1e5bfafa29fd91dc3bc18bd110084de0c04bfcde3f6d847d684286e7297e51c67e5696265b3dec3f7877f86daa17c0d495afd