microsoft · strega-nil · Nov 17, 2020 · Aug 13, 2020 · Aug 14, 2020 · Aug 14, 2020
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
@@ -182,7 +182,7 @@ find_package(Threads REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 find_package(Freetype REQUIRED)
-find_package(unofficial-fontconfig CONFIG REQUIRED)
+find_package(Fontconfig REQUIRED)
 find_package(unofficial-pixman CONFIG REQUIRED)
 
 # Cairo needs to be told which features of FreeType are availible
@@ -211,7 +211,7 @@ if (WITH_X11)
     target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1)
 endif()
 target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS})
-target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig)
+target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 Fontconfig::Fontconfig)
 
 if(WIN32)
     target_link_libraries(cairo PRIVATE gdi32 msimg32 user32)
@@ -297,7 +297,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(ZLIB)
 find_dependency(PNG)
 find_dependency(Freetype)
-find_dependency(unofficial-fontconfig CONFIG)
+find_dependency(Fontconfig)
 find_dependency(unofficial-pixman CONFIG)
 if(WITH_GOBJECT)
     find_dependency(unofficial-glib CONFIG)

diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
@@ -1,6 +1,6 @@
 Source: cairo
 Version: 1.16.0
-Port-Version: 7
+Port-Version: 8
 Homepage: https://cairographics.org
 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
 Build-Depends: zlib, libpng, pixman, freetype, fontconfig

diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
@@ -1,6 +1,6 @@
 Source: exiv2
 Version: 0.27.3
-Port-Version: 2
+Port-Version: 3
 Build-Depends: zlib, libiconv, gettext
 Description: Image metadata library and tools
 Homepage: https://www.exiv2.org

diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake
@@ -1,11 +1,12 @@
 _find_package(${ARGS})
 
 if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
-    find_package(unofficial-iconv CONFIG REQUIRED)
-    find_package(unofficial-gettext CONFIG REQUIRED)
+    find_package(Iconv REQUIRED)
+    find_package(Intl REQUIRED)
     if(TARGET exiv2lib)
         set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
-            unofficial::iconv::libiconv 
-            unofficial::gettext::libintl)
+            Iconv::Iconv 
+            )
+        target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES})
     endif()
 endif()
diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
@@ -1,7 +1,5 @@
 Source: fontconfig
-Version: 2.12.4
-Port-Version: 13
+Version: 2.13.1
 Homepage: https://www.freedesktop.org/software/fontconfig/front.html
 Description: Library for configuring and customizing font access.
-Build-Depends: freetype, expat, libiconv, dirent
-Supports: !uwp
+Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext