[rpms/ddnet] exclude-empty-files: Update to 18.6 upstream release

[rpms/ddnet] exclude-empty-files: Update to 18.6 upstream release

[Packit]

            A new commit has been pushed.

            Repo   : rpms/ddnet
            Branch : exclude-empty-files
            Commit : ec7dfdebf9c709f0e8ea6752ad34970a00fba9f0
            Author : Packit <hello@packit.dev>
            Date   : 2024-10-08T00:48:43+01:00
            Stats  : +10/-301 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/ddnet/c/ec7dfdebf9c709f0e8ea6752ad34970a00fba9f0?branch=exclude-empty-files

            Log:
            Update to 18.6 upstream release

- Resolves: rhbz#2315593

Upstream tag: 18.6
Upstream commit: bfa23a7b

Commit authored by Packit automation (https://packit.dev/)

---
diff --git a/0002-Unbundle-md5_and_json-parser.patch b/0002-Unbundle-md5_and_json-parser.patch
index 20d9f15..3b16b7f 100644
--- a/0002-Unbundle-md5_and_json-parser.patch
+++ b/0002-Unbundle-md5_and_json-parser.patch
@@ -55,146 +55,3 @@ diff -Naur ddnet-18.0.1-orig/CMakeLists.txt ddnet-18.0.1/CMakeLists.txt
    ${WEBSOCKETS_LIBRARIES}
    ${ZLIB_LIBRARIES}
    ${PLATFORM_LIBS}
-diff -Naur ddnet-18.0.1-orig/src/base/hash_bundled.cpp ddnet-18.0.1/src/base/hash_bundled.cpp
---- ddnet-18.0.1-orig/src/base/hash_bundled.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/base/hash_bundled.cpp	2024-01-26 04:13:34.970942877 +0000
-@@ -2,7 +2,7 @@
- 
- #include "hash_ctxt.h"
- 
--#include <engine/external/md5/md5.h>
-+#include <md5/md5.h>
- 
- void md5_update(MD5_CTX *ctxt, const void *data, size_t data_len)
- {
-diff -Naur ddnet-18.0.1-orig/src/base/hash_ctxt.h ddnet-18.0.1/src/base/hash_ctxt.h
---- ddnet-18.0.1-orig/src/base/hash_ctxt.h	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/base/hash_ctxt.h	2024-01-26 04:13:34.970942877 +0000
-@@ -8,7 +8,7 @@
- #include <openssl/md5.h>
- #include <openssl/sha.h>
- #else
--#include <engine/external/md5/md5.h>
-+#include <md5/md5.h>
- #endif
- 
- #if defined(CONF_OPENSSL)
-diff -Naur ddnet-18.0.1-orig/src/engine/client/client.cpp ddnet-18.0.1/src/engine/client/client.cpp
---- ddnet-18.0.1-orig/src/engine/client/client.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/client/client.cpp	2024-01-26 04:13:34.974276246 +0000
-@@ -9,7 +9,7 @@
- #include <base/math.h>
- #include <base/system.h>
- 
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- 
- #include <engine/config.h>
- #include <engine/console.h>
-diff -Naur ddnet-18.0.1-orig/src/engine/client/serverbrowser_http.cpp ddnet-18.0.1/src/engine/client/serverbrowser_http.cpp
---- ddnet-18.0.1-orig/src/engine/client/serverbrowser_http.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/client/serverbrowser_http.cpp	2024-01-26 04:13:34.977609614 +0000
-@@ -2,7 +2,7 @@
- 
- #include <engine/console.h>
- #include <engine/engine.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/serverbrowser.h>
- #include <engine/shared/http.h>
- #include <engine/shared/jobs.h>
-diff -Naur ddnet-18.0.1-orig/src/engine/client/updater.cpp ddnet-18.0.1/src/engine/client/updater.cpp
---- ddnet-18.0.1-orig/src/engine/client/updater.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/client/updater.cpp	2024-01-26 04:13:34.977609614 +0000
-@@ -3,7 +3,7 @@
- #include "updater.h"
- #include <engine/client.h>
- #include <engine/engine.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/shared/http.h>
- #include <engine/shared/json.h>
- #include <engine/storage.h>
-diff -Naur ddnet-18.0.1-orig/src/engine/shared/http.cpp ddnet-18.0.1/src/engine/shared/http.cpp
---- ddnet-18.0.1-orig/src/engine/shared/http.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/shared/http.cpp	2024-01-26 04:13:34.977609614 +0000
-@@ -3,7 +3,7 @@
- #include <base/log.h>
- #include <base/math.h>
- #include <base/system.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/shared/config.h>
- #include <engine/storage.h>
- #include <game/version.h>
-diff -Naur ddnet-18.0.1-orig/src/engine/shared/json.h ddnet-18.0.1/src/engine/shared/json.h
---- ddnet-18.0.1-orig/src/engine/shared/json.h	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/shared/json.h	2024-01-26 04:13:34.977609614 +0000
-@@ -1,7 +1,7 @@
- #ifndef ENGINE_SHARED_JSON_H
- #define ENGINE_SHARED_JSON_H
- 
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- 
- const struct _json_value *json_object_get(const json_value *object, const char *index);
- const struct _json_value *json_array_get(const json_value *array, int index);
-diff -Naur ddnet-18.0.1-orig/src/engine/shared/serverinfo.cpp ddnet-18.0.1/src/engine/shared/serverinfo.cpp
---- ddnet-18.0.1-orig/src/engine/shared/serverinfo.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/engine/shared/serverinfo.cpp	2024-01-26 04:15:32.451774843 +0000
-@@ -3,7 +3,7 @@
- #include "json.h"
- #include <base/math.h>
- #include <base/system.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- 
- #include <cstdio>
- 
-diff -Naur ddnet-18.0.1-orig/src/game/server/teehistorian.cpp ddnet-18.0.1/src/game/server/teehistorian.cpp
---- ddnet-18.0.1-orig/src/game/server/teehistorian.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/game/server/teehistorian.cpp	2024-01-26 04:15:38.411779166 +0000
-@@ -1,7 +1,7 @@
- #include "teehistorian.h"
- 
- #include <base/system.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/shared/config.h>
- #include <engine/shared/json.h>
- #include <engine/shared/snapshot.h>
-diff -Naur ddnet-18.0.1-orig/src/test/serverinfo.cpp ddnet-18.0.1/src/test/serverinfo.cpp
---- ddnet-18.0.1-orig/src/test/serverinfo.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/test/serverinfo.cpp	2024-01-26 04:13:34.984276351 +0000
-@@ -3,7 +3,7 @@
- #include <engine/serverbrowser.h>
- #include <engine/shared/serverinfo.h>
- 
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- 
- TEST(ServerInfo, ParseLocation)
- {
-diff -Naur ddnet-18.0.1-orig/src/test/teehistorian.cpp ddnet-18.0.1/src/test/teehistorian.cpp
---- ddnet-18.0.1-orig/src/test/teehistorian.cpp	2024-01-22 21:52:08.000000000 +0000
-+++ ddnet-18.0.1/src/test/teehistorian.cpp	2024-01-26 04:13:34.984276351 +0000
-@@ -1,7 +1,7 @@
- #include <gtest/gtest.h>
- 
- #include <base/detect.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/server.h>
- #include <engine/shared/config.h>
- #include <game/gamecore.h>
---- ./src/game/client/components/skins7.cpp.orig	2024-09-06 01:26:34.840618215 +0100
-+++ ./src/game/client/components/skins7.cpp	2024-09-06 01:25:40.975705987 +0100
-@@ -5,7 +5,7 @@
- #include <base/math.h>
- #include <base/system.h>
- 
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/graphics.h>
- #include <engine/shared/config.h>
- #include <engine/shared/jsonwriter.h>

diff --git a/8886.diff b/8886.diff
deleted file mode 100644
index f8c4fd7..0000000
--- a/8886.diff
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/src/base/system.h b/src/base/system.h
-index dfd636475c8..de2de0346c2 100644
---- a/src/base/system.h
-+++ b/src/base/system.h
-@@ -1236,6 +1236,7 @@ int str_format_int(char *buffer, size_t buffer_size, int value);
- template<typename... Args>
- int str_format_opt(char *buffer, int buffer_size, const char *format, Args... args)
- {
-+	static_assert(sizeof...(args) > 0, "Use str_copy instead of str_format without format arguments");
- 	return str_format(buffer, buffer_size, format, args...);
- }
- 
-diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
-index 588fba10549..8f416bc9711 100644
---- a/src/engine/client/client.cpp
-+++ b/src/engine/client/client.cpp
-@@ -3317,7 +3317,7 @@ bool CClient::InitNetworkClient(char *pError, size_t ErrorSize)
- 					if(g_Config.m_Bindaddr[0])
- 						str_format(pError, ErrorSize, "Could not open the network client, try changing or unsetting the bindaddr '%s'.", g_Config.m_Bindaddr);
- 					else
--						str_format(pError, ErrorSize, "Could not open the network client.");
-+						str_copy(pError, "Could not open the network client.", ErrorSize);
- 					return false;
- 				}
- 			}
-diff --git a/src/engine/shared/netban.cpp b/src/engine/shared/netban.cpp
-index 4d1bc705997..0c42f4c326c 100644
---- a/src/engine/shared/netban.cpp
-+++ b/src/engine/shared/netban.cpp
-@@ -490,8 +490,7 @@ void CNetBan::ConBans(IConsole::IResult *pResult, void *pUser)
- 
- 	if(NumBans == 0)
- 	{
--		str_format(aMsg, sizeof(aMsg), "The ban list is empty.");
--		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
-+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "The ban list is empty.");
- 
- 		return;
- 	}
-diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
-index 903443d672a..42cf8694933 100644
---- a/src/game/client/components/hud.cpp
-+++ b/src/game/client/components/hud.cpp
-@@ -1693,8 +1693,7 @@ void CHud::RenderRecord()
- 	if(m_ServerRecord > 0.0f)
- 	{
- 		char aBuf[64];
--		str_format(aBuf, sizeof(aBuf), Localize("Server best:"));
--		TextRender()->Text(5, 75, 6, aBuf, -1.0f);
-+		TextRender()->Text(5, 75, 6, Localize("Server best:"), -1.0f);
- 		char aTime[32];
- 		str_time_float(m_ServerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
- 		str_format(aBuf, sizeof(aBuf), "%s%s", m_ServerRecord > 3600 ? "" : "   ", aTime);
-@@ -1705,8 +1704,7 @@ void CHud::RenderRecord()
- 	if(PlayerRecord > 0.0f)
- 	{
- 		char aBuf[64];
--		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"));
--		TextRender()->Text(5, 82, 6, aBuf, -1.0f);
-+		TextRender()->Text(5, 82, 6, Localize("Personal best:"), -1.0f);
- 		char aTime[32];
- 		str_time_float(PlayerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
- 		str_format(aBuf, sizeof(aBuf), "%s%s", PlayerRecord > 3600 ? "" : "   ", aTime);
-diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
-index 97e9c685ab5..7044fcc55a7 100644
---- a/src/game/client/components/menus_settings.cpp
-+++ b/src/game/client/components/menus_settings.cpp
-@@ -3310,21 +3310,21 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
- 			}
- 		}
- 		else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
--			str_format(aBuf, sizeof(aBuf), Localize("Updating…"));
-+			str_copy(aBuf, Localize("Updating…");
- 		else if(State == IUpdater::NEED_RESTART)
- 		{
--			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
--			m_NeedRestartUpdate = true;
-+				str_copy(aBuf, Localize("DDNet Client updated!"));
-+				m_NeedRestartUpdate = true;
- 		}
- 		else
- 		{
--			str_format(aBuf, sizeof(aBuf), Localize("No updates available"));
-+			str_copy(aBuf, Localize("No updates available");
- 			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
- 			Button.VSplitLeft(100.0f, &Button, nullptr);
- 			static CButtonContainer s_ButtonUpdate;
- 			if(DoButton_Menu(&s_ButtonUpdate, Localize("Check now"), 0, &Button))
- 			{
--				Client()->RequestDDNetInfo();
-+					Client()->RequestDDNetInfo();
- 			}
- 		}
- 		Ui()->DoLabel(&UpdaterRect, aBuf, 14.0f, TEXTALIGN_ML);
-diff --git a/src/game/client/components/menus_start.cpp b/src/game/client/components/menus_start.cpp
-index 8d686afb190..31f3439063a 100644
---- a/src/game/client/components/menus_start.cpp
-+++ b/src/game/client/components/menus_start.cpp
-@@ -240,12 +240,12 @@ void CMenus::RenderStartMenu(CUIRect MainView)
- 	}
- 	else if(State == IUpdater::FAIL)
- 	{
--		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log…"));
-+		str_copy(aBuf, Localize("Update failed! Check log…"));
- 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
- 	}
- 	else if(State == IUpdater::NEED_RESTART)
- 	{
--		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
-+		str_copy(aBuf, Localize("DDNet Client updated!"));
- 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
- 	}
- 	Ui()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
-diff --git a/src/game/editor/editor_actions.cpp b/src/game/editor/editor_actions.cpp
-index 67f2924bf09..8f67e615707 100644
---- a/src/game/editor/editor_actions.cpp
-+++ b/src/game/editor/editor_actions.cpp
-@@ -320,7 +320,7 @@ void CEditorActionDeleteQuad::Redo()
- CEditorActionEditQuadPoint::CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints) :
- 	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_vPreviousPoints(vPreviousPoints), m_vCurrentPoints(vCurrentPoints)
- {
--	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points");
-+	str_copy(m_aDisplayText, "Edit quad points");
- }
- 
- void CEditorActionEditQuadPoint::Undo()
-@@ -628,7 +628,7 @@ CEditorActionGroup::CEditorActionGroup(CEditor *pEditor, int GroupIndex, bool De
- 	if(m_Delete)
- 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete group %d", m_GroupIndex);
- 	else
--		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group");
-+		str_copy(m_aDisplayText, "New group", sizeof(m_aDisplayText));
- }
- 
- void CEditorActionGroup::Undo()
-@@ -1198,7 +1198,7 @@ CEditorActionTileArt::CEditorActionTileArt(CEditor *pEditor, int PreviousImageCo
- 	IEditorAction(pEditor), m_PreviousImageCount(PreviousImageCount), m_vImageIndexMap(vImageIndexMap)
- {
- 	str_copy(m_aTileArtFile, pTileArtFile);
--	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art");
-+	str_copy(m_aDisplayText, "Tile art");
- }
- 
- void CEditorActionTileArt::Undo()
-@@ -1266,7 +1266,7 @@ CEditorCommandAction::CEditorCommandAction(CEditor *pEditor, EType Type, int *pS
- 	switch(m_Type)
- 	{
- 	case EType::ADD:
--		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command");
-+		str_copy(m_aDisplayText, "Add command");
- 		break;
- 	case EType::EDIT:
- 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);

diff --git a/README.packit b/README.packit
index 459869a..766e300 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.101.0.
+The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b.

diff --git a/ddnet.spec b/ddnet.spec
index 175f78e..1df5f1c 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,7 +2,7 @@
 %bcond_without ninja_build
 
 Name:           ddnet
-Version:        18.5.1
+Version:        18.6
 Release:        1%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
@@ -40,8 +40,6 @@ Patch1:         0001-Disabled-network-lookup-test.patch
 # Unbundle md5 and json-parser
 Patch2:         0002-Unbundle-md5_and_json-parser.patch
 
-Patch3:         8886.diff
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 
@@ -119,6 +117,9 @@ Standalone server for %{name}.
 
 %prep
 %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' {} +
+
 %cargo_prep
 sed '/Cargo.lock/d' -i CMakeLists.txt
 touch CMakeLists.txt
@@ -177,6 +178,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sun Oct 06 2024 Packit <hello@packit.dev> - 18.6-1
+- Update to version 18.6
+- Resolves: rhbz#2315593
+
 * Sun Sep 15 2024 Packit <hello@packit.dev> - 18.5.1-1
 - Update to version 18.5.1
 - Resolves: rhbz#2312441

diff --git a/sources b/sources
index 8024574..10fc99d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-18.5.1.tar.gz) = 25cbed5af7e462da1a6d7e1797272b66ca7fd5079ca2ac4aadf85182e043cb660043d8d3f2370958fc66c5a2eaece5a27ebf2a976f474f97a85d5982c1ff87d6
+SHA512 (ddnet-18.6.tar.gz) = 3b9cbc449d2635d5ca3e737e41967ef31647f198616531ef775601c5800ae3aa7ee442ad648f88946358c637a122e83f497621f6fd3f8605a1ef31266b0ce35f