public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/ddnet] exclude-empty-files: Update to 17.4 (#2219010)
Date: Thu, 03 Sep 2026 00:10:17 GMT [thread overview]
Message-ID: <178839421786.1.18325900355163250334.rpms-ddnet-4023d5f42c9f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ddnet
Branch : exclude-empty-files
Commit : 4023d5f42c9ff1f7b547ca277fe105fc2ddfd3d8
Author : Sérgio M. Basto <sergio@serjux.com>
Date : 2023-12-13T02:06:55+00:00
Stats : +87/-74 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/ddnet/c/4023d5f42c9ff1f7b547ca277fe105fc2ddfd3d8?branch=exclude-empty-files
Log:
Update to 17.4 (#2219010)
---
diff --git a/0001-Disabled-network-lookup-test.patch b/0001-Disabled-network-lookup-test.patch
index 402a8f7..22443fb 100644
--- a/0001-Disabled-network-lookup-test.patch
+++ b/0001-Disabled-network-lookup-test.patch
@@ -1,6 +1,7 @@
---- ./src/test/jobs.cpp.orig 2022-12-11 23:42:08.839685999 +0000
-+++ ./src/test/jobs.cpp 2022-12-11 23:42:57.100549213 +0000
-@@ -66,54 +66,6 @@ TEST_F(Jobs, Wait)
+diff -Naur ddnet-17.4-orig/src/test/jobs.cpp ddnet-17.4/src/test/jobs.cpp
+--- ddnet-17.4-orig/src/test/jobs.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/test/jobs.cpp 2023-12-12 17:40:34.456515743 +0000
+@@ -67,54 +67,6 @@
sphore_destroy(&sphore);
}
@@ -10,8 +11,8 @@
- 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);
+- EXPECT_STREQ(pJob->Hostname(), HOST);
+- EXPECT_EQ(pJob->Nettype(), NETTYPE);
-
- Add(pJob);
- while(pJob->Status() != IJob::STATE_DONE)
@@ -20,11 +21,11 @@
- thread_yield();
- }
-
-- EXPECT_STREQ(pJob->m_aHostname, HOST);
-- EXPECT_EQ(pJob->m_Nettype, NETTYPE);
-- if(pJob->m_Result == 0)
+- EXPECT_STREQ(pJob->Hostname(), HOST);
+- EXPECT_EQ(pJob->Nettype(), NETTYPE);
+- if(pJob->Result() == 0)
- {
-- EXPECT_EQ(pJob->m_Addr.type & NETTYPE, pJob->m_Addr.type);
+- EXPECT_EQ(pJob->Addr().type & NETTYPE, pJob->Addr().type);
- }
-}
-
@@ -34,8 +35,8 @@
- 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);
+- EXPECT_STREQ(pJob->Hostname(), HOST);
+- EXPECT_EQ(pJob->Nettype(), NETTYPE);
-
- Add(pJob);
- while(pJob->Status() != IJob::STATE_DONE)
@@ -44,11 +45,11 @@
- thread_yield();
- }
-
-- EXPECT_STREQ(pJob->m_aHostname, HOST);
-- EXPECT_EQ(pJob->m_Nettype, NETTYPE);
-- if(pJob->m_Result == 0)
+- EXPECT_STREQ(pJob->Hostname(), HOST);
+- EXPECT_EQ(pJob->Nettype(), NETTYPE);
+- if(pJob->Result() == 0)
- {
-- EXPECT_EQ(pJob->m_Addr.type & NETTYPE_WEBSOCKET_IPV4, pJob->m_Addr.type);
+- EXPECT_EQ(pJob->Addr().type & NETTYPE_WEBSOCKET_IPV4, pJob->Addr().type);
- }
-}
-
diff --git a/0002-Unbundle-md5_and_json-parser.patch b/0002-Unbundle-md5_and_json-parser.patch
index c99a779..6e9cb83 100644
--- a/0002-Unbundle-md5_and_json-parser.patch
+++ b/0002-Unbundle-md5_and_json-parser.patch
@@ -1,9 +1,8 @@
-Only in ddnet-16.2-rc7/: 0002-Unbundle-md5_and_json-parser.patch
-diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
---- ddnet-16.2-rc7.orig/CMakeLists.txt 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/CMakeLists.txt 2022-07-02 04:04:28.472606206 +0100
-@@ -569,6 +569,8 @@ if(EXCEPTION_HANDLING)
- find_package(ExceptionHandling)
+diff -Naur ddnet-17.4-orig/CMakeLists.txt ddnet-17.4/CMakeLists.txt
+--- ddnet-17.4-orig/CMakeLists.txt 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/CMakeLists.txt 2023-12-12 18:46:46.061820017 +0000
+@@ -542,6 +542,8 @@
+ find_package(SSP)
endif()
+pkg_check_modules(JSONPARSER REQUIRED json-parser)
@@ -11,7 +10,7 @@ diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
if(TARGET_OS AND TARGET_OS STREQUAL "mac")
find_program(CMAKE_OTOOL otool)
find_program(DMGBUILD dmgbuild)
-@@ -648,6 +650,8 @@ if(CLIENT AND VULKAN)
+@@ -623,6 +625,8 @@
show_dependency_status("Vulkan" VULKAN)
endif()
@@ -20,7 +19,7 @@ diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
if(NOT(CURL_FOUND))
message(SEND_ERROR "You must install Curl to compile ${CMAKE_PROJECT_NAME}")
endif()
-@@ -817,19 +821,6 @@ endif()
+@@ -804,19 +808,6 @@
# DEPENDENCY COMPILATION
########################################################################
@@ -40,7 +39,7 @@ diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
########################################################################
# RUST
########################################################################
-@@ -1861,13 +1852,14 @@ set(GAME_GENERATED_SHARED
+@@ -2040,13 +2031,14 @@
src/game/generated/protocol7.h
src/game/generated/protocolglue.h
)
@@ -56,9 +55,9 @@ diff -rup ddnet-16.2-rc7.orig/CMakeLists.txt ddnet-16.2-rc7/CMakeLists.txt
${WEBSOCKETS_LIBRARIES}
${ZLIB_LIBRARIES}
${PLATFORM_LIBS}
-diff -rup ddnet-16.2-rc7.orig/src/base/hash_bundled.cpp ddnet-16.2-rc7/src/base/hash_bundled.cpp
---- ddnet-16.2-rc7.orig/src/base/hash_bundled.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/base/hash_bundled.cpp 2022-07-02 03:00:55.242912321 +0100
+diff -Naur ddnet-17.4-orig/src/base/hash_bundled.cpp ddnet-17.4/src/base/hash_bundled.cpp
+--- ddnet-17.4-orig/src/base/hash_bundled.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/base/hash_bundled.cpp 2023-12-12 18:47:18.135331264 +0000
@@ -2,7 +2,7 @@
#include "hash_ctxt.h"
@@ -68,9 +67,9 @@ diff -rup ddnet-16.2-rc7.orig/src/base/hash_bundled.cpp ddnet-16.2-rc7/src/base/
void md5_update(MD5_CTX *ctxt, const void *data, size_t data_len)
{
-diff -rup ddnet-16.2-rc7.orig/src/base/hash_ctxt.h ddnet-16.2-rc7/src/base/hash_ctxt.h
---- ddnet-16.2-rc7.orig/src/base/hash_ctxt.h 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/base/hash_ctxt.h 2022-07-02 03:00:55.242912321 +0100
+diff -Naur ddnet-17.4-orig/src/base/hash_ctxt.h ddnet-17.4/src/base/hash_ctxt.h
+--- ddnet-17.4-orig/src/base/hash_ctxt.h 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/base/hash_ctxt.h 2023-12-12 18:47:38.882114341 +0000
@@ -9,7 +9,7 @@
#include <openssl/md5.h>
#include <openssl/sha.h>
@@ -80,21 +79,21 @@ diff -rup ddnet-16.2-rc7.orig/src/base/hash_ctxt.h ddnet-16.2-rc7/src/base/hash_
#endif
#if defined(CONF_OPENSSL)
-diff -rup ddnet-16.2-rc7.orig/src/engine/client/serverbrowser.cpp ddnet-16.2-rc7/src/engine/client/serverbrowser.cpp
---- ddnet-16.2-rc7.orig/src/engine/client/serverbrowser.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/client/serverbrowser.cpp 2022-07-02 03:00:55.243912318 +0100
-@@ -28,7 +28,7 @@
- #include <engine/serverbrowser.h>
- #include <engine/storage.h>
+diff -Naur ddnet-17.4-orig/src/engine/client/client.cpp ddnet-17.4/src/engine/client/client.cpp
+--- ddnet-17.4-orig/src/engine/client/client.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/client/client.cpp 2023-12-12 18:53:47.184313560 +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 <game/client/components/menus.h> // PAGE_DDNET
-
-diff -rup ddnet-16.2-rc7.orig/src/engine/client/serverbrowser_http.cpp ddnet-16.2-rc7/src/engine/client/serverbrowser_http.cpp
---- ddnet-16.2-rc7.orig/src/engine/client/serverbrowser_http.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/client/serverbrowser_http.cpp 2022-07-02 03:00:55.243912318 +0100
+ #include <engine/config.h>
+ #include <engine/console.h>
+diff -Naur ddnet-17.4-orig/src/engine/client/serverbrowser_http.cpp ddnet-17.4/src/engine/client/serverbrowser_http.cpp
+--- ddnet-17.4-orig/src/engine/client/serverbrowser_http.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/client/serverbrowser_http.cpp 2023-12-12 18:51:03.653310364 +0000
@@ -2,7 +2,7 @@
#include <engine/console.h>
@@ -104,11 +103,11 @@ diff -rup ddnet-16.2-rc7.orig/src/engine/client/serverbrowser_http.cpp ddnet-16.
#include <engine/serverbrowser.h>
#include <engine/shared/http.h>
#include <engine/shared/jobs.h>
-diff -rup ddnet-16.2-rc7.orig/src/engine/client/updater.cpp ddnet-16.2-rc7/src/engine/client/updater.cpp
---- ddnet-16.2-rc7.orig/src/engine/client/updater.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/client/updater.cpp 2022-07-02 03:00:55.243912318 +0100
-@@ -3,7 +3,7 @@
- #include <base/system.h>
+diff -Naur ddnet-17.4-orig/src/engine/client/updater.cpp ddnet-17.4/src/engine/client/updater.cpp
+--- ddnet-17.4-orig/src/engine/client/updater.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/client/updater.cpp 2023-12-12 18:53:47.184313560 +0000
+@@ -4,7 +4,7 @@
+
#include <engine/client.h>
#include <engine/engine.h>
-#include <engine/external/json-parser/json.h>
@@ -116,9 +115,9 @@ diff -rup ddnet-16.2-rc7.orig/src/engine/client/updater.cpp ddnet-16.2-rc7/src/e
#include <engine/shared/http.h>
#include <engine/shared/json.h>
#include <engine/storage.h>
-diff -rup ddnet-16.2-rc7.orig/src/engine/shared/http.cpp ddnet-16.2-rc7/src/engine/shared/http.cpp
---- ddnet-16.2-rc7.orig/src/engine/shared/http.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/shared/http.cpp 2022-07-02 03:00:55.243912318 +0100
+diff -Naur ddnet-17.4-orig/src/engine/shared/http.cpp ddnet-17.4/src/engine/shared/http.cpp
+--- ddnet-17.4-orig/src/engine/shared/http.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/shared/http.cpp 2023-12-12 18:53:47.174313497 +0000
@@ -3,7 +3,7 @@
#include <base/log.h>
#include <base/math.h>
@@ -128,9 +127,9 @@ diff -rup ddnet-16.2-rc7.orig/src/engine/shared/http.cpp ddnet-16.2-rc7/src/engi
#include <engine/shared/config.h>
#include <engine/storage.h>
#include <game/version.h>
-diff -rup ddnet-16.2-rc7.orig/src/engine/shared/json.h ddnet-16.2-rc7/src/engine/shared/json.h
---- ddnet-16.2-rc7.orig/src/engine/shared/json.h 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/shared/json.h 2022-07-02 03:00:55.244912314 +0100
+diff -Naur ddnet-17.4-orig/src/engine/shared/json.h ddnet-17.4/src/engine/shared/json.h
+--- ddnet-17.4-orig/src/engine/shared/json.h 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/shared/json.h 2023-12-12 18:53:47.180980206 +0000
@@ -1,7 +1,7 @@
#ifndef ENGINE_SHARED_JSON_H
#define ENGINE_SHARED_JSON_H
@@ -140,22 +139,32 @@ diff -rup ddnet-16.2-rc7.orig/src/engine/shared/json.h ddnet-16.2-rc7/src/engine
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 -rup ddnet-16.2-rc7.orig/src/engine/shared/serverinfo.cpp ddnet-16.2-rc7/src/engine/shared/serverinfo.cpp
---- ddnet-16.2-rc7.orig/src/engine/shared/serverinfo.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/engine/shared/serverinfo.cpp 2022-07-02 03:00:55.244912314 +0100
+diff -Naur ddnet-17.4-orig/src/engine/shared/serverinfo.cpp ddnet-17.4/src/engine/shared/serverinfo.cpp
+--- ddnet-17.4-orig/src/engine/shared/serverinfo.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/engine/shared/serverinfo.cpp 2023-12-12 18:53:47.177646852 +0000
@@ -2,7 +2,7 @@
#include "json.h"
#include <base/math.h>
-#include <engine/external/json-parser/json.h>
+#include <json-parser/json.h>
- #include <engine/serverbrowser.h>
#include <cstdio>
-Only in ddnet-16.2-rc7/src/test: jobs.cpp.rej
-diff -rup ddnet-16.2-rc7.orig/src/test/serverinfo.cpp ddnet-16.2-rc7/src/test/serverinfo.cpp
---- ddnet-16.2-rc7.orig/src/test/serverinfo.cpp 2022-06-29 13:59:33.000000000 +0100
-+++ ddnet-16.2-rc7/src/test/serverinfo.cpp 2022-07-02 03:01:01.159890118 +0100
+
+diff -Naur ddnet-17.4-orig/src/game/server/teehistorian.cpp ddnet-17.4/src/game/server/teehistorian.cpp
+--- ddnet-17.4-orig/src/game/server/teehistorian.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/game/server/teehistorian.cpp 2023-12-12 18:53:47.167646789 +0000
+@@ -1,6 +1,6 @@
+ #include "teehistorian.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-17.4-orig/src/test/serverinfo.cpp ddnet-17.4/src/test/serverinfo.cpp
+--- ddnet-17.4-orig/src/test/serverinfo.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/test/serverinfo.cpp 2023-12-12 18:53:47.174313497 +0000
@@ -3,7 +3,7 @@
#include <engine/serverbrowser.h>
#include <engine/shared/serverinfo.h>
@@ -165,14 +174,15 @@ diff -rup ddnet-16.2-rc7.orig/src/test/serverinfo.cpp ddnet-16.2-rc7/src/test/se
TEST(ServerInfo, ParseLocation)
{
---- ./src/engine/client/client.cpp.orig 2022-09-03 12:15:17.295738600 +0100
-+++ ./src/engine/client/client.cpp 2022-09-03 12:15:53.890601790 +0100
-@@ -12,7 +12,7 @@
- #include <base/math.h>
- #include <base/system.h>
+diff -Naur ddnet-17.4-orig/src/test/teehistorian.cpp ddnet-17.4/src/test/teehistorian.cpp
+--- ddnet-17.4-orig/src/test/teehistorian.cpp 2023-11-15 22:40:08.000000000 +0000
++++ ddnet-17.4/src/test/teehistorian.cpp 2023-12-12 18:53:47.170980143 +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 <game/client/components/menus.h>
- #include <game/generated/protocol.h>
+ #include <engine/server.h>
+ #include <engine/shared/config.h>
+ #include <game/gamecore.h>
diff --git a/ddnet.spec b/ddnet.spec
index 3fee78c..5348b7f 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,8 +2,8 @@
%bcond_without ninja_build
Name: ddnet
-Version: 17.0.3
-Release: 2%{?dist}
+Version: 17.4
+Release: 1%{?dist}
Summary: DDraceNetwork, a cooperative racing mod of Teeworlds
# Disabled while can't fix build
@@ -31,7 +31,7 @@ ExcludeArch: s390x
License: zlib and CC-BY-SA and ASL 2.0 and MIT and Public Domain
-URL: https://ddnet.tw/
+URL: https://ddnet.org/
Source0: https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{version}.tar.gz
# Disable network lookup test because without internet access tests not pass
@@ -59,6 +59,7 @@ BuildRequires: pkgconfig(gtest)
BuildRequires: pkgconfig(json-parser)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
@@ -77,8 +78,6 @@ BuildRequires: glslang
#BuildRequires: pkgconfig(x264)
BuildRequires: (crate(cxx/default) >= 1.0.0 with crate(cxx/default) < 2.0.0~)
BuildRequires: gmock-devel
-# pkgconfig not available
-BuildRequires: pnglite-devel
Requires: %{name}-data = %{version}-%{release}
@@ -178,6 +177,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%changelog
+* Tue Dec 12 2023 Rafael Fontenelle <rafaelff@gnome.org>- 17.4-1
+- Update to 17.4 (#2219010)
+
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index eadb316..539a123 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-17.0.3.tar.gz) = 83ea0005bc82ec97c59d03f6f7fb5e58128061f49d54d333804f93dfdf996ab55ba55db3e7b55a715f95ca5d4134945683fa1d0445906031d6bc1a1170787966
+SHA512 (ddnet-17.4.tar.gz) = e0e1bb584d779421105936ef0d032f61994093fc63bcebda37941abe59e8d5fdbafd83f4d3bcee6e16784ed649f607b9314c7dc3a22521a8a254136159923da3
reply other threads:[~2026-09-03 0:10 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=178839421786.1.18325900355163250334.rpms-ddnet-4023d5f42c9f@fedoraproject.org \
--to=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