[libxml2] Update to latest commit, remove wrapper

ports/commsdsl/fix-dependency-libxml2.patch

@@ -0,0 +1,38 @@
+diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt
+index eaacb7a..de2cab4 100644
+--- a/lib/src/CMakeLists.txt
++++ b/lib/src/CMakeLists.txt
+@@ -6,10 +6,10 @@ while (TRUE)
+         break()
+     endif ()
+
+-    find_package(LibXml2 QUIET)
+-    if (LIBXML2_FOUND)
++    find_package(libxml2 CONFIG QUIET)
++    if (libxml2_FOUND)
+         # Find again just to display info
+-        find_package(LibXml2 REQUIRED) 
++        find_package(libxml2 CONFIG REQUIRED) 
+         break()
+     endif ()
+
+@@ -52,8 +52,8 @@ while (TRUE)
+     break()
+ endwhile ()
+
+-if (NOT LIBXML2_FOUND)
+-    find_package(LibXml2 REQUIRED)
++if (NOT libxml2_FOUND)
++    find_package(libxml2 CONFIG REQUIRED)
+ endif ()
+
+ set (
+@@ -123,7 +123,7 @@ endif ()
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${COMMSDSL_VERSION})
+
+ target_include_directories(${PROJECT_NAME} 
+-    PRIVATE ${LIBXML2_INCLUDE_DIR}
++    PRIVATE ${LIBXML2_INCLUDE_DIRS}
+     PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/include>
+     INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )

ports/commsdsl/portfile.cmake

@@ -7,7 +7,8 @@ vcpkg_from_github(
     SHA512 f9e908f42e11e30aefe07f1b37d65545be2074758f054fb0d519e1a01f0b7060b309d2667459a5a6918a9ad9f535d0c0a0cc2cd0d4a281e78c2c48a6b8ae4a5d
     HEAD_REF master
     PATCHES
-        "fix-cmake-cmakedir-path.patch"
+        fix-cmake-cmakedir-path.patch
+        fix-dependency-libxml2.patch
 )
 
 vcpkg_configure_cmake(

ports/commsdsl/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "commsdsl",
   "version-string": "3.5.3",
+  "port-version": 1,
   "description": "DSL schemas parser and code generator for CommsChampion Ecosystem",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/commsdsl",

ports/gdal/CONTROL

@@ -1,6 +1,6 @@
 Source: gdal
 Version: 2.4.1
-Port-Version: 14
+Port-Version: 15
 Homepage: https://gdal.org/
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib

ports/gdal/portfile.cmake

@@ -135,9 +135,11 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG)
 
   # Setup libxml2 libraries + include path
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG)
+  find_library(XML2_LIBRARY_REL NAMES libxml2 libxml2s PATHS ${CURRENT_INSTALLED_DIR}/lib)
+  find_library(XML2_LIBRARY_DBG NAMES libxml2d libxml2sd PATHS ${CURRENT_INSTALLED_DIR}/debug/lib)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/libxml2" XML2_INCLUDE_DIR)
+  file(TO_NATIVE_PATH ${XML2_LIBRARY_REL} XML2_LIBRARY_REL)
+  file(TO_NATIVE_PATH ${XML2_LIBRARY_DBG} XML2_LIBRARY_DBG)
 
   # Setup liblzma libraries + include path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR)

ports/libarchive/CONTROL

@@ -1,6 +1,6 @@
 Source: libarchive
 Version: 3.4.3
-Port-Version: 2
+Port-Version: 3
 Homepage: https://github.com/libarchive/libarchive
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib

ports/libarchive/fix-dependencies.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b5333..8164d8f 100644
+index 39b5333..b6c6674 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -433,7 +433,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
@@ -69,7 +69,7 @@ index 39b5333..8164d8f 100644
    #
    # TODO: test for static library.
    #
-@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD)
+@@ -586,25 +567,20 @@ IF(ENABLE_ZSTD)
      SET(ZSTD_FIND_QUIETLY TRUE)
    ENDIF (ZSTD_INCLUDE_DIR)
 
@@ -105,7 +105,7 @@ index 39b5333..8164d8f 100644
  ENDIF(ZSTD_FOUND)
  MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
  MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)
-@@ -773,11 +742,11 @@ ENDIF(ENABLE_NETTLE)
+@@ -773,11 +749,11 @@ ENDIF(ENABLE_NETTLE)
  # (Except on Mac, where OpenSSL is deprecated.)
  #
  IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -121,24 +121,31 @@ index 39b5333..8164d8f 100644
    ENDIF(OPENSSL_FOUND)
  ELSE()
    SET(OPENSSL_FOUND FALSE) # Override cached value
