From 61a41effe6cb8892f90aab4f618db6fd7e88264b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Jan 12 2021 03:11:18 +0000 Subject: Fix FTBFS with doxygen 1.9.1 --- diff --git a/fix-ftbfs-doxygen-1.9.0.patch b/fix-ftbfs-doxygen-1.9.0.patch new file mode 100644 index 0000000..4954576 --- /dev/null +++ b/fix-ftbfs-doxygen-1.9.0.patch @@ -0,0 +1,28 @@ +From 95eb08e2cac13a65fbac7f20f5763274974e8e01 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Fri, 1 Jan 2021 20:33:50 -0500 +Subject: [PATCH] Fix quoting in Doxyfile ALIASES + +This fixes documentation generation using Doxygen 1.9.0. +--- + docs/doxygen/Doxyfile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/wxWidgets/docs/doxygen/Doxyfile b/ext/wxWidgets/docs/doxygen/Doxyfile +index 030a80bc3c..a2db87a5f2 100644 +--- a/ext/wxWidgets/docs/doxygen/Doxyfile ++++ b/ext/wxWidgets/docs/doxygen/Doxyfile +@@ -92,8 +92,8 @@ ALIASES += endFlagTable="\n" + # creates appearance section: this should be used for all main GUI controls + # that look different in different ports. genericAppearance can be used for the + # controls that always look the same. +-ALIASES += appearance{1}="\htmlonly
Appearance:
\endhtmlonly\n\image html appear-\1-msw.png \"wxMSW Appearance\"\n\htmlonly\endhtmlonly\n\image html appear-\1-gtk.png \"wxGTK Appearance\"\n\htmlonly\endhtmlonly\n\image html appear-\1-mac.png \"wxOSX Appearance\"\n\htmlonly
\endhtmlonly" +-ALIASES += genericAppearance{1}="\htmlonly
Appearance:
\endhtmlonly\n\image html generic/\1.png \"Generic Appearance\"\n\htmlonly
\endhtmlonly" ++ALIASES += appearance{1}="\htmlonly
Appearance:
\endhtmlonly\n\image html appear-\1-msw.png \"wxMSW Appearance\"\n\htmlonly\endhtmlonly\n\image html appear-\1-gtk.png \"wxGTK Appearance\"\n\htmlonly\endhtmlonly\n\image html appear-\1-mac.png \"wxOSX Appearance\"\n\htmlonly
\endhtmlonly" ++ALIASES += genericAppearance{1}="\htmlonly
Appearance:
\endhtmlonly\n\image html generic/\1.png \"Generic Appearance\"\n\htmlonly
\endhtmlonly" + + # aliases for the creation of "named member groups" + # USAGE: the first argument must not contain spaces and be a unique identifier +-- +2.29.2 + diff --git a/python-wxpython4.spec b/python-wxpython4.spec index b8ca315..8b6678a 100644 --- a/python-wxpython4.spec +++ b/python-wxpython4.spec @@ -12,7 +12,7 @@ specific code. Name: python-wxpython4 Version: 4.0.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: %{sum} # wxPython is licensed under the wxWidgets license. The only exception is # the pubsub code in wx/lib/pubsub which is BSD licensed. Note: wxPython @@ -31,6 +31,7 @@ Patch0: unbundle-sip.patch Patch1: fix-ftbfs-sip-4.19.23.patch Patch2: wxpymakebuffer-acquire-gil.patch Patch3: restore-gil-pseudodc.patch +Patch4: fix-ftbfs-doxygen-1.9.0.patch BuildRequires: gcc-c++ BuildRequires: doxygen @@ -167,6 +168,9 @@ xvfb-run -a %{__python3} build.py test --pytest_timeout=60 --extra_pytest="-k $S %changelog +* Mon Jan 11 21:38:13 EST 2021 Scott Talbert - 4.0.7-14 +- Fix FTBFS with doxygen 1.9.1 + * Thu Nov 26 09:38:13 EST 2020 Scott Talbert - 4.0.7-13 - Backport upstream fix for wxPseudoDC.FindObjects crash (#1901912)