[rpms/ddnet] exclude-empty-files: Update ddnet to 15.7 (#2025117)

[rpms/ddnet] exclude-empty-files: Update ddnet to 15.7 (#2025117)

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

A new commit has been pushed.

Repo   : rpms/ddnet
Branch : exclude-empty-files
Commit : 1dfd0e320dc635b1686b1f397a3a16290df5f25e
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2021-12-14T09:58:17+00:00
Stats  : +6/-62 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ddnet/c/1dfd0e320dc635b1686b1f397a3a16290df5f25e?branch=exclude-empty-files

Log:
Update ddnet to 15.7 (#2025117)

---
diff --git a/4357.patch b/4357.patch
deleted file mode 100644
index 3a48e5f..0000000
--- a/4357.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e9ffcc3c50a247c48f1ad7fafc5582779b124c62 Mon Sep 17 00:00:00 2001
-From: def <dennis@felsin9.de>
-Date: Wed, 17 Nov 2021 18:22:29 +0100
-Subject: [PATCH] Fix serverinfo json parser to work with system libjsonparser
- (fixes #4202)
-
-Debian, Ubuntu, Fedora are using libjsonparser without our own changes,
-thus we were doing garbage.
----
- src/engine/external/json-parser/json.h | 6 ------
- src/engine/shared/serverinfo.cpp       | 8 ++++----
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/src/engine/external/json-parser/json.h b/src/engine/external/json-parser/json.h
-index b8a0acce444..610d072b6ad 100644
---- a/src/engine/external/json-parser/json.h
-+++ b/src/engine/external/json-parser/json.h
-@@ -226,12 +226,6 @@ typedef struct _json_value
-             };
-          }
- 
--         /* DDNet additions */
--         inline operator int () const
--         {
--            return (json_int_t) *this;
--         }
--
-          inline operator bool () const
-          {  
-             if (type != json_boolean)
-diff --git a/src/engine/shared/serverinfo.cpp b/src/engine/shared/serverinfo.cpp
-index 7197f150540..8c83d50e5b2 100644
---- a/src/engine/shared/serverinfo.cpp
-+++ b/src/engine/shared/serverinfo.cpp
-@@ -80,8 +80,8 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
- 	{
- 		return true;
- 	}
--	pOut->m_MaxClients = MaxClients;
--	pOut->m_MaxPlayers = MaxPlayers;
-+	pOut->m_MaxClients = json_int_get(&MaxClients);
-+	pOut->m_MaxPlayers = json_int_get(&MaxPlayers);
- 	pOut->m_Passworded = Passworded;
- 	str_copy(pOut->m_aGameType, GameType, sizeof(pOut->m_aGameType));
- 	str_copy(pOut->m_aName, Name, sizeof(pOut->m_aName));
-@@ -113,8 +113,8 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
- 			CClient *pClient = &pOut->m_aClients[i];
- 			str_copy(pClient->m_aName, Name, sizeof(pClient->m_aName));
- 			str_copy(pClient->m_aClan, Clan, sizeof(pClient->m_aClan));
--			pClient->m_Country = Country;
--			pClient->m_Score = Score;
-+			pClient->m_Country = json_int_get(&Country);
-+			pClient->m_Score = json_int_get(&Score);
- 			pClient->m_IsPlayer = IsPlayer;
- 		}
- 

diff --git a/ddnet.spec b/ddnet.spec
index de6003b..5020fa0 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,8 +2,8 @@
 %bcond_without ninja_build
 
 Name:           ddnet
-Version:        15.6.2
-Release:        2%{?dist}
+Version:        15.7
+Release:        1%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
 # Disabled while can't fix build
@@ -43,9 +43,6 @@ Patch2:         0002-Unbundle-md5.patch
 # Unbundle json-parser
 Patch3:         0003-Unbundle-json-parser.patch
 
-# Fix serverinfo json parser to work with system libjsonparser
-Patch4:         https://github.com/ddnet/ddnet/pull/4357.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 
@@ -166,6 +163,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Mon Dec 13 2021 Sérgio Basto <sergio@serjux.com> - 15.7-1
+- Update ddnet to 15.7 (#2025117)
+
 * Fri Nov 19 2021 Sérgio Basto <sergio@serjux.com> - 15.6.2-2
 - Fix serverinfo json parser to work with system libjsonparser
   merge of https://src.fedoraproject.org/rpms/ddnet/pull-request/1

diff --git a/sources b/sources
index cf27cb7..b2350c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-15.6.2.tar.gz) = 8014d1410cfacb70d15bfb14a271d7fc0dad5ee8d243baac5b4461b7c59912a43dcfba279027d5489488d2527e22afd381293feff95df6ce9f162e50deaaa5a5
+SHA512 (ddnet-15.7.tar.gz) = 4ca65c3a20aefc895433866db0f6ed3a2ff4d1c3ced274bb2cb10e6bdec53200bd28382c2853561b69d191b47d8d926310d43c9dbaeacc56a7828190b72a99f1