From 93f6f25add34bd3e4ce640f5b444d9d24947d5967d44eb7c4cb4ddb644b429ec Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 5 Feb 2020 06:03:53 +0000 Subject: [PATCH] Accepting request 770090 from home:1Antoine1:branches:devel:libraries:c_c++ - Update to version 1.10: * XPath union operation now is ~2x faster to compute and results in a stable order that doesn't depend on pointer order. * Add format_skip_control_chars formatting flag to skip non-printable ASCII characters. * Add format_attribute_single_quote formatting flag to use single quotes for attribute values. * Add Visual Studio .natvis files to improve debugging experience. - Remove merged patches: * pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch. * pugixml-1.9-install-pc-file.patch. OBS-URL: https://build.opensuse.org/request/show/770090 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/pugixml?expand=0&rev=17 --- pugixml-1.10.tar.gz | 3 + pugixml-1.9-install-pc-file.patch | 71 ---------------------- pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch | 39 ------------ pugixml-1.9.tar.gz | 3 - pugixml.changes | 16 +++++ pugixml.spec | 13 ++-- 6 files changed, 23 insertions(+), 122 deletions(-) create mode 100644 pugixml-1.10.tar.gz delete mode 100644 pugixml-1.9-install-pc-file.patch delete mode 100644 pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch delete mode 100644 pugixml-1.9.tar.gz diff --git a/pugixml-1.10.tar.gz b/pugixml-1.10.tar.gz new file mode 100644 index 0000000..c365a8f --- /dev/null +++ b/pugixml-1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a +size 381990 diff --git a/pugixml-1.9-install-pc-file.patch b/pugixml-1.9-install-pc-file.patch deleted file mode 100644 index 119ecd0..0000000 --- a/pugixml-1.9-install-pc-file.patch +++ /dev/null @@ -1,71 +0,0 @@ -From daeb8013b20f9c47e85730faaa4131064a1f9c2e Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 9 Apr 2018 13:48:53 -0400 -Subject: [PATCH] cmake: always install the pkg-config file (#193) - -There's really never a reason to *not* want this installed. If an option -is needed to specify installing in a versioned subdirectory, this option -should be explicitly described rather than hidden in something else. - -As an added bonus, this makes the CMake install code slightly *less* -complicated. ---- - CMakeLists.txt | 10 ++++------ - scripts/pugixml.pc.in | 6 +++--- - 2 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90fa6793..d7bc1b20 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,7 @@ project(pugixml) - - option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) - option(BUILD_TESTS "Build tests" OFF) --option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF) -+option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF) - - set(BUILD_DEFINES "" CACHE STRING "Build defines") - -@@ -55,7 +55,7 @@ endif() - set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1) - get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) - --if(BUILD_PKGCONFIG) -+if(USE_VERSIONED_LIBDIR) - # Install library into its own directory under LIBDIR - set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) - endif() -@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - --if(BUILD_PKGCONFIG) -- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) -- install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) --endif() -+configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) -+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) - - if(BUILD_TESTS) - file(GLOB TEST_SOURCES tests/*.cpp) -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index 3c97c28d..804c4d38 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -1,11 +1,11 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@ --libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@ -+includedir=${prefix}/include@INSTALL_SUFFIX@ -+libdir=${exec_prefix}/lib@INSTALL_SUFFIX@ - - Name: pugixml - Description: Light-weight, simple and fast XML parser for C++ with XPath support. - URL: http://pugixml.org/ - Version: @PUGIXML_VERSION_STRING@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -\ No newline at end of file -+Libs: -L${libdir} -lpugixml diff --git a/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch b/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index f90fe8c..0000000 --- a/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c12889f7ccee3a91754f12a4f5b2bf5eb87acabd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= -Date: Wed, 27 Jun 2018 00:53:42 +0200 -Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for pugixml.pc (#215) - -- Up to now, the libdir was hardcoded to "lib" inside pugixml.pc and - the install directory of pugixml.pc was "lib/pkgconfig" -- Adds support for lib and lib64 by using CMAKE_INSTALL_LIBDIR variable ---- - CMakeLists.txt | 2 +- - scripts/pugixml.pc.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 148f7b0d..d322a631 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - - configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) --install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - if(BUILD_TESTS) - file(GLOB TEST_SOURCES tests/*.cpp) -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index 04b4d3b0..fbb7f8b8 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} - includedir=${prefix}/include@INSTALL_SUFFIX@ --libdir=${exec_prefix}/lib@INSTALL_SUFFIX@ -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@ - - Name: pugixml - Description: Light-weight, simple and fast XML parser for C++ with XPath support. diff --git a/pugixml-1.9.tar.gz b/pugixml-1.9.tar.gz deleted file mode 100644 index 52c3ae9..0000000 --- a/pugixml-1.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 -size 377369 diff --git a/pugixml.changes b/pugixml.changes index a93338c..59a8542 100644 --- a/pugixml.changes +++ b/pugixml.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Feb 4 19:46:01 UTC 2020 - Antoine Belvire + +- Update to version 1.10: + * XPath union operation now is ~2x faster to compute and results + in a stable order that doesn't depend on pointer order. + * Add format_skip_control_chars formatting flag to skip + non-printable ASCII characters. + * Add format_attribute_single_quote formatting flag to use single + quotes for attribute values. + * Add Visual Studio .natvis files to improve debugging + experience. +- Remove merged patches: + * pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch. + * pugixml-1.9-install-pc-file.patch. + ------------------------------------------------------------------- Mon Mar 25 11:26:08 UTC 2019 - Jan Engelhardt diff --git a/pugixml.spec b/pugixml.spec index 04acfa7..9b48f1d 100644 --- a/pugixml.spec +++ b/pugixml.spec @@ -1,7 +1,7 @@ # # spec file for package pugixml # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,18 +18,14 @@ %define _libname libpugixml1 Name: pugixml -Version: 1.9 +Version: 1.10 Release: 0 Summary: Light-weight C++ XML Processing Library License: MIT Group: System/Libraries -Url: http://pugixml.org/ +URL: http://pugixml.org/ Source0: https://github.com/zeux/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Patch1: pugixml-config.patch -# PATCH-FIX-UPSTREAM pugixml-1.9-install-pc-file.patch -- Always install pc file -Patch2: pugixml-1.9-install-pc-file.patch -# PATCH-FIX-UPSTREAM pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch -- Install pc file in proper libdir -Patch3: pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -73,8 +69,7 @@ pugixml is a light-weight C++ XML processing library. It features: %autosetup -p1 %build -# CMAKE_INSTALL_LIBDIR is used as a relative path by upstream -%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} +%cmake make %{?_smp_mflags} %install