From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E718415817D for ; Tue, 18 Jun 2024 04:49:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06D90E2AA6; Tue, 18 Jun 2024 04:49:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBAA1E2AA6 for ; Tue, 18 Jun 2024 04:49:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2377335C9B for ; Tue, 18 Jun 2024 04:49:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CDD9181D for ; Tue, 18 Jun 2024 04:49:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718686133.e9d357d68f7a77aeff1aa1bee8c69746f5d0515d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/files/, dev-python/wxpython/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/wxpython/files/wxpython-4.2.1-doxygen-1.9.7.patch dev-python/wxpython/wxpython-4.2.1-r2.ebuild X-VCS-Directories: dev-python/wxpython/files/ dev-python/wxpython/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e9d357d68f7a77aeff1aa1bee8c69746f5d0515d X-VCS-Branch: master Date: Tue, 18 Jun 2024 04:49:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c97add5-9f3c-4b0c-9c21-174a358ba45f X-Archives-Hash: 52aabfa249225e60fbd06842e3da4aa0 commit: e9d357d68f7a77aeff1aa1bee8c69746f5d0515d Author: Sam James gentoo org> AuthorDate: Tue Jun 18 04:48:25 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 18 04:48:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d357d6 dev-python/wxpython: fix build w/ some doxygen versions Closes: https://bugs.gentoo.org/934482 Signed-off-by: Sam James gentoo.org> .../files/wxpython-4.2.1-doxygen-1.9.7.patch | 46 ++++++++++++++++++++++ dev-python/wxpython/wxpython-4.2.1-r2.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/dev-python/wxpython/files/wxpython-4.2.1-doxygen-1.9.7.patch b/dev-python/wxpython/files/wxpython-4.2.1-doxygen-1.9.7.patch new file mode 100644 index 000000000000..7baf5708b8ff --- /dev/null +++ b/dev-python/wxpython/files/wxpython-4.2.1-doxygen-1.9.7.patch @@ -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 +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): + diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild index f97c735170b3..2e58fca2a380 100644 --- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild +++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild @@ -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() {