From f39cc1a5813526f3835535a7e60bca008f75a873 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Fri, 28 Apr 2023 10:36:56 +0800 Subject: [PATCH] fix: change tinyxml.h to use STL to fix the devel package error Signed-off-by: will_niutao (cherry picked from commit 01edb4fe3036c9318454d94dbea60fd85840cacb) --- 2-fix-devel-package-error.patch | 14 ++++++++++++++ tinyxml.spec | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 2-fix-devel-package-error.patch diff --git a/2-fix-devel-package-error.patch b/2-fix-devel-package-error.patch new file mode 100644 index 0000000..7966495 --- /dev/null +++ b/2-fix-devel-package-error.patch @@ -0,0 +1,14 @@ +diff -Naur tinyxml/tinyxml.h tinyxml_new/tinyxml.h +--- tinyxml/tinyxml.h 2011-05-15 10:24:57.000000000 +0800 ++++ tinyxml_new/tinyxml.h 2023-04-27 20:10:36.533804686 +0800 +@@ -26,6 +26,10 @@ + #ifndef TINYXML_INCLUDED + #define TINYXML_INCLUDED + ++#ifndef TIXML_USE_STL ++#define TIXML_USE_STL ++#endif ++ + #ifdef _MSC_VER + #pragma warning( push ) + #pragma warning( disable : 4530 ) diff --git a/tinyxml.spec b/tinyxml.spec index 9b9e69d..8d92b94 100644 --- a/tinyxml.spec +++ b/tinyxml.spec @@ -1,11 +1,12 @@ Name: tinyxml Version: 2.6.2 -Release: 22 +Release: 23 Summary: C++ XML parser License: zlib URL: http://www.grinninglizard.com/tinyxml/ Source0: http://downloads.sourceforge.net/tinyxml/tinyxml_2_6_2.tar.gz Patch0001: CVE-2021-42260.patch +Patch0002: 2-fix-devel-package-error.patch BuildRequires: gcc-c++ %description @@ -64,6 +65,9 @@ mkdir -p %{buildroot}%{_libdir}/pkgconfig %{_libdir}/*.so %changelog +* Fri Apr 28 2023 will_niutao - 2.6.2-23 +- fix the devel package error + * Thu Jan 27 2022 yaoxin - 2.6.2-22 - Change the patch name to CVE-2021-42260.patch. -- Gitee