public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ddnet] exclude-empty-files: Update patches
@ 2026-09-03 0:09 ElXreno
0 siblings, 0 replies; only message in thread
From: ElXreno @ 2026-09-03 0:09 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ddnet
Branch : exclude-empty-files
Commit : ad564be6c5d6c28557bd6808965751070208b730
Author : ElXreno <elxreno@gmail.com>
Date : 2020-06-29T17:33:47+03:00
Stats : +225/-222 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/ddnet/c/ad564be6c5d6c28557bd6808965751070208b730?branch=exclude-empty-files
Log:
Update patches
---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
new file mode 100644
index 0000000..f0f0315
--- /dev/null
+++ b/0001-Disabled-network-lookup-test.patch
@@ -0,0 +1,45 @@
+From 71e20f399c972bb43e66d6cf5cbb116188ddb8c0 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
+
+---
+ src/test/jobs.cpp | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/src/test/jobs.cpp b/src/test/jobs.cpp
+index dd74fdd9b..643449b51 100644
+--- a/src/test/jobs.cpp
++++ b/src/test/jobs.cpp
+@@ -51,28 +51,6 @@ TEST_F(Jobs, Wait)
+ sphore_destroy(&sphore);
+ }
+
+-TEST_F(Jobs, LookupHost)
+-{
+- static const char *HOST = "example.com";
+- static const int NETTYPE = NETTYPE_ALL;
+- auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
+-
+- EXPECT_STREQ(pJob->m_aHostname, HOST);
+- EXPECT_EQ(pJob->m_Nettype, NETTYPE);
+-
+- Add(pJob);
+- while(pJob->Status() != IJob::STATE_DONE)
+- {
+- // yay, busy loop...
+- thread_yield();
+- }
+-
+- 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);
+-}
+-
+ TEST_F(Jobs, Many)
+ {
+ std::atomic<int> ThreadsRunning(0);
+--
+2.26.2
+
diff --git a/0001-disabled-network-lookup-test.patch b/0001-disabled-network-lookup-test.patch
deleted file mode 100644
index 907a2b6..0000000
--- a/0001-disabled-network-lookup-test.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 60296da7106bfe65f7c19e4e4dfbf2e13c504914 Mon Sep 17 00:00:00 2001
-From: ElXreno <elxreno@gmail.com>
-Date: Fri, 6 Dec 2019 23:23:50 +0300
-Subject: [PATCH] Disabled network lookup test
-
----
- src/test/jobs.cpp | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/src/test/jobs.cpp b/src/test/jobs.cpp
-index dd74fdd9b..643449b51 100644
---- a/src/test/jobs.cpp
-+++ b/src/test/jobs.cpp
-@@ -51,28 +51,6 @@ TEST_F(Jobs, Wait)
- sphore_destroy(&sphore);
- }
-
--TEST_F(Jobs, LookupHost)
--{
-- static const char *HOST = "example.com";
-- static const int NETTYPE = NETTYPE_ALL;
-- auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
--
-- EXPECT_STREQ(pJob->m_aHostname, HOST);
-- EXPECT_EQ(pJob->m_Nettype, NETTYPE);
--
-- Add(pJob);
-- while(pJob->Status() != IJob::STATE_DONE)
-- {
-- // yay, busy loop...
-- thread_yield();
-- }
--
-- 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);
--}
--
- TEST_F(Jobs, Many)
- {
- std::atomic<int> ThreadsRunning(0);
---
-2.24.0
diff --git a/0002-Unbundled-md5.patch b/0002-Unbundled-md5.patch
new file mode 100644
index 0000000..6f6badd
--- /dev/null
+++ b/0002-Unbundled-md5.patch
@@ -0,0 +1,42 @@
+From 30bf5b27f529b7e6f6fdd57894884a1912783ded 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] Unbundled md5
+
+---
+ CMakeLists.txt | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71a5a0ce2..019931300 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -561,15 +561,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})
+
+-set_src(DEP_MD5_SRC GLOB src/engine/external/md5 md5.c md5.h)
+-add_library(md5 EXCLUDE_FROM_ALL OBJECT ${DEP_MD5_SRC})
+-
+-list(APPEND TARGETS_DEP json md5)
++list(APPEND TARGETS_DEP json)
+ set(DEP_JSON $<TARGET_OBJECTS:json>)
+-set(DEP_MD5)
+-if(NOT CRYPTO_FOUND)
+- set(DEP_MD5 $<TARGET_OBJECTS:md5>)
+-endif()
+
+ ########################################################################
+ # DATA
+@@ -1580,7 +1573,7 @@ set(GAME_GENERATED_SHARED
+ src/game/generated/protocolglue.h
+ )
+
+-set(DEPS ${DEP_JSON} ${DEP_MD5} ${ZLIB_DEP})
++set(DEPS ${DEP_JSON} ${ZLIB_DEP})
+
+ # Libraries
+ set(LIBS
+--
+2.26.2
+
diff --git a/0002-unbundled-md5.patch b/0002-unbundled-md5.patch
deleted file mode 100644
index 7145448..0000000
--- a/0002-unbundled-md5.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cc0059062e9a5ce6b4a15a2383f17472e24533ac Mon Sep 17 00:00:00 2001
-From: ElXreno <elxreno@gmail.com>
-Date: Wed, 1 Jan 2020 20:00:52 +0300
-Subject: [PATCH 1/2] Unbundled md5
-
----
- CMakeLists.txt | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 024b5de9a..b498af737 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -536,15 +536,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})
-
--set_src(DEP_MD5_SRC GLOB src/engine/external/md5 md5.c md5.h)
--add_library(md5 EXCLUDE_FROM_ALL OBJECT ${DEP_MD5_SRC})
--
--list(APPEND TARGETS_DEP json md5)
-+list(APPEND TARGETS_DEP json)
- set(DEP_JSON $<TARGET_OBJECTS:json>)
--set(DEP_MD5)
--if(NOT CRYPTO_FOUND)
-- set(DEP_MD5 $<TARGET_OBJECTS:md5>)
--endif()
-
- ########################################################################
- # COPY DATA AND DLLS
-@@ -776,7 +769,7 @@ set(GAME_GENERATED_SHARED
- src/game/generated/protocol.h
- )
-
--set(DEPS ${DEP_JSON} ${DEP_MD5} ${ZLIB_DEP})
-+set(DEPS ${DEP_JSON} ${ZLIB_DEP})
-
- # Libraries
- set(LIBS
---
-2.24.1
-
diff --git a/0003-Unbundled-json-parser.patch b/0003-Unbundled-json-parser.patch
new file mode 100644
index 0000000..a818382
--- /dev/null
+++ b/0003-Unbundled-json-parser.patch
@@ -0,0 +1,135 @@
+From cdf4e0d3b57d387210009b615c971abf3734e70f 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] Unbundled json-parser
+
+---
+ 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(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 019931300..7ab2c37ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -349,6 +349,8 @@ else()
+ set(WEBSOCKETS_INCLUDE_DIRS)
+ endif()
+
++pkg_check_modules(JSONPARSER REQUIRED json-parser)
++
+
+ if(TARGET_OS AND TARGET_OS STREQUAL "mac")
+ find_program(CMAKE_OTOOL otool)
+@@ -426,6 +428,8 @@ if(WEBSOCKETS)
+ show_dependency_status("Websockets" WEBSOCKETS)
+ endif()
+
++show_dependency_status("json-parser" JSONPARSER)
++
+ if(CLIENT AND NOT(CURL_FOUND))
+ message(SEND_ERROR "You must install Curl to compile DDNet")
+ endif()
+@@ -554,16 +558,6 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
+ endif()
+ endif()
+
+-########################################################################
+-# DEPENDENCY COMPILATION
+-########################################################################
+-
+-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})
+-
+-list(APPEND TARGETS_DEP json)
+-set(DEP_JSON $<TARGET_OBJECTS:json>)
+-
+ ########################################################################
+ # DATA
+ ########################################################################
+@@ -1573,11 +1567,12 @@ set(GAME_GENERATED_SHARED
+ src/game/generated/protocolglue.h
+ )
+
+-set(DEPS ${DEP_JSON} ${ZLIB_DEP})
++set(DEPS ${ZLIB_DEP})
+
+ # Libraries
+ set(LIBS
+ ${CRYPTO_LIBRARIES}
++ ${JSONPARSER_LIBRARIES}
+ ${WEBSOCKETS_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${PLATFORM_LIBS}
+diff --git a/src/engine/client/http.cpp b/src/engine/client/http.cpp
+index 3be17e5cd..723a31351 100644
+--- a/src/engine/client/http.cpp
++++ b/src/engine/client/http.cpp
+@@ -2,7 +2,7 @@
+
+ #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>
+diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
+index 1bc41849b..a639e7591 100644
+--- a/src/engine/client/serverbrowser.cpp
++++ b/src/engine/client/serverbrowser.cpp
+@@ -20,7 +20,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 282d20208..bb27ff1f1 100644
+--- a/src/engine/client/serverbrowser.h
++++ b/src/engine/client/serverbrowser.h
+@@ -5,7 +5,7 @@
+
+ #include <engine/serverbrowser.h>
+ #include <engine/shared/memheap.h>
+-#include <engine/external/json-parser/json.h>
++#include <json-parser/json.h>
+
+ class CServerBrowser : public IServerBrowser
+ {
+diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp
+index 1b2fd4ea8..e3b52bd8a 100644
+--- a/src/engine/client/updater.cpp
++++ b/src/engine/client/updater.cpp
+@@ -3,7 +3,7 @@
+ #include <engine/engine.h>
+ #include <engine/storage.h>
+ #include <engine/client.h>
+-#include <engine/external/json-parser/json.h>
++#include <json-parser/json.h>
+ #include <engine/shared/json.h>
+ #include <game/version.h>
+
+diff --git a/src/engine/shared/json.h b/src/engine/shared/json.h
+index 9b5af36c5..62d245615 100644
+--- a/src/engine/shared/json.h
++++ b/src/engine/shared/json.h
+@@ -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);
+--
+2.26.2
+
diff --git a/0003-unbundled-json-parser.patch b/0003-unbundled-json-parser.patch
deleted file mode 100644
index 69dd7b6..0000000
--- a/0003-unbundled-json-parser.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From d9f81735bbc2e87a2bc2dfec4b423f2c2f491fab Mon Sep 17 00:00:00 2001
-From: ElXreno <elxreno@gmail.com>
-Date: Thu, 2 Jan 2020 12:06:05 +0300
-Subject: [PATCH 2/2] Unbundled json-parser
-
----
- CMakeLists.txt | 15 ++++-----------
- 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, 9 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b498af737..3ae69d448 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,6 +312,7 @@ if(DOWNLOAD_GTEST)
- endif()
- find_package(GLEW)
- find_package(GTest)
-+pkg_check_modules(JSONPARSER REQUIRED json-parser)
- if(MYSQL)
- find_package(MySQL)
- else()
-@@ -382,6 +383,7 @@ if(DOWNLOAD_GTEST)
- endif()
- show_dependency_status("Glew" GLEW)
- show_dependency_status("GTest" GTEST)
-+show_dependency_status("json-parser" JSONPARSER)
- if(TARGET_OS AND TARGET_OS STREQUAL "mac")
- show_dependency_status("Hdiutil" HDIUTIL)
- endif()
-@@ -529,16 +531,6 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
- endif()
- endif()
-
--########################################################################
--# DEPENDENCY COMPILATION
--########################################################################
--
--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})
--
--list(APPEND TARGETS_DEP json)
--set(DEP_JSON $<TARGET_OBJECTS:json>)
--
- ########################################################################
- # COPY DATA AND DLLS
- ########################################################################
-@@ -769,11 +761,12 @@ set(GAME_GENERATED_SHARED
- src/game/generated/protocol.h
- )
-
--set(DEPS ${DEP_JSON} ${ZLIB_DEP})
-+set(DEPS ${ZLIB_DEP})
-
- # Libraries
- set(LIBS
- ${CRYPTO_LIBRARIES}
-+ ${JSONPARSER_LIBRARIES}
- ${WEBSOCKETS_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${PLATFORM_LIBS}
-diff --git a/src/engine/client/http.cpp b/src/engine/client/http.cpp
-index a1ed50311..a73d4ed3c 100644
---- a/src/engine/client/http.cpp
-+++ b/src/engine/client/http.cpp
-@@ -2,7 +2,7 @@
-
- #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>
-diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
-index 1bc41849b..a639e7591 100644
---- a/src/engine/client/serverbrowser.cpp
-+++ b/src/engine/client/serverbrowser.cpp
-@@ -20,7 +20,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 282d20208..bb27ff1f1 100644
---- a/src/engine/client/serverbrowser.h
-+++ b/src/engine/client/serverbrowser.h
-@@ -5,7 +5,7 @@
-
- #include <engine/serverbrowser.h>
- #include <engine/shared/memheap.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
-
- class CServerBrowser : public IServerBrowser
- {
-diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp
-index 180fd6ddb..add49c973 100644
---- a/src/engine/client/updater.cpp
-+++ b/src/engine/client/updater.cpp
-@@ -3,7 +3,7 @@
- #include <engine/engine.h>
- #include <engine/storage.h>
- #include <engine/client.h>
--#include <engine/external/json-parser/json.h>
-+#include <json-parser/json.h>
- #include <engine/shared/json.h>
- #include <game/version.h>
-
-diff --git a/src/engine/shared/json.h b/src/engine/shared/json.h
-index 9b5af36c5..62d245615 100644
---- a/src/engine/shared/json.h
-+++ b/src/engine/shared/json.h
-@@ -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);
---
-2.24.1
-
diff --git a/ddnet.spec b/ddnet.spec
index 378a7a9..8657db8 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -49,13 +49,13 @@ URL: https://ddnet.tw/
Source0: https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{version}.tar.gz
# Disable network lookup test because without internet access tests not pass
-Patch1: 0001-disabled-network-lookup-test.patch
+Patch1: 0001-Disabled-network-lookup-test.patch
# Unbundle md5
-Patch2: 0002-unbundled-md5.patch
+Patch2: 0002-Unbundled-md5.patch
# Unbundle json-parser
-Patch3: 0003-unbundled-json-parser.patch
+Patch3: 0003-Unbundled-json-parser.patch
# Fix warning: Could not complete Guile gdb module initialization from:
# /usr/share/gdb/guile/gdb/boot.scm
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-03 0:09 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:09 [rpms/ddnet] exclude-empty-files: Update patches ElXreno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox