microsoft · BillyONeal · Dec 29, 2020 · Dec 28, 2020 · Dec 28, 2020 · Dec 28, 2020
diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL
@@ -1,7 +1,7 @@
 Source: atk
 Version: 2.24.0-5
-Port-Version: 1
+Port-Version: 2
 Homepage: https://developer.gnome.org/atk/
 Description: GNOME Accessibility Toolkit
 Build-Depends: glib, gettext
-Supports: !(osx|arm)
+Supports: !(osx|arm)
diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 set(ATK_VERSION 2.24.0)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
     FILENAME "atk-${ATK_VERSION}.tar.xz"
     SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
 )

diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL
@@ -1,6 +1,6 @@
 Source: atkmm
 Version: 2.24.2
-Port-Version: 4
+Port-Version: 5
 Homepage: https://www.gtkmm.org
 Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
 Build-Depends: glib, gettext, atk, glibmm

diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake
@@ -3,7 +3,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
     FILENAME "atkmm-2.24.2.tar.xz"
     SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
 )
@@ -18,7 +18,7 @@ vcpkg_extract_source_archive_ex(
 
 if (VCPKG_TARGET_IS_WINDOWS)
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
-    
+
     set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE})
     if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
         set(VS_PLATFORM "Win32")
@@ -29,14 +29,14 @@ if (VCPKG_TARGET_IS_WINDOWS)
         PLATFORM ${VS_PLATFORM}
         USE_VCPKG_INTEGRATION
     )
-    
+
     # Handle headers
     file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
     file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
     file(COPY ${SOURCE_PATH}/atk/atkmm
         DESTINATION ${CURRENT_PACKAGES_DIR}/include
         FILES_MATCHING PATTERN *.h)
-    
+
     # Handle libraries
     file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
         DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
@@ -46,12 +46,12 @@ if (VCPKG_TARGET_IS_WINDOWS)
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    
+
     vcpkg_copy_pdbs()
 else()
     set(ENV{CONFIG_SHELL} bash)
     vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} OPTIONS ${ATKMM_OPTIONS})
-    
+
     vcpkg_install_make()
 endif()
 

diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
@@ -1,6 +1,7 @@
 Source: capnproto
 Version: 0.8.0
+Port-Version: 1
 Description: Data interchange format and capability-based RPC system
 Homepage: https://capnproto.org/
 Build-Depends: zlib
-Supports: !uwp
+Supports: !uwp&!((arm|arm64)&windows)
diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
@@ -1,4 +1,7 @@
-vcpkg_fail_port_install(ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_TARGET UWP)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fail_port_install(ON_ARCH arm arm64)
+endif()
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 

diff --git a/ports/chartdir/CONTROL b/ports/chartdir/CONTROL
@@ -1,4 +1,5 @@
 Source: chartdir
-Version: 6.3.1-1
+Version: 6.3.1
+Port-Version: 2
 Homepage: https://www.advsofteng.com/
 Description: ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.
diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake
@@ -28,15 +28,15 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
     file(COPY "${LIBDIR}/chartdir60.lib"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
     file(COPY "${LIBDIR}/chartdir60.dll"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(COPY "${LIBDIR}/chartdir60.lib"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    
+
     set(CHARTDIR_LIB "chartdir60.lib")
 
 elseif(VCPKG_TARGET_IS_OSX)
 
     vcpkg_download_distfile(ARCHIVE_FILE
         URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz"
-        FILENAME "chartdir_cpp_mac-6.3.1.tar.gz"
-        SHA512 d7364b42ed7c5dd2f89ed8692ed0df1ec952216ba24f8afa8e039641f3296f23c9ff6391e3e0dcd3bfdb9e6898c21a8281aa2803fbee33c7197c1df271a0edf7
+        FILENAME "chartdir_cpp_mac-6.3.1.51483c1975.tar.gz"
+        SHA512 51483c197518203a24f652a4bfd9af1f933f8c59f3d7286e13c612cf09c5b850b4d1e9daa506379218797b5bb79bbc571b9e90b0fbb0f3ef4a3f455dd0de3848
     )
 
     vcpkg_extract_source_archive_ex(
@@ -47,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX)
 
     file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
     file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    
+
     set(CHARTDIR_LIB "libchartdir.6.dylib")
 
 elseif(VCPKG_TARGET_IS_LINUX)
@@ -78,7 +78,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
 
     file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
     file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    
+
     set(CHARTDIR_LIB "libchartdir.so.6.0.3")
 
     file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/chartdir)

diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL
@@ -1,6 +1,6 @@
 Source: gdk-pixbuf
 Version: 2.36.9-5
-Port-Version: 6
+Port-Version: 7
 Homepage: https://developer.gnome.org/gdk-pixbuf/
 Description: Image loading library.
 Build-Depends: gettext, zlib, libpng, glib
diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake
@@ -4,7 +4,7 @@ set(GDK_PIXBUF_VERSION 2.36)
 set(GDK_PIXBUF_PATCH 9)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
     FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
     SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261
 )

diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
@@ -1,6 +1,6 @@
 Source: glibmm
 Version: 2.52.1
-Port-Version: 13
+Port-Version: 14
 Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
 Homepage: https://www.gtkmm.org.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp

diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
@@ -2,7 +2,7 @@
 vcpkg_fail_port_install(ON_TARGET "UWP")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
     FILENAME "glibmm-2.52.1.tar.xz"
     SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 )
@@ -35,4 +35,4 @@ vcpkg_fixup_pkgconfig()
 
 # Handle copyright and readme
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)
diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL
@@ -1,6 +1,6 @@
 Source: gtkmm
 Version: 3.22.2
