diff --git a/0001-cppheaderparser-silence-invalid-escape-sequence.patch b/0001-cppheaderparser-silence-invalid-escape-sequence.patch new file mode 100644 index 0000000..a46a103 --- /dev/null +++ b/0001-cppheaderparser-silence-invalid-escape-sequence.patch @@ -0,0 +1,35 @@ +From ef1fb4dc1fc8797fd70c45e31cf3ae5e6447740a Mon Sep 17 00:00:00 2001 +From: Tom Rix +Date: Thu, 11 Jan 2024 08:16:09 -0500 +Subject: [PATCH] cppheaderparser silence invalid escape sequence + +Signed-off-by: Tom Rix +--- + 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 + diff --git a/python-cppheaderparser.spec b/python-cppheaderparser.spec index a005a18..fbee87f 100644 --- a/python-cppheaderparser.spec +++ b/python-cppheaderparser.spec @@ -2,12 +2,14 @@ Name: python-%{pypi_name} Version: 2.7.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Parse C++ header files and generate a data structure -License: BSD +License: BSD-3-Clause URL: http://senexcanis.com/open-source/cppheaderparser/ Source0: %{pypi_source CppHeaderParser} +Patch0: 0001-cppheaderparser-silence-invalid-escape-sequence.patch + BuildArch: noarch %description @@ -26,7 +28,7 @@ Parse C++ header files and generate a data structure representing the class. %prep -%autosetup -n CppHeaderParser-%{version} +%autosetup -p1 -n CppHeaderParser-%{version} rm -rf %{pypi_name}.egg-info # Remove outdated parts (Python 2.x) rm -rf CppHeaderParser/{examples,docs} @@ -44,6 +46,10 @@ sed -i -e '/^#!\//, 1d' CppHeaderParser/CppHeaderParser.py %{python3_sitelib}/CppHeaderParser-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Jan 11 2024 Tom Rix - 2.7.4-11 +- Silence invalid escape sequence warnings +- Use spdx license + * Fri Jul 21 2023 Fedora Release Engineering - 2.7.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild @@ -72,4 +78,4 @@ sed -i -e '/^#!\//, 1d' CppHeaderParser/CppHeaderParser.py - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Thu Sep 17 2020 Fabian Affolter - 2.7.4-1 -- Initial package for Fedora \ No newline at end of file +- Initial package for Fedora