!26 [sync] PR-24: 修复tinyxml-devel包无法使用的问题

From: @openeuler-sync-bot 
Reviewed-by: @jianminw 
Signed-off-by: @jianminw
This commit is contained in:
openeuler-ci-bot 2023-05-03 05:42:39 +00:00 committed by Gitee
commit 42e636ad3f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 19 additions and 1 deletions

View File

@ -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 )

View File

@ -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 <huawei2@huawei.com> - 2.6.2-23
- fix the devel package error
* Thu Jan 27 2022 yaoxin <yaoxin30@huawei.com> - 2.6.2-22
- Change the patch name to CVE-2021-42260.patch.