-@@ -896,7 +865,6 @@ main(int argc, char **argv)
+@@ -896,7 +872,6 @@ main(int argc, char **argv)
          IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
            INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
  	  LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
 -	   LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
          ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
        ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
        ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
-@@ -1128,7 +1096,7 @@ ENDIF(ENABLE_ICONV)
+@@ -1128,13 +1103,13 @@ ENDIF(ENABLE_ICONV)
  # Find Libxml2
  #
  IF(ENABLE_LIBXML2)
 -  FIND_PACKAGE(LibXml2)
-+  FIND_PACKAGE(LibXml2 REQUIRED)
++  FIND_PACKAGE(libxml2 CONFIG REQUIRED)
  ELSE()
    SET(LIBXML2_FOUND FALSE)
  ENDIF()
-@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES(
+ IF(LIBXML2_FOUND)
+   CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
+-  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
++  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIRS})
+   LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES})
+   SET(HAVE_LIBXML2 1)
+   # libxml2's include files use iconv.h
+@@ -1432,8 +1407,7 @@ CHECK_C_SOURCE_COMPILES(
    MAJOR_IN_SYSMACROS)
 
  CMAKE_PUSH_CHECK_STATE()

ports/librsvg/CMakeLists.txt

@@ -4,7 +4,7 @@ project(librsvg C)
 find_package(unofficial-cairo CONFIG REQUIRED)
 find_package(unofficial-libcroco CONFIG REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
-find_package(LibXml2 REQUIRED)
+find_package(libxml2 CONFIG REQUIRED)
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   find_library(PANGO_LIB pango-1.0)
   find_library(PANGO_CAIRO_LIB pangocairo-1.0)
@@ -100,6 +100,7 @@ add_library(rsvg-2.40 ${LIBRSVG_SOURCES})
 add_library(pixbufloader-svg ${PIXBUFLOADERSVG_SOURCES})
 
 target_compile_definitions(rsvg-2.40 PRIVATE -DRSVG_COMPILATION -D_CRT_SECURE_NO_WARNINGS -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(rsvg-2.40 PRIVATE ${LIBXML2_INCLUDE_DIRS})
 
 target_include_directories(pixbufloader-svg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(pixbufloader-svg PRIVATE 

ports/librsvg/CONTROL

@@ -1,5 +1,6 @@
 Source: librsvg
-Version: 2.40.20-2
+Version: 2.40.20
+Port-Version: 3
 Homepage: https://gitlab.gnome.org/GNOME/librsvg
 Description: A small library to render Scalable Vector Graphics (SVG)
 Build-Depends: cairo, pango, gdk-pixbuf, libcroco

ports/libsbml/CONTROL

@@ -1,5 +1,6 @@
 Source: libsbml
 Version: 5.18.0
+Port-Version: 1
 Description: A library for reading / writing SBML files
 Default-Features: expat,comp,fbc,groups,layout,render,libxml2
 Supports: !uwp

ports/libsbml/fix-dependency-libxml2.patch

@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ceb8f18..a8bc6c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -464,6 +464,7 @@ endif(WITH_EXPAT)
+ #
+ set(USE_LIBXML OFF)
+ if(WITH_LIBXML)
++  if (0)
+   if (NOT LIBXML_LIBRARY)
+     find_library(LIBXML_LIBRARY
+         NAMES libxml2.lib xml2
+@@ -485,7 +486,11 @@ if(WITH_LIBXML)
+         DOC "The directory containing the libxml2 include files."
+               )
+   endif()
+-
++  else()
++  find_package(libxml2 CONFIG REQUIRED)
++  set(LIBXML_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
++  set(LIBXML_LIBRARY ${LIBXML2_LIBRARIES})
++  endif()
+   add_definitions( -DUSE_LIBXML )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML)
+   set(USE_LIBXML ON)
+@@ -494,7 +499,7 @@ if(WITH_LIBXML)
+   set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR})
+   set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY})
+
+-  if(NOT EXISTS "${LIBXML_INCLUDE_DIR}/libxml/parser.h")
++  if(0)
+         message(FATAL_ERROR
+ "The include directory specified for libxml appears to be invalid.
+ It should contain the file libxml/parser.h, but it does not.")

ports/libsbml/portfile.cmake

@@ -7,7 +7,9 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    PATCHES fix-linkage-type.patch
+    PATCHES
+        fix-linkage-type.patch
+        fix-dependency-libxml2.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)

ports/libspatialite/CONTROL

