dev-python/wxpython: fix build w/ some doxygen versions

Closes: https://bugs.gentoo.org/934482
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2024-06-18 05:48:25 +01:00
parent 9c461a80f4
commit e9d357d68f
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,46 @@
https://bugs.gentoo.org/934482
https://github.com/wxWidgets/Phoenix/commit/6a049ccc0ad96f25c3f7d8540b218ffe8921d8c5
From 6a049ccc0ad96f25c3f7d8540b218ffe8921d8c5 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
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.
--- 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):

View File

@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
"${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
"${FILESDIR}/${PN}-4.2.1-x86-time.patch"
"${FILESDIR}/${PN}-4.2.1-doxygen-1.9.7.patch"
)
python_prepare_all() {