-Port-Version: 4
+Port-Version: 5
 Homepage: https://www.gtkmm.org/
 Description: gtkmm is the official C++ interface for the popular GUI library GTK+.
 Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm

diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake
@@ -5,7 +5,7 @@ endif()
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz"
     FILENAME "gtkmm-3.22.2.tar.xz"
     SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2
 )

diff --git a/ports/leaf/CONTROL b/ports/leaf/CONTROL
@@ -1,3 +1,4 @@
 Source: leaf
-Version: 0.2.2
-Description: Lightweight error augmentation framework 
+Version: removed
+Description: Deprecated boost-leaf port.
+Build-Depends: boost-leaf
diff --git a/ports/leaf/portfile.cmake b/ports/leaf/portfile.cmake
@@ -1,19 +1 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO zajo/leaf
-    REF 0.2.2
-    SHA512 200a78e33fa919fbf996cfa5715f166e194b87776de79dec4c23d7a60b1f1e1c9db699f3d94d17b52c655e802ea63e1e6539538b180ecaafbfcf106b280b5c1f
-    HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/leaf RENAME copyright)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL
@@ -1,4 +1,4 @@
 Source: libsigcpp
 Version: 2.10-3
-Port-Version: 1
+Port-Version: 2
 Description: Typesafe callback framework for C++
diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake
@@ -1,6 +1,6 @@
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
     FILENAME "libsigc++-2.10.0.tar.xz"
     SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
 )

diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL
@@ -1,5 +1,5 @@
 Source: libxmlpp
 Version: 2.40.1
-Port-Version: 7
+Port-Version: 8
 Description: a C++ wrapper for the libxml XML parser library.
 Build-Depends: libxml2, glibmm
diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 set(LIBXMLPP_VERSION 2.40.1)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz"
     FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz"
     SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a
 )

diff --git a/ports/magic-get/CONTROL b/ports/magic-get/CONTROL
@@ -1,4 +1,5 @@
 Source: magic-get
-Version: 2019-09-02-1
+Version: removed
 Homepage: https://github.com/apolukhin/magic_get
-Description: This C++14 library is meant for accessing structure elements by index and providing other std::tuple like methods for user defined types without any macro or boilerplate code.
+Description: Deprecated boost-pfr port.
+Build-Depends: boost-pfr
diff --git a/ports/magic-get/portfile.cmake b/ports/magic-get/portfile.cmake
@@ -1,19 +1 @@
-vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO apolukhin/magic_get
-	REF abb467c0e22a83bf75a46a9e6610370fabfc39af #Branch develop, Commits on Sep 2, 2019
-	SHA512 1feb5d105d13a20aec8ab2c748dbd79ecc5d2267c8c0ee7db93a3d0c6b7186ea0c475fdc14712e78502ea839788f6dfb0b359e3fedbec59d331dafe137326fa4
-	HEAD_REF develop
-)
-
-vcpkg_download_distfile(OCV_DOWNLOAD
-    URLS "https://www.boost.org/LICENSE_1_0.txt"
-    FILENAME "boost_license_1_0.txt"
-    SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
-)
-
-file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-
-# Handle copyright
-# On Homepage README.md, License Distributed under the Boost Software License, Version 1.0. https://www.boost.org/LICENSE_1_0.txt
-file(INSTALL ${OCV_DOWNLOAD} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/pangomm/CONTROL b/ports/pangomm/CONTROL
@@ -1,5 +1,6 @@
 Source: pangomm
-Version: 2.40.1-3
+Version: 2.40.1
+Port-Version: 4
 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm
 Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.
 Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm
diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_fail_port_install(ON_ARCH "arm" "arm64")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz"
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz"
     FILENAME "pangomm-2.40.1.tar.xz"
     SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f
 )

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -58,14 +58,6 @@ caf:x64-uwp=fail
 caffe2:x86-windows=fail
 caffe2:arm64-windows=fail
 cairomm:x64-linux=fail
-# capnproto currently triggers an ICE
-capnproto:x86-windows=fail
-capnproto:x64-windows=fail
-capnproto:x64-windows-static=fail
-# capnproto doesn't support arm, arm64, or UWP
-capnproto:arm64-windows=fail
-capnproto:arm-uwp=fail
-capnproto:x64-uwp=fail
 c-ares:arm-uwp=fail
 c-ares:x64-uwp=fail
 cartographer:x64-osx=fail
@@ -557,7 +549,6 @@ libdshowcapture:arm-uwp=fail
 libdshowcapture:x64-linux=fail
 libdshowcapture:x64-osx=fail
 libdshowcapture:x64-uwp=fail
-libepoxy:arm64-windows=fail
 libepoxy:arm-uwp=fail
 libepoxy:x64-uwp=fail
 libepoxy:x64-windows-static=fail
@@ -713,8 +704,6 @@ libressl:x64-uwp            = skip
 libressl:x64-windows        = skip
 libressl:x64-windows-static = skip
 libressl:x86-windows        = skip
-libsamplerate:arm64-windows=fail
-libsamplerate:arm-uwp=fail
 libsamplerate:x64-osx=fail
 libsoundio:arm64-windows=fail
 libsoundio:arm-uwp=fail
@@ -964,7 +953,6 @@ nana:x64-uwp=fail
 nanodbc:arm-uwp=fail
 nanodbc:x64-uwp=fail
 nanodbc:x64-linux=skip
-nanogui:arm64-windows=fail
 nanorange:arm64-windows=fail
 nanorange:arm-uwp=fail
 nanorange:x64-linux=fail