gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-text/doxygen: remove unused patches

Browse Source 
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2025-03-11 08:02:47 +01:00
committed by Maciej Barć
parent f20fa15ad2
commit 5fb4e6a849
5 changed files with 0 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app-text/doxygen/files/doxygen-1.12.0-clang-19.patch
View File

@@ -1,43 +0,0 @@
https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f
https://github.com/doxygen/doxygen/pull/11064
https://github.com/bisqwit/TinyDeflate/commit/68ced8bd5c819264e628d4f063500753b77f613d
https://github.com/bisqwit/TinyDeflate/pull/9
From cff64a87dea7596fd506a85521d4df4616dc845f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
Date: Fri, 9 Aug 2024 14:13:34 +0200
Subject: [PATCH] Fix build with clang >= 19.0
Clang >= 19.0 requires a template argument list after the template
keyword for CWG96 compliance, see
https://github.com/llvm/llvm-project/pull/80801
This patch has also been submitted to upstream TinyDeflate as
https://github.com/bisqwit/TinyDeflate/pull/9
--- a/deps/TinyDeflate/gunzip.hh
+++ b/deps/TinyDeflate/gunzip.hh
@@ -1141,21 +1141,21 @@ namespace gunzip_ns
//fprintf(stderr, "both track flag\n");
SizeTracker<DeflateTrackBothSize> tracker;
return tracker(Gunzip<code & Flag_NoTrackFlagMask>
- (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
+ (tracker.template ForwardInput<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
}
else if constexpr(code & Flag_TrackIn)
{
//fprintf(stderr, "in track flag\n");
SizeTracker<DeflateTrackInSize> tracker;
return tracker(Gunzip<code & Flag_NoTrackFlagMask>
- (tracker.template ForwardInput(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
+ (tracker.template ForwardInput<I>(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
}
else if constexpr(code & Flag_TrackOut)
{
//fprintf(stderr, "out track flag\n");
SizeTracker<DeflateTrackOutSize> tracker;
return tracker(Gunzip<code & Flag_NoTrackFlagMask>
- (std::forward<I>(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
+ (std::forward<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
}
else
{

112
app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch
View File

@@ -1,112 +0,0 @@
https://bugs.gentoo.org/937599
https://github.com/doxygen/doxygen/pull/11083
From 567aca983f70b01103271e431bc71a13ac79213c Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Fri, 9 Aug 2024 03:00:05 +0300
Subject: [PATCH] Adjust to libfmt-11 changes
Bug: https://bugs.gentoo.org/937599
See-Also: https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf
Signed-off-by: Alfred Wingate <parona@protonmail.com>
--- a/src/trace.h
+++ b/src/trace.h
@@ -156,7 +156,7 @@ namespace fmt { template<typename T> struct formatter {}; }
//! adds support for formatting QCString
template<> struct fmt::formatter<QCString> : formatter<std::string>
{
- auto format(const QCString &c, format_context& ctx) {
+ auto format(const QCString &c, format_context& ctx) const {
return formatter<std::string>::format(c.str(), ctx);
}
};
@@ -164,7 +164,7 @@ template<> struct fmt::formatter<QCString> : formatter<std::string>
//! adds support for formatting Protected
template<> struct fmt::formatter<Protection> : formatter<std::string>
{
- auto format(Protection prot, format_context& ctx) {
+ auto format(Protection prot, format_context& ctx) const {
std::string result="Unknown";
switch (prot)
{
@@ -180,7 +180,7 @@ template<> struct fmt::formatter<Protection> : formatter<std::string>
//! adds support for formatting Specifier
template<> struct fmt::formatter<Specifier> : formatter<std::string>
{
- auto format(Specifier spec, format_context& ctx) {
+ auto format(Specifier spec, format_context& ctx) const {
std::string result="Unknown";
switch (spec)
{
@@ -195,7 +195,7 @@ template<> struct fmt::formatter<Specifier> : formatter<std::string>
//! adds support for formatting MethodTypes
template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
{
- auto format(MethodTypes mtype, format_context& ctx) {
+ auto format(MethodTypes mtype, format_context& ctx) const {
std::string result="Unknown";
switch (mtype)
{
@@ -213,7 +213,7 @@ template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
//! adds support for formatting RelatesType
template<> struct fmt::formatter<RelatesType> : formatter<std::string>
{
- auto format(RelatesType type, format_context& ctx) {
+ auto format(RelatesType type, format_context& ctx) const {
std::string result="Unknown";
switch (type)
{
@@ -228,7 +228,7 @@ template<> struct fmt::formatter<RelatesType> : formatter<std::string>
//! adds support for formatting RelationShip
template<> struct fmt::formatter<Relationship> : formatter<std::string>
{
- auto format(Relationship relation, format_context& ctx) {
+ auto format(Relationship relation, format_context& ctx) const {
std::string result="Unknown";
switch (relation)
{
@@ -243,7 +243,7 @@ template<> struct fmt::formatter<Relationship> : formatter<std::string>
//! adds support for formatting SrcLangExt
template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
{
- auto format(SrcLangExt lang, format_context& ctx) {
+ auto format(SrcLangExt lang, format_context& ctx) const {
std::string result="Unknown";
switch (lang)
{
@@ -273,7 +273,7 @@ template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
//! adds support for formatting MemberType
template<> struct fmt::formatter<MemberType> : formatter<std::string>
{
- auto format(MemberType mtype, format_context& ctx) {
+ auto format(MemberType mtype, format_context& ctx) const {
std::string result="Unknown";
switch (mtype)
{
@@ -301,7 +301,7 @@ template<> struct fmt::formatter<MemberType> : formatter<std::string>
//! adds support for formatting TypeSpecifier
template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
{
- auto format(TypeSpecifier type, format_context& ctx) {
+ auto format(TypeSpecifier type, format_context& ctx) const {
return formatter<std::string>::format(type.to_string(),ctx);
}
};
@@ -309,7 +309,7 @@ template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
//! adds support for formatting EntryType
template<> struct fmt::formatter<EntryType> : formatter<std::string>
{
- auto format(EntryType type, format_context& ctx) {
+ auto format(EntryType type, format_context& ctx) const {
return formatter<std::string>::format(type.to_string(),ctx);
}
};
@@ -317,7 +317,7 @@ template<> struct fmt::formatter<EntryType> : formatter<std::string>
//! adds support for formatting MemberListType
template<> struct fmt::formatter<MemberListType> : formatter<std::string>
{
- auto format(MemberListType type, format_context& ctx) {
+ auto format(MemberListType type, format_context& ctx) const {
return formatter<std::string>::format(type.to_string(),ctx);
}
};

26
app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
View File

@@ -1,26 +0,0 @@
https://bugs.gentoo.org/906920
https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17
From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Thu, 25 May 2023 10:52:29 +0200
Subject: [PATCH] Apply upstream fix for spdlog
Fixes the build with musl >= 1.2.4, see
https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
for details.
--- a/deps/spdlog/include/spdlog/details/os-inl.h
+++ b/deps/spdlog/include/spdlog/details/os-inl.h
@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
# else
int fd = ::fileno(f);
# endif
-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
-# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
struct stat64 st;
if (::fstat64(fd, &st) == 0)
{
--
2.41.0.rc2

51
app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch
View File

@@ -1,51 +0,0 @@
https://github.com/doxygen/doxygen/issues/10265
https://github.com/doxygen/doxygen/pull/10284
From 70bb112352ae7f3130647dcc009d8de5d4134e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
=?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Mon, 4 Sep 2023 18:49:27 +0100
Subject: [PATCH 1/2] doxyapp: Fix linking to spdlog
---
addon/doxyapp/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
index 4f3c31feacd..6097a3cca69 100644
--- a/addon/doxyapp/CMakeLists.txt
+++ b/addon/doxyapp/CMakeLists.txt
@@ -46,7 +46,7 @@ mscgen
doxygen_version
doxycfg
vhdlparser
-spdlog
+spdlog::spdlog
${ICONV_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE3_LIBRARIES}
From 71f2ed171a6d14a67f1905802714add974c31789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
=?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Mon, 4 Sep 2023 18:50:25 +0100
Subject: [PATCH 2/2] doxyparse: Fix linking to spdlog
---
addon/doxyparse/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
index 24881e3ef12..0157afb45e2 100644
--- a/addon/doxyparse/CMakeLists.txt
+++ b/addon/doxyparse/CMakeLists.txt
@@ -35,7 +35,7 @@ mscgen
doxygen_version
doxycfg
vhdlparser
-spdlog
+spdlog::spdlog
${ICONV_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE3_LIBRARIES}

119
app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch
View File

@@ -1,119 +0,0 @@
https://github.com/doxygen/doxygen/issues/10263
https://github.com/doxygen/doxygen/commit/28609fecd41d885e54fa170e499a0e5b55def2c2
From 28609fecd41d885e54fa170e499a0e5b55def2c2 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Aug 2023 20:19:16 +0200
Subject: [PATCH] issue #10263 please add a use_sys_sqlite3 config option
---
CMakeLists.txt | 6 +++++-
cmake/FindSQLite3.cmake | 38 ++++++++++++++++++++++++++++++++++++++
deps/CMakeLists.txt | 4 +++-
src/CMakeLists.txt | 4 +++-
4 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 cmake/FindSQLite3.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4957c34c24d..31e53cc8440 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
option(use_libc++ "Use libc++ as C++ standard library." ON)
endif()
option(use_libclang "Add support for libclang parsing." OFF)
-option(use_sys_spdlog "Use system spdlog instead of bundled." OFF)
+option(use_sys_spdlog "Use system spdlog library instead of the one bundled." OFF)
+option(use_sys_sqlite3 "Use system sqlite3 library instead of the one bundled." OFF)
option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF)
option(win_static "Link with /MT in stead of /MD on windows" OFF)
option(enable_console "Enable that executables on Windows get the CONSOLE bit set for the doxywizard executable [development]" OFF)
@@ -67,6 +68,9 @@ endif()
if (use_sys_spdlog)
find_package(spdlog CONFIG REQUIRED)
endif()
+if (use_sys_sqlite3)
+ find_package(SQLite3 REQUIRED)
+endif()
if (build_wizard)
if (force_qt STREQUAL "Qt6")
if (CMAKE_SYSTEM MATCHES "Darwin")
diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake
new file mode 100644
index 00000000000..7c21de223a7
--- /dev/null
+++ b/cmake/FindSQLite3.cmake
@@ -0,0 +1,38 @@
+# Copyright (C) 2007-2009 LuaDist.
+# Created by Peter Kapec <kapecp@gmail.com>
+# Redistribution and use of this file is allowed according to the terms of the MIT license.
+# For details see the COPYRIGHT file distributed with LuaDist.
+# Note:
+# Searching headers and libraries is very simple and is NOT as powerful as scripts
+# distributed with CMake, because LuaDist defines directories to search for.
+# Everyone is encouraged to contact the author with improvements. Maybe this file
+# becomes part of CMake distribution sometimes.
+
+# - Find sqlite3
+# Find the native SQLite3 headers and libraries.
+#
+# SQLite3_INCLUDE_DIRS - where to find sqlite3.h, etc.
+# SQLite3_LIBRARIES - List of libraries when using sqlite.
+# SQLite3_FOUND - True if sqlite found.
+
+# Look for the header file.
+FIND_PATH(SQLite3_INCLUDE_DIR NAMES sqlite3.h)
+
+# Look for the library.
+FIND_LIBRARY(SQLite3_LIBRARY NAMES sqlite3)
+
+# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE.
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLite3 DEFAULT_MSG SQLite3_LIBRARY SQLite3_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+IF(SQLite3_FOUND)
+ SET(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
+ SET(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
+ELSE(SQLite3_FOUND)
+ SET(SQLite3_LIBRARIES)
+ SET(SQLite3_INCLUDE_DIRS)
+ENDIF(SQLite3_FOUND)
+
+MARK_AS_ADVANCED(SQLite3_INCLUDE_DIRS SQLite3_LIBRARIES)
+
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index a689b4a7018..eb716417f22 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -4,4 +4,6 @@ add_subdirectory(libmscgen)
if (NOT use_sys_spdlog)
add_subdirectory(spdlog)
endif()
-add_subdirectory(sqlite3)
+if (NOT use_sys_sqlite3)
+ add_subdirectory(sqlite3)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78a55c3f2bf..02c52240e5b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
${PROJECT_SOURCE_DIR}/deps/libmd5
${PROJECT_SOURCE_DIR}/deps/liblodepng
${PROJECT_SOURCE_DIR}/deps/libmscgen
- ${PROJECT_SOURCE_DIR}/deps/sqlite3
${PROJECT_SOURCE_DIR}/libversion
${PROJECT_SOURCE_DIR}/libxml
${PROJECT_SOURCE_DIR}/vhdlparser
@@ -18,6 +17,9 @@ include_directories(
if (NOT use_sys_spdlog)
include_directories(${PROJECT_SOURCE_DIR}/deps/spdlog/include)
endif()
+if (NOT use_sys_sqlite)
+ include_directories(${PROJECT_SOURCE_DIR}/deps/sqlite3)
+endif()
file(MAKE_DIRECTORY ${GENERATED_SRC})