From 579f71d092c31e2e112f0e387e0c1fd27b15acce0e65f0f1f8e1295ba1c71901 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 1/3] add patch doxygen111.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 -- 2.45.2 From 179764d63df430acf15f2cda67c054daa03c389ac27f50e4b35128589f0831dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Mon, 7 Oct 2024 12:38:16 +0200 Subject: [PATCH 2/3] Add patch fix_webkit_tests.patch --- fix_webkit_tests.patch | 73 ++++++++++++++++++++++++++++++++++++++++++ wxWidgets-3_2.changes | 6 ++++ wxWidgets-3_2.spec | 1 + 3 files changed, 80 insertions(+) create mode 100644 fix_webkit_tests.patch diff --git a/fix_webkit_tests.patch b/fix_webkit_tests.patch new file mode 100644 index 0000000..41d61e2 --- /dev/null +++ b/fix_webkit_tests.patch @@ -0,0 +1,73 @@ +From 1622a5c9c2f123ef27fc3a52938162a68892e725 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 1 Feb 2024 20:36:50 -0500 +Subject: [PATCH 1/4] Fix WebView tests with WebKitGTK 2.43+ + +It seems that WebKitGTK is now failing to navigate to about: URLs unless +they are about:blank or about:srcdoc, so use about:srcdoc as the +alternate URL to fix the WebView tests. + +Ref: https://github.com/WebKit/WebKit/commit/3c3163e71f647db507949ecebad35d0f2ffb33f3 +--- + tests/controls/webtest.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: wxWidgets-3.2.6/samples/webview/webview.cpp +=================================================================== +--- wxWidgets-3.2.6.orig/samples/webview/webview.cpp ++++ wxWidgets-3.2.6/samples/webview/webview.cpp +@@ -992,38 +992,38 @@ void WebFrame::OnToolsClicked(wxCommandE + } + m_histMenuItems.clear(); + +- wxVector > back = m_browser->GetBackwardHistory(); +- wxVector > forward = m_browser->GetForwardHistory(); ++ // We can't use empty labels for the menu items, so use this helper to give ++ // them at least some name if we don't have anything better. ++ const auto makeLabel = [](const wxString& title) ++ { ++ return title.empty() ? "(untitled)" : title; ++ }; + + wxMenuItem* item; + +- unsigned int i; +- for(i = 0; i < back.size(); i++) ++ for ( const auto& histItem : m_browser->GetBackwardHistory() ) + { +- wxString title = back[i]->GetTitle(); +- if ( title.empty() ) ++ wxString title = histItem->GetTitle() ++ if ( title.empty() ) + title = "(untitled)"; +- item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title); +- m_histMenuItems[item->GetId()] = back[i]; ++ item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(title)); ++ m_histMenuItems[item->GetId()] = histItem; + Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId()); + } + +- wxString title = m_browser->GetCurrentTitle(); +- if ( title.empty() ) +- title = "(untitled)"; +- item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title); ++ item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(m_browser->GetCurrentTitle())); + item->Check(); + + //No need to connect the current item + m_histMenuItems[item->GetId()] = wxSharedPtr(new wxWebViewHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle())); + +- for(i = 0; i < forward.size(); i++) ++ for ( const auto& histItem : m_browser->GetForwardHistory() ) + { +- wxString title = forward[i]->GetTitle(); ++ wxString title = histItem->GetTitle() + if ( title.empty() ) + title = "(untitled)"; +- item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title); +- m_histMenuItems[item->GetId()] = forward[i]; ++ item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(title)); ++ m_histMenuItems[item->GetId()] = histItem; + Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId()); + } + diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index a890f67..e86fcd8 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 7 10:36:47 UTC 2024 - Markéta Machová + +- Add upstream fix_webkit_tests.patch to fix webview tests with + WebKitGTK 2.43+. + ------------------------------------------------------------------- Tue Oct 1 09:33:13 UTC 2024 - Markéta Machová diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 0e9a1e8..546fa99 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -85,6 +85,7 @@ 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 +Patch4: fix_webkit_tests.patch %if "%{flavor}" == "doc" BuildRequires: doxygen BuildRequires: fdupes -- 2.45.2 From b63a34ce33189f08eddf114b10ed129b4640387f8a0eb1248363253d8328cc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Mon, 7 Oct 2024 13:14:02 +0200 Subject: [PATCH 3/3] fix spec comments --- wxWidgets-3_2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 5825c13..c5c6cbf 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -83,7 +83,9 @@ 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 +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/24276 Fix WebView tests with WebKitGTK 2.43+ Patch4: fix_webkit_tests.patch %if "%{flavor}" == "doc" BuildRequires: doxygen -- 2.45.2