public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: ElXreno <elxreno@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ddnet] exclude-empty-files: Ok, update patches and fix build
Date: Thu, 03 Sep 2026 00:09:56 GMT [thread overview]
Message-ID: <178839419682.1.17804192342776554610.rpms-ddnet-1a536bc64959@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ddnet
Branch : exclude-empty-files
Commit : 1a536bc64959901ba93df5279fa99cf382a24949
Author : ElXreno <elxreno@gmail.com>
Date : 2020-10-11T21:57:04+03:00
Stats : +190/-183 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/ddnet/c/1a536bc64959901ba93df5279fa99cf382a24949?branch=exclude-empty-files
Log:
Ok, update patches and fix build
Signed-off-by: ElXreno <elxreno@gmail.com>
---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
index f0f0315..3a66665 100644
--- a/0001-Disabled-network-lookup-test.patch
+++ b/0001-Disabled-network-lookup-test.patch
@@ -1,17 +1,18 @@
-From 71e20f399c972bb43e66d6cf5cbb116188ddb8c0 Mon Sep 17 00:00:00 2001
+From f32b08cebdbcd3e47f32d8eb14132dd1848d6662 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 dd74fdd9b..643449b51 100644
+index e8d567ba7..a43f0adc1 100644
--- a/src/test/jobs.cpp
+++ b/src/test/jobs.cpp
-@@ -51,28 +51,6 @@ TEST_F(Jobs, Wait)
+@@ -53,28 +53,6 @@ TEST_F(Jobs, Wait)
sphore_destroy(&sphore);
}
@@ -41,5 +42,5 @@ index dd74fdd9b..643449b51 100644
{
std::atomic<int> ThreadsRunning(0);
--
-2.26.2
+2.28.0
diff --git a/0002-Unbundle-md5.patch b/0002-Unbundle-md5.patch
new file mode 100644
index 0000000..e1ce8b1
--- /dev/null
+++ b/0002-Unbundle-md5.patch
@@ -0,0 +1,43 @@
+From 0311a6a8a0a13089f9cbf8942f9115db6d021f8f 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
+
+Signed-off-by: ElXreno <elxreno@gmail.com>
+---
+ CMakeLists.txt | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d23ac2b45..f1a042c92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -591,15 +591,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
+@@ -1590,7 +1583,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.28.0
+
diff --git a/0002-Unbundled-md5.patch b/0002-Unbundled-md5.patch
deleted file mode 100644
index 6f6badd..0000000
--- a/0002-Unbundled-md5.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/0003-Unbundle-json-parser.patch b/0003-Unbundle-json-parser.patch
new file mode 100644
index 0000000..fc1fbb7
--- /dev/null
+++ b/0003-Unbundle-json-parser.patch
@@ -0,0 +1,140 @@
+From 9c4b7ef5947c2bf972fb0c5458b721d6615b5bb1 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(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1a042c92..b3e8985ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -375,6 +375,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)
+@@ -453,6 +455,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()
+@@ -584,16 +588,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
+ ########################################################################
+@@ -1583,11 +1577,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 be8cdc5d5..704a0d6c4 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 793d5bce7..c1ddb100f 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 ec35a6e75..ed59a1dbf 100644
+--- a/src/engine/client/serverbrowser.h
++++ b/src/engine/client/serverbrowser.h
+@@ -4,11 +4,11 @@
+ #define ENGINE_CLIENT_SERVERBROWSER_H
+
+ #include <engine/config.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 CServerBrowser : public IServerBrowser
+ {
+diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp
+index 0004c85bd..56cd89c9f 100644
+--- a/src/engine/client/updater.cpp
++++ b/src/engine/client/updater.cpp
+@@ -2,7 +2,7 @@
+ #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>
+diff --git a/src/engine/shared/json.h b/src/engine/shared/json.h
+index 8a09b2c1a..8fd558f62 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.28.0
+
diff --git a/0003-Unbundled-json-parser.patch b/0003-Unbundled-json-parser.patch
deleted file mode 100644
index a818382..0000000
--- a/0003-Unbundled-json-parser.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-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/ddnet.spec b/ddnet.spec
index 3b5178c..62a7635 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -52,10 +52,10 @@ Source0: https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{vers
Patch1: 0001-Disabled-network-lookup-test.patch
# Unbundle md5
-Patch2: 0002-Unbundled-md5.patch
+Patch2: 0002-Unbundle-md5.patch
# Unbundle json-parser
-Patch3: 0003-Unbundled-json-parser.patch
+Patch3: 0003-Unbundle-json-parser.patch
# Fix warning: Could not complete Guile gdb module initialization from:
# /usr/share/gdb/guile/gdb/boot.scm
reply other threads:[~2026-09-03 0:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178839419682.1.17804192342776554610.rpms-ddnet-1a536bc64959@fedoraproject.org \
--to=elxreno@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox