Compare commits

..

No commits in common. "Factory" and "f37" have entirely different histories.
Factory ... f37

2 changed files with 23 additions and 40 deletions

View File

@ -1,35 +0,0 @@
From ef1fb4dc1fc8797fd70c45e31cf3ae5e6447740a Mon Sep 17 00:00:00 2001
From: Tom Rix <trix@redhat.com>
Date: Thu, 11 Jan 2024 08:16:09 -0500
Subject: [PATCH] cppheaderparser silence invalid escape sequence
Signed-off-by: Tom Rix <trix@redhat.com>
---
CppHeaderParser/CppHeaderParser.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
index 06a17fc..8dfe8ba 100644
--- a/CppHeaderParser/CppHeaderParser.py
+++ b/CppHeaderParser/CppHeaderParser.py
@@ -149,7 +149,7 @@ def t_COMMENT_MULTILINE(t):
#not sure why, but get double new lines
v = t.value.replace("\n\n", "\n")
#strip prefixing whitespace
- v = re.sub("\n[\s]+\*", "\n*", v)
+ v = re.sub(r"\n[\s]+\*", "\n*", v)
doxygenCommentCache += v
t.lexer.lineno += len([a for a in t.value if a=="\n"])
def t_NEWLINE(t):
@@ -834,7 +834,7 @@ class CppMethod( _CppMethod ):
doxyLines = self["doxygen"].split("\n")
lastParamDesc = ""
for doxyLine in doxyLines:
- if " @param " in doxyLine or " \param " in doxyLine:
+ if " @param " in doxyLine or r" \param " in doxyLine:
try:
#Strip out the param
doxyLine = doxyLine[doxyLine.find("param ") + 6:]
--
2.43.0

View File

@ -2,14 +2,12 @@
Name: python-%{pypi_name}
Version: 2.7.4
Release: 0
Release: 7%{?dist}
Summary: Parse C++ header files and generate a data structure
License: BSD-3-Clause
License: BSD
URL: http://senexcanis.com/open-source/cppheaderparser/
Source0: %{pypi_source CppHeaderParser}
Patch0: 0001-cppheaderparser-silence-invalid-escape-sequence.patch
BuildArch: noarch
%description
@ -28,7 +26,7 @@ Parse C++ header files and generate a data structure representing the
class.
%prep
%autosetup -p1 -n CppHeaderParser-%{version}
%autosetup -n CppHeaderParser-%{version}
rm -rf %{pypi_name}.egg-info
# Remove outdated parts (Python 2.x)
rm -rf CppHeaderParser/{examples,docs}
@ -46,3 +44,23 @@ sed -i -e '/^#!\//, 1d' CppHeaderParser/CppHeaderParser.py
%{python3_sitelib}/CppHeaderParser-%{version}-py%{python3_version}.egg-info/
%changelog
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.7.4-6
- Rebuilt for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.7.4-3
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Sep 17 2020 Fabian Affolter <mail@fabian-affolter.ch> - 2.7.4-1
- Initial package for Fedora