From affd6f93f836141a74ff8e33ea7f95a82155a2793f9a5d811c3edbccae48c6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Tue, 1 Oct 2024 11:34:53 +0200 Subject: [PATCH] add patch --- doxygen111.patch | 47 +++++++++++++++++++++++++++++++++++++++++++ wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 doxygen111.patch diff --git a/doxygen111.patch b/doxygen111.patch new file mode 100644 index 0000000..7cbe7fe --- /dev/null +++ b/doxygen111.patch @@ -0,0 +1,47 @@ +From 2d79dfc7a2a8dd42021ff0ea3dcc8ed05f7c23ef Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Mon, 16 Sep 2024 22:38:13 -0400 +Subject: [PATCH] Fix docs generation for datetime with doxygen 1.11.0 + +It seems that as of the below commit, doxygen changed its handling of +parsing backticks in comments such that it now fails to properly +generate documentation for the entire datetime.h file. Fix this by +closing the open backtick. + +Also update the actual, non-documentation, header to match for +consistency, even if non-matching backticks are not a problem there. + +See: https://github.com/doxygen/doxygen/commit/f18767307be20ca8d2ca81f74cc1f3446205282b + +Closes #24814. +--- + include/wx/datetime.h | 2 +- + interface/wx/datetime.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/wx/datetime.h b/include/wx/datetime.h +index 445c3dbb3929..55292f008408 100644 +--- a/include/wx/datetime.h ++++ b/include/wx/datetime.h +@@ -149,7 +149,7 @@ class WXDLLIMPEXP_BASE wxDateTime + Local, + + // zones from GMT (= Greenwich Mean Time): they're guaranteed to be +- // consequent numbers, so writing something like `GMT0 + offset' is ++ // consequent numbers, so writing something like `GMT0 + offset` is + // safe if abs(offset) <= 12 + + // underscore stands for minus +diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h +index ea3df2323338..1a0222435565 100644 +--- a/interface/wx/datetime.h ++++ b/interface/wx/datetime.h +@@ -96,7 +96,7 @@ class wxDateTime + + ///@{ + /// zones from GMT (= Greenwich Mean Time): they're guaranteed to be +- /// consequent numbers, so writing something like `GMT0 + offset' is ++ /// consequent numbers, so writing something like `GMT0 + offset` is + /// safe if abs(offset) <= 12 + + // underscore stands for minus diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index d0f1aac..a890f67 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 09:33:13 UTC 2024 - Markéta Machová + +- Add upstream doxygen111.patch to fix the docs with new doxygen + ------------------------------------------------------------------- Mon Sep 9 16:24:15 UTC 2024 - Jan Engelhardt diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index c52ecc7..0e9a1e8 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -83,6 +83,8 @@ Source6: wxpython-mkdiff.sh Patch0: soversion.diff Patch1: autoconf-2_72.diff Patch2: textfiletest-fix-file-exists.diff +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/24814 Fix docs generation for datetime with doxygen 1.11.0 +Patch3: doxygen111.patch %if "%{flavor}" == "doc" BuildRequires: doxygen BuildRequires: fdupes