From aef3dc91fd10b9ec2d7d9ddd9b0a2de550e16f71 Mon Sep 17 00:00:00 2001 From: Anthony Brandon Date: Fri, 19 Jun 2026 20:19:39 +0200 Subject: [PATCH] net-misc/gerbera: Backport patches for 3.2.1 This patch fixes compile errors when using gcc-17/clang-22. Closes: https://bugs.gentoo.org/976808 Signed-off-by: Anthony Brandon Part-of: https://github.com/gentoo/gentoo/pull/46442 Signed-off-by: Sam James --- .../files/gerbera-3.2.1-fix_gcc17.patch | 178 ++++++++++++++++++ net-misc/gerbera/gerbera-3.2.1.ebuild | 13 +- 2 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 net-misc/gerbera/files/gerbera-3.2.1-fix_gcc17.patch diff --git a/net-misc/gerbera/files/gerbera-3.2.1-fix_gcc17.patch b/net-misc/gerbera/files/gerbera-3.2.1-fix_gcc17.patch new file mode 100644 index 0000000000000..517b33967c504 --- /dev/null +++ b/net-misc/gerbera/files/gerbera-3.2.1-fix_gcc17.patch @@ -0,0 +1,178 @@ +https://bugs.gentoo.org/976808 +https://github.com/gerbera/gerbera/pull/3841 +https://github.com/gerbera/gerbera/pull/3889 +--- a/src/config/setup/config_setup_path.cc ++++ b/src/config/setup/config_setup_path.cc +@@ -30,6 +30,7 @@ + #include "config/config_options.h" + #include "util/logger.h" + ++#include + #include + + bool ConfigPathSetup::checkPathValue(std::string& optValue, std::string& pathValue) const +--- a/src/content/inotify/mt_inotify.cc ++++ b/src/content/inotify/mt_inotify.cc +@@ -47,6 +47,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/database/search_handler.h ++++ b/src/database/search_handler.h +@@ -32,7 +32,7 @@ + #include "util/tools.h" + + #include +-#include ++#include + #include + #include + #include +--- a/src/exceptions.h ++++ b/src/exceptions.h +@@ -34,7 +34,7 @@ + #ifndef __EXCEPTIONS_H__ + #define __EXCEPTIONS_H__ + +-#include ++#include + #include + #include + +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -35,6 +35,7 @@ + #include "mem_io_handler.h" // API + + #include "exceptions.h" ++#include + + MemIOHandler::MemIOHandler(const void* buffer, int length) + : buffer(new char[length]) +--- a/src/request_handler/request_handler.h ++++ b/src/request_handler/request_handler.h +@@ -36,6 +36,7 @@ + + #include + #include ++#include + #include + + // forward declaration +--- a/src/upnp/client_manager.h ++++ b/src/upnp/client_manager.h +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + + // forward declarations +--- a/src/upnp/quirks.h ++++ b/src/upnp/quirks.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + namespace pugi { +--- a/src/util/grb_fs.cc ++++ b/src/util/grb_fs.cc +@@ -27,6 +27,7 @@ Gerbera - https://gerbera.io/ + #include "util/tools.h" + + #include ++#include + #include + #include + #include +--- a/src/util/grb_net.cc ++++ b/src/util/grb_net.cc +@@ -27,6 +27,7 @@ Gerbera - https://gerbera.io/ + #include "tools.h" + + #include ++#include + #include + #include + #include +--- a/src/util/string_converter.cc ++++ b/src/util/string_converter.cc +@@ -41,6 +41,7 @@ + #include "util/logger.h" + + #include ++#include + #include + #if FMT_VERSION >= 100202 + #include +--- a/src/util/thread_executor.cc ++++ b/src/util/thread_executor.cc +@@ -34,6 +34,7 @@ + #include "thread_executor.h" // API + + #include "util/logger.h" ++#include + + ThreadExecutor::~ThreadExecutor() + { +--- a/src/util/thread_runner.h ++++ b/src/util/thread_runner.h +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/util/tools.cc ++++ b/src/util/tools.cc +@@ -39,6 +39,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/util/url.h ++++ b/src/util/url.h +@@ -39,6 +39,7 @@ + + #include + #include ++#include + #include + + /// @brief Handle urls for CURL +--- a/src/util/url_utils.cc ++++ b/src/util/url_utils.cc +@@ -29,6 +29,7 @@ Gerbera - https://gerbera.io/ + #if FMT_VERSION >= 100202 + #include + #endif ++#include + #include + + // URL FORMATTING CONSTANTS +--- a/src/util/url_utils.h ++++ b/src/util/url_utils.h +@@ -25,6 +25,7 @@ + #define GERBERA_URL_UTILS_H + + #include ++#include + #include + #include + #include +-- +2.53.0 + diff --git a/net-misc/gerbera/gerbera-3.2.1.ebuild b/net-misc/gerbera/gerbera-3.2.1.ebuild index fbdd56dc98168..8d807c656951b 100644 --- a/net-misc/gerbera/gerbera-3.2.1.ebuild +++ b/net-misc/gerbera/gerbera-3.2.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic linux-info +inherit cmake linux-info DESCRIPTION="UPnP Media Server" HOMEPAGE="https://gerbera.io" @@ -47,17 +47,18 @@ RDEPEND=" mysql? ( dev-db/mysql-connector-c:= ) taglib? ( media-libs/taglib:= ) " -DEPEND="${RDEPEND}" -BDEPEND=" +DEPEND=" + ${RDEPEND} test? ( dev-cpp/gtest ) " CONFIG_CHECK="~INOTIFY_USER" -src_configure() { - # bug #941944 - filter-lto +PATCHES=( + "${FILESDIR}"/${P}-fix_gcc17.patch +) +src_configure() { local mycmakeargs=( -DBUILD_DOC=OFF -DINSTALL_DOC=OFF