From e9e479eb8ceebdd900f545ed88c7d28c9b50f4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 27 Nov 2020 13:34:53 +0100 Subject: [PATCH 1/5] [pugixml] Update to 1.11 Changelog : https://github.com/zeux/pugixml/releases/tag/v1.11 I removed the patch because it was fixed upsteam : https://github.com/zeux/pugixml/pull/363 --- ports/pugixml/CONTROL | 5 ++--- ports/pugixml/portfile.cmake | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 2d4b2a42c9d27f..5f285491d7cbd5 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,5 +1,4 @@ Source: pugixml -Version: 1.10 -Port-Version: 2 +Version: 1.11 Homepage: https://github.com/zeux/pugixml -Description: C++ XML processing library +Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index a96d0adbe69227..06b63effb33984 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.10 - SHA512 0634053d4f757b9293997763bb2e51595197c192f3974e954975d6d6ff91e4a6cb7c194efa530e0eef1a2a93db16592c5630010b6482430dff5ffc6879e84b6a + REF v1.11 + SHA512 9b902d158ef044b49638e42e769045f42559f42963fdca50151143e6857fa58040e6be0e449b643bfd00fb267ab443fbc5af5e3fc9925274cedd4f586b12ae85 HEAD_REF master - PATCHES pugixml-v1.10_fix_debug_pkgconfig.patch # Upstream: https://github.com/zeux/pugixml/pull/363 ) vcpkg_configure_cmake( From 56b400d9b32553eb89afacd122f6dfff43833315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 27 Nov 2020 13:37:29 +0100 Subject: [PATCH 2/5] [pugixml] Remove unused patch file --- .../pugixml-v1.10_fix_debug_pkgconfig.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch diff --git a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch b/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch deleted file mode 100644 index 24d428d98a1c32..00000000000000 --- a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f043962..b281cba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,6 +94,16 @@ install(TARGETS ${LIBRARY} EXPORT pugixml-config - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - -+if (USE_POSTFIX) -+ if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) -+ set(LIB_POSTFIX "_r") -+ elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel) -+ set(LIB_POSTFIX "_m") -+ elseif(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(LIB_POSTFIX "_d") -+ endif() -+endif() -+ - configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) - install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) - -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index f9c3fd4..7958774 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -8,4 +8,4 @@ Description: Light-weight, simple and fast XML parser for C++ with XPath support - URL: https://pugixml.org/ - Version: @pugixml_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -+Libs: -L${libdir} -lpugixml@LIB_POSTFIX@ From 06be9241f8c5195c1e4da6b53b2a833a916e2787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 4 Dec 2020 21:09:43 +0100 Subject: [PATCH 3/5] [pugixml] Add a patch to provide the old imported target name for compatibility --- ports/pugixml/older_versions_target.patch | 15 +++++++++++++++ ports/pugixml/portfile.cmake | 1 + 2 files changed, 16 insertions(+) create mode 100644 ports/pugixml/older_versions_target.patch diff --git a/ports/pugixml/older_versions_target.patch b/ports/pugixml/older_versions_target.patch new file mode 100644 index 00000000000000..3e6e751dcedfda --- /dev/null +++ b/ports/pugixml/older_versions_target.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/pugixml-config.cmake.in b/scripts/pugixml-config.cmake.in +index 91e34935..5af37501 100644 +--- a/scripts/pugixml-config.cmake.in ++++ b/scripts/pugixml-config.cmake.in +@@ -1,3 +1,10 @@ + @PACKAGE_INIT@ + + include("${CMAKE_CURRENT_LIST_DIR}/pugixml-targets.cmake") ++ ++# If the user is not requiring 1.11 (either by explicitly requesting an older ++# version or not requesting one at all), provide the old imported target name ++# for compatibility. ++if (NOT DEFINED PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION VERSION_LESS "1.11") ++ add_library(pugixml ALIAS pugixml::pugixml) ++endif () diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 06b63effb33984..3d6c552a2513d0 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v1.11 SHA512 9b902d158ef044b49638e42e769045f42559f42963fdca50151143e6857fa58040e6be0e449b643bfd00fb267ab443fbc5af5e3fc9925274cedd4f586b12ae85 HEAD_REF master + PATCHES older_versions_target.patch ) vcpkg_configure_cmake( From ccbb846545721b818599975cca1200b50168f240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Sat, 5 Dec 2020 09:49:10 +0100 Subject: [PATCH 4/5] [pugixml] Update to 1.11.1 --- ports/pugixml/CONTROL | 2 +- ports/pugixml/portfile.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 5f285491d7cbd5..65e6732495b46c 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,4 +1,4 @@ Source: pugixml -Version: 1.11 +Version: 1.11.1 Homepage: https://github.com/zeux/pugixml Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 3d6c552a2513d0..72381eb5d8d0da 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.11 - SHA512 9b902d158ef044b49638e42e769045f42559f42963fdca50151143e6857fa58040e6be0e449b643bfd00fb267ab443fbc5af5e3fc9925274cedd4f586b12ae85 + REF v1.11.1 + SHA512 94a79a28d96e763cdd8951c4d0b20aefb43cd1b32cbf5a5354b09f2636710e960e2dbfa56534b61c8d6ddecb2126a006e5f485c1465a97376e1cc077df25f16e HEAD_REF master - PATCHES older_versions_target.patch ) vcpkg_configure_cmake( From 19c3dff8ba75e4896e0c6eeb28ce4b7b76571dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Sat, 5 Dec 2020 09:49:35 +0100 Subject: [PATCH 5/5] [pugixml] Remove unused patch --- ports/pugixml/older_versions_target.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 ports/pugixml/older_versions_target.patch diff --git a/ports/pugixml/older_versions_target.patch b/ports/pugixml/older_versions_target.patch deleted file mode 100644 index 3e6e751dcedfda..00000000000000 --- a/ports/pugixml/older_versions_target.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/scripts/pugixml-config.cmake.in b/scripts/pugixml-config.cmake.in -index 91e34935..5af37501 100644 ---- a/scripts/pugixml-config.cmake.in -+++ b/scripts/pugixml-config.cmake.in -@@ -1,3 +1,10 @@ - @PACKAGE_INIT@ - - include("${CMAKE_CURRENT_LIST_DIR}/pugixml-targets.cmake") -+ -+# If the user is not requiring 1.11 (either by explicitly requesting an older -+# version or not requesting one at all), provide the old imported target name -+# for compatibility. -+if (NOT DEFINED PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION VERSION_LESS "1.11") -+ add_library(pugixml ALIAS pugixml::pugixml) -+endif ()