@@ -1,6 +1,6 @@
 Source: libspatialite
 Version: 4.3.0a
-Port-Version: 6
+Port-Version: 7
 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources
 Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.
 Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv

ports/libspatialite/fix-dependency-libxml2.patch

@@ -0,0 +1,13 @@
+diff --git a/makefile.vc b/makefile.vc
+index f510b4f..9791621 100644
+--- a/makefile.vc
++++ b/makefile.vc
+@@ -59,7 +59,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \
+ 	src\versioninfo\version.obj src\virtualtext\virtualtext.obj
+ SPATIALITE_DLL = spatialite$(VERSION).dll
+
+-CFLAGS = /nologo -I.\src\headers -I. -I$(INSTALLED_ROOT)\include $(OPTFLAGS)
++CFLAGS = /nologo -I.\src\headers -I. -I$(INSTALLED_ROOT)\include -I$(LIBXML2_INCLUDES) $(OPTFLAGS)
+
+ default:	all
+

ports/libspatialite/portfile.cmake

@@ -15,25 +15,28 @@ if (VCPKG_TARGET_IS_WINDOWS)
             fix-makefiles.patch
             fix-sources.patch
             fix-latin-literals.patch
+            fix-dependency-libxml2.patch
     )
 
     # fix most of the problems when spacebar is in the path
+    find_library(LIBXML2_LIBS_REL NAMES libxml2 libxml2s PATHS ${CURRENT_INSTALLED_DIR}/lib NO_DEFAULT_PATH)
+    find_library(LIBXML2_LIBS_DBG NAMES libxml2d libxml2sd PATHS ${CURRENT_INSTALLED_DIR}/debug/lib NO_DEFAULT_PATH)
+
     set(CURRENT_INSTALLED_DIR "\"${CURRENT_INSTALLED_DIR}\"")
+    set(LIBXML2_INCLUDE_DIR "\"${CURRENT_INSTALLED_DIR}\"\\include\\libxml2")
 
     if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
         set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
         set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
         set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib")
         set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib")
-        set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib")
-        set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib")
     else()
         set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
         set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
         set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib")
         set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib")
-        set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
-        set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
+        set(LIBXML2_LIBS_REL "${LIBXML2_LIBS_REL} ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
+        set(LIBXML2_LIBS_DBG "${LIBXML2_LIBS_DBG} ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
     endif()
 
     set(LIBS_ALL_DBG
@@ -67,7 +70,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
 
         vcpkg_execute_required_process(
             COMMAND ${NMAKE} -f makefile.vc clean install
-            "INST_DIR=\"${INST_DIR_DBG}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
+            "INST_DIR=\"${INST_DIR_DBG}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} LIBXML2_INCLUDES=${LIBXML2_INCLUDE_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
             WORKING_DIRECTORY ${SOURCE_PATH}
             LOGNAME nmake-build-${TARGET_TRIPLET}-debug
         )
@@ -84,7 +87,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
         file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
         vcpkg_execute_required_process(
             COMMAND ${NMAKE} -f makefile.vc clean install
-            "INST_DIR=\"${INST_DIR_REL}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
+            "INST_DIR=\"${INST_DIR_REL}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} LIBXML2_INCLUDES=${LIBXML2_INCLUDE_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
             WORKING_DIRECTORY ${SOURCE_PATH}
             LOGNAME nmake-build-${TARGET_TRIPLET}-release
         )
@@ -147,7 +150,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
       LOGNAME config-${TARGET_TRIPLET}-rel
     )
     vcpkg_execute_required_process(
-      COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_RELEASE}/geos-config" "LIBXML2_LIBS=-lxml2 -llzma" "LIBXML2_CFLAGS=${includedir}"
+      COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} "CFLAGS=-I${includedir} -I${includedir}\libxml2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_RELEASE}/geos-config" "LIBXML2_LIBS=-lxml2 -llzma" "LIBXML2_CFLAGS=${includedir}"
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME config-${TARGET_TRIPLET}-rel
     )
@@ -206,7 +209,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
       LOGNAME config-${TARGET_TRIPLET}-debug
     )
     vcpkg_execute_required_process(
-      COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG}  "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_DEBUG}/geos-config" "LIBXML2_LIBS=-lxml2 -llzmad" "LIBXML2_CFLAGS=${includedir}"
+      COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG}  "CFLAGS=-I${includedir} -I${includedir}\libxml2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_DEBUG}/geos-config" "LIBXML2_LIBS=-lxml2 -llzmad" "LIBXML2_CFLAGS=${includedir}"
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME config-${TARGET_TRIPLET}-debug
     )