From e96b2617c76d8a6622899e4b836c647c635674ab94bec6711096299ebf3d556b Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 28 Dec 2023 10:18:39 +0000 Subject: [PATCH] Accepting request 1135226 from home:alarrosa:branches:X11:wxWidgets - Add patch from upstream to fix building the package with doxygen >=1.9.7 (gh#wxWidgets/Phoenix#2497): * 0001-Support-building-with-Doxygen-1.9.7.patch OBS-URL: https://build.opensuse.org/request/show/1135226 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/python-wxPython?expand=0&rev=44 --- ...-Support-building-with-Doxygen-1.9.7.patch | 48 +++++++++++++++++++ python-wxPython.changes | 7 +++ python-wxPython.spec | 4 +- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0001-Support-building-with-Doxygen-1.9.7.patch diff --git a/0001-Support-building-with-Doxygen-1.9.7.patch b/0001-Support-building-with-Doxygen-1.9.7.patch new file mode 100644 index 0000000..d6a2f42 --- /dev/null +++ b/0001-Support-building-with-Doxygen-1.9.7.patch @@ -0,0 +1,48 @@ +From 6a049ccc0ad96f25c3f7d8540b218ffe8921d8c5 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Tue, 5 Dec 2023 23:42:21 -0500 +Subject: [PATCH] Support building with Doxygen 1.9.7 + +Doxygen 1.9.7 made some changes whereby some method definitions are now +defined in separate XML files, with a "refid" that links to them. In +order to support this, we need to follow these "refids" to pick up the +method definition from the separate group XML files. +--- + etgtools/extractors.py | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/etgtools/extractors.py b/etgtools/extractors.py +index 8c992cb14..5ae1361f9 100644 +--- a/etgtools/extractors.py ++++ b/etgtools/extractors.py +@@ -62,6 +62,8 @@ def extract(self, element): + # class. Should be overridden in derived classes to get what each one + # needs in addition to the base. + self.name = element.find(self.nameTag).text ++ if self.name is None: ++ self.name = '' + if '::' in self.name: + loc = self.name.rfind('::') + self.name = self.name[loc+2:] +@@ -1574,12 +1576,21 @@ def addElement(self, element): + extractingMsg(kind, element) + for node in element.findall('sectiondef/memberdef'): + self.addElement(node) ++ for node in element.findall('sectiondef/member'): ++ node = self.resolveRefid(node) ++ self.addElement(node) + + else: + raise ExtractorError('Unknown module item kind: %s' % kind) + + return item + ++ def resolveRefid(self, node): ++ from etgtools import XMLSRC ++ refid = node.get('refid') ++ fname = os.path.join(XMLSRC, refid.rsplit('_', 1)[0]) + '.xml' ++ root = et.parse(fname).getroot() ++ return root.find(".//memberdef[@id='{}']".format(refid)) + + + def addCppFunction(self, type, name, argsString, body, doc=None, **kw): diff --git a/python-wxPython.changes b/python-wxPython.changes index 693f864..ce2078c 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 27 07:37:06 UTC 2023 - Antonio Larrosa + +- Add patch from upstream to fix building the package with + doxygen >=1.9.7 (gh#wxWidgets/Phoenix#2497): + * 0001-Support-building-with-Doxygen-1.9.7.patch + ------------------------------------------------------------------- Wed Dec 13 23:00:29 UTC 2023 - Jan Engelhardt diff --git a/python-wxPython.spec b/python-wxPython.spec index 2a6decd..11e84a2 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-wxPython # # Copyright (c) 2023 SUSE LLC # @@ -93,6 +93,8 @@ Source1: python-wxPython-rpmlintrc Source2: repack Patch1: 0001-Update-wxTextCtrl-OSX-overrides-since-they-re-now-do.patch Patch2: 0001-Handle-wxGLCanvas-CreateSurface-which-is-only-availa.patch +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/Phoenix/pull/2497 +Patch3: 0001-Support-building-with-Doxygen-1.9.7.patch # PATCH-FIX-OPENSUSE Patch12: use_stl_build.patch # PATCH-FIX-UPSTREAM - https://github.com/wxWidgets/Phoenix/pull/2232