diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index 011bc5f48a..7a8861a313 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -1,10 +1,9 @@ -#..\src\libxml++-5-7c4d4a4cea.clean\meson.build:278:4: ERROR: Problem encountered: Static builds are not supported by MSVC-style builds -set(LIBXMLPP_VERSION 5.0.0) - +string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/5.0/libxml++-${LIBXMLPP_VERSION}.tar.xz" - FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz" - SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091 + URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/${MAJOR_MINOR}/libxml++-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/libxml++/${MAJOR_MINOR}/libxml++-${VERSION}.tar.xz" + FILENAME "libxml++-${VERSION}.tar.xz" + SHA512 bba28edf40c60ac186ff1b704d9f4f41f73c1be3126cfb345005283b32bb5c9a596b8def64be8ad8e295e1e169bed91d120d5105cbbb6cecc4675d10b897dfe6 ) vcpkg_extract_source_archive( @@ -16,16 +15,14 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dbuild-documentation=false + -Dbuild-manual=false -Dvalidation=false # Validate the tutorial XML file -Dbuild-examples=false -Dbuild-tests=false - -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 -Dbuild-deprecated-api=true # Build deprecated API and include it in the library ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Handle copyright and readme -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index 517ba3f2d9..7cae0a4686 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,12 +1,15 @@ { "name": "libxmlpp", - "version": "5.0.0", - "port-version": 3, - "description": "a C++ wrapper for the libxml XML parser library.", - "supports": "!(windows & static)", + "version": "5.4.0", + "description": "A C++ wrapper for the libxml XML parser library.", + "homepage": "https://libxmlplusplus.github.io/libxmlplusplus/", + "license": "LGPL-2.1-or-later", "dependencies": [ "glibmm", - "libxml2", + { + "name": "libxml2", + "default-features": false + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 37725166f3..380adfe27b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5393,8 +5393,8 @@ "port-version": 3 }, "libxmlpp": { - "baseline": "5.0.0", - "port-version": 3 + "baseline": "5.4.0", + "port-version": 0 }, "libxmp": { "baseline": "4.6.0", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index a9e868cad0..ef79a6fada 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d40381a24a7875d4cdd254d277963cb9ccbecbd", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "361ec896634a0f947949dcf71e2dbf991c066d44", "version": "5.0.0",