public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ddnet] exclude-empty-files: Update to 15.5.2 (#1971175)
@ 2026-09-03 0:10 Fedora Release Monitoring
0 siblings, 0 replies; only message in thread
From: Fedora Release Monitoring @ 2026-09-03 0:10 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ddnet
Branch : exclude-empty-files
Commit : 7700ed99fde418b30538fe11530c87aea3b2406a
Author : Fedora Release Monitoring <release-monitoring@fedoraproject.org>
Date : 2021-06-14T12:59:45+03:00
Stats : +107/-55 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/ddnet/c/7700ed99fde418b30538fe11530c87aea3b2406a?branch=exclude-empty-files
Log:
Update to 15.5.2 (#1971175)
---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
index 3a66665..b8ee64c 100644
--- a/0001-Disabled-network-lookup-test.patch
+++ b/0001-Disabled-network-lookup-test.patch
@@ -1,4 +1,4 @@
-From f32b08cebdbcd3e47f32d8eb14132dd1848d6662 Mon Sep 17 00:00:00 2001
+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
@@ -9,10 +9,10 @@ Signed-off-by: ElXreno <elxreno@gmail.com>
1 file changed, 22 deletions(-)
diff --git a/src/test/jobs.cpp b/src/test/jobs.cpp
-index e8d567ba7..a43f0adc1 100644
+index aaa12c497..1ac420f62 100644
--- a/src/test/jobs.cpp
+++ b/src/test/jobs.cpp
-@@ -53,28 +53,6 @@ TEST_F(Jobs, Wait)
+@@ -66,28 +66,6 @@ TEST_F(Jobs, Wait)
sphore_destroy(&sphore);
}
@@ -42,5 +42,5 @@ index e8d567ba7..a43f0adc1 100644
{
std::atomic<int> ThreadsRunning(0);
--
-2.28.0
+2.31.1
diff --git a/0002-Unbundle-md5.patch b/0002-Unbundle-md5.patch
index e1ce8b1..fae3c89 100644
--- a/0002-Unbundle-md5.patch
+++ b/0002-Unbundle-md5.patch
@@ -1,4 +1,4 @@
-From 0311a6a8a0a13089f9cbf8942f9115db6d021f8f Mon Sep 17 00:00:00 2001
+From 3b396a1f317c712ae1c67f5773a00827270b5f2a Mon Sep 17 00:00:00 2001
From: ElXreno <elxreno@gmail.com>
Date: Wed, 1 Jan 2020 20:00:52 +0300
Subject: [PATCH 2/3] Unbundle md5
@@ -9,10 +9,10 @@ Signed-off-by: ElXreno <elxreno@gmail.com>
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d23ac2b45..f1a042c92 100644
+index dbdedadde..8bee0b6ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -591,15 +591,8 @@ endif()
+@@ -632,15 +632,8 @@ endif()
set_src(DEP_JSON_SRC GLOB src/engine/external/json-parser json.c json.h)
add_library(json EXCLUDE_FROM_ALL OBJECT ${DEP_JSON_SRC})
@@ -29,7 +29,7 @@ index d23ac2b45..f1a042c92 100644
########################################################################
# DATA
-@@ -1590,7 +1583,7 @@ set(GAME_GENERATED_SHARED
+@@ -1643,7 +1636,7 @@ set(GAME_GENERATED_SHARED
src/game/generated/protocolglue.h
)
@@ -39,5 +39,5 @@ index d23ac2b45..f1a042c92 100644
# Libraries
set(LIBS
--
-2.28.0
+2.31.1
diff --git a/0003-Unbundle-json-parser.patch b/0003-Unbundle-json-parser.patch
index fc1fbb7..c916f32 100644
--- a/0003-Unbundle-json-parser.patch
+++ b/0003-Unbundle-json-parser.patch
@@ -1,23 +1,26 @@
-From 9c4b7ef5947c2bf972fb0c5458b721d6615b5bb1 Mon Sep 17 00:00:00 2001
+From 5938d312131b846f2b82dd9f87359875a4572876 Mon Sep 17 00:00:00 2001
From: ElXreno <elxreno@gmail.com>
Date: Thu, 2 Jan 2020 12:06:05 +0300
Subject: [PATCH 3/3] Unbundle json-parser
Signed-off-by: ElXreno <elxreno@gmail.com>
---
- CMakeLists.txt | 17 ++++++-----------
- src/engine/client/http.cpp | 2 +-
- src/engine/client/serverbrowser.cpp | 2 +-
- src/engine/client/serverbrowser.h | 2 +-
- src/engine/client/updater.cpp | 2 +-
- src/engine/shared/json.h | 2 +-
- 6 files changed, 11 insertions(+), 16 deletions(-)
+ CMakeLists.txt | 17 ++++++-----------
+ src/engine/client/http.cpp | 3 ++-
+ src/engine/client/serverbrowser.cpp | 2 +-
+ src/engine/client/serverbrowser.h | 3 ++-
+ src/engine/client/serverbrowser_http.cpp | 3 ++-
+ src/engine/client/updater.cpp | 3 ++-
+ src/engine/shared/json.h | 2 +-
+ src/engine/shared/serverinfo.cpp | 3 ++-
+ src/test/serverinfo.cpp | 2 +-
+ 9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1a042c92..b3e8985ca 100644
+index 8bee0b6ea..a0832d565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -375,6 +375,8 @@ else()
+@@ -389,6 +389,8 @@ else()
set(WEBSOCKETS_INCLUDE_DIRS)
endif()
@@ -26,7 +29,7 @@ index f1a042c92..b3e8985ca 100644
if(TARGET_OS AND TARGET_OS STREQUAL "mac")
find_program(CMAKE_OTOOL otool)
-@@ -453,6 +455,8 @@ if(WEBSOCKETS)
+@@ -470,6 +472,8 @@ if(WEBSOCKETS)
show_dependency_status("Websockets" WEBSOCKETS)
endif()
@@ -35,7 +38,7 @@ index f1a042c92..b3e8985ca 100644
if(CLIENT AND NOT(CURL_FOUND))
message(SEND_ERROR "You must install Curl to compile DDNet")
endif()
-@@ -584,16 +588,6 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
+@@ -625,16 +629,6 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
endif()
endif()
@@ -52,7 +55,7 @@ index f1a042c92..b3e8985ca 100644
########################################################################
# DATA
########################################################################
-@@ -1583,11 +1577,12 @@ set(GAME_GENERATED_SHARED
+@@ -1636,12 +1630,13 @@ set(GAME_GENERATED_SHARED
src/game/generated/protocolglue.h
)
@@ -62,66 +65,98 @@ index f1a042c92..b3e8985ca 100644
# Libraries
set(LIBS
${CRYPTO_LIBRARIES}
+ ${SQLite3_LIBRARIES}
+ ${JSONPARSER_LIBRARIES}
${WEBSOCKETS_LIBRARIES}
${ZLIB_LIBRARIES}
${PLATFORM_LIBS}
diff --git a/src/engine/client/http.cpp b/src/engine/client/http.cpp
-index be8cdc5d5..704a0d6c4 100644
+index ae5da4eb8..ed1a1b532 100644
--- a/src/engine/client/http.cpp
+++ b/src/engine/client/http.cpp
-@@ -2,7 +2,7 @@
+@@ -2,11 +2,12 @@
#include <base/system.h>
#include <engine/engine.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>
+
++#include <json-parser/json.h>
++
+ #if !defined(CONF_FAMILY_WINDOWS)
+ #include <signal.h>
+ #endif
diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
-index 793d5bce7..c1ddb100f 100644
+index eef100513..880f3312b 100644
--- a/src/engine/client/serverbrowser.cpp
+++ b/src/engine/client/serverbrowser.cpp
-@@ -20,7 +20,7 @@
+@@ -27,7 +27,7 @@
#include <mastersrv/mastersrv.h>
-#include <engine/external/json-parser/json.h>
+#include <json-parser/json.h>
- #include "serverbrowser.h"
class SortWrap
+ {
diff --git a/src/engine/client/serverbrowser.h b/src/engine/client/serverbrowser.h
-index ec35a6e75..ed59a1dbf 100644
+index 125d16d71..dce6bc73c 100644
--- a/src/engine/client/serverbrowser.h
+++ b/src/engine/client/serverbrowser.h
-@@ -4,11 +4,11 @@
- #define ENGINE_CLIENT_SERVERBROWSER_H
-
+@@ -6,12 +6,13 @@
+ #include <engine/client/http.h>
#include <engine/config.h>
+ #include <engine/console.h>
-#include <engine/external/json-parser/json.h>
#include <engine/masterserver.h>
#include <engine/serverbrowser.h>
#include <engine/shared/config.h>
#include <engine/shared/memheap.h>
+
+#include <json-parser/json.h>
++
+ class IServerBrowserHttp;
+ class IServerBrowserPingCache;
- class CServerBrowser : public IServerBrowser
- {
+diff --git a/src/engine/client/serverbrowser_http.cpp b/src/engine/client/serverbrowser_http.cpp
+index 36acc6c1a..bc14139f5 100644
+--- a/src/engine/client/serverbrowser_http.cpp
++++ b/src/engine/client/serverbrowser_http.cpp
+@@ -4,12 +4,13 @@
+
+ #include <engine/console.h>
+ #include <engine/engine.h>
+-#include <engine/external/json-parser/json.h>
+ #include <engine/serverbrowser.h>
+ #include <engine/shared/linereader.h>
+ #include <engine/shared/serverinfo.h>
+ #include <engine/storage.h>
+
++#include <json-parser/json.h>
++
+ #include <memory>
+
+ class CChooseMaster
diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp
-index 0004c85bd..56cd89c9f 100644
+index 8fed4a8c6..43f0618b2 100644
--- a/src/engine/client/updater.cpp
+++ b/src/engine/client/updater.cpp
-@@ -2,7 +2,7 @@
+@@ -2,11 +2,12 @@
#include <base/system.h>
#include <engine/client.h>
#include <engine/engine.h>
-#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
#include <engine/shared/json.h>
#include <engine/storage.h>
#include <game/version.h>
+
++#include <json-parser/json.h>
++
+ #include <stdlib.h> // system
+
+ using std::map;
diff --git a/src/engine/shared/json.h b/src/engine/shared/json.h
index 8a09b2c1a..8fd558f62 100644
--- a/src/engine/shared/json.h
@@ -135,6 +170,35 @@ index 8a09b2c1a..8fd558f62 100644
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 --git a/src/engine/shared/serverinfo.cpp b/src/engine/shared/serverinfo.cpp
+index 2a554a7d6..e61cf173e 100644
+--- a/src/engine/shared/serverinfo.cpp
++++ b/src/engine/shared/serverinfo.cpp
+@@ -1,9 +1,10 @@
+ #include "serverinfo.h"
+
+ #include "json.h"
+-#include <engine/external/json-parser/json.h>
+ #include <engine/serverbrowser.h>
+
++#include <json-parser/json.h>
++
+ static bool IsAllowedHex(char c)
+ {
+ static const char ALLOWED[] = "0123456789abcdefABCDEF";
+diff --git a/src/test/serverinfo.cpp b/src/test/serverinfo.cpp
+index 37b850e8f..2a5ec11ef 100644
+--- a/src/test/serverinfo.cpp
++++ b/src/test/serverinfo.cpp
+@@ -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)
+ {
--
-2.28.0
+2.31.1
diff --git a/ddnet-gcc11.patch b/ddnet-gcc11.patch
deleted file mode 100644
index 57f5ea4..0000000
--- a/ddnet-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
-index 29ef060..8d89563 100644
---- a/src/game/editor/editor.cpp
-+++ b/src/game/editor/editor.cpp
-@@ -2,6 +2,7 @@
- /* If you are missing that file, acquire a complete release at teeworlds.com. */
-
- #include <algorithm>
-+#include <limits>
-
- #include <base/color.h>
- #include <base/system.h>
diff --git a/ddnet.spec b/ddnet.spec
index 13661ec..d53697c 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,7 +2,7 @@
%bcond_without ninja_build
Name: ddnet
-Version: 15.4
+Version: 15.5.2
Release: 1%{?dist}
Summary: DDraceNetwork, a cooperative racing mod of Teeworlds
@@ -43,9 +43,6 @@ Patch2: 0002-Unbundle-md5.patch
# Unbundle json-parser
Patch3: 0003-Unbundle-json-parser.patch
-# Fix missing header for gcc-11
-Patch4: ddnet-gcc11.patch
-
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -179,6 +176,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%changelog
+* Sun Jun 13 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 15.5.2-1
+- Update to 15.5.2 (#1971175)
+
* Tue May 04 2021 ElXreno <elxreno@gmail.com> - 15.4-1
- Update to version 15.4
diff --git a/sources b/sources
index 1456eb3..3123e70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-15.4.tar.gz) = f874a2a3c432592f3213bf757ca6d01637d46f2349b5a3a1f6700058aaf44d886a622cc82d272a83f9c6c5ba24aa0906a80ee0537604cb51f40331442c3541a1
+SHA512 (ddnet-15.5.2.tar.gz) = dc94e8f327d9c39f61d0bae6282fbbe39bf5997ddb53531b5587c75cdfbec4647d8f01571246df1f726d4d3b30c2fff40f9623133cdd76fe402143e65c774577
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-03 0:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-03 0:10 [rpms/ddnet] exclude-empty-files: Update to 15.5.2 (#1971175) Fedora Release Monitoring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox