Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5651

9 files changed, 40 insertions, 104 deletions

diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index b4ea1f213..19be22b19 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,3 +1,6 @@
 Source: apr
-Version: 1.6.5
+Version: 1.6.5-1
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
+
+Feature: private-headers
+Description: Install non-standard files required for building Apache httpd
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 40ced3049..1e9de7ffb 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -14,9 +14,19 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
+if("private-headers" IN_LIST FEATURES)
+    set(INSTALL_PRIVATE_H ON)
+else()
+    set(INSTALL_PRIVATE_H OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON
+    OPTIONS
+        -DINSTALL_PDB=OFF
+        -DMIN_WINDOWS_VER=Windows7
+        -DAPR_HAVE_IPV6=ON
+        -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H}
     # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
     # OPTIONS_RELEASE -DOPTIMIZE=1
     # OPTIONS_DEBUG -DDEBUGGABLE=1
diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch
index a5abffa41..0ba0245d0 100644
--- a/ports/harfbuzz/0001-fix-cmake-export.patch
+++ b/ports/harfbuzz/0001-fix-cmake-export.patch
@@ -1,22 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e881dbd1..69496561 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -761,11 +761,17 @@ endif ()
- 
- if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-   install(TARGETS harfbuzz
-+    EXPORT harfbuzzConfig
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     FRAMEWORK DESTINATION Library/Frameworks
-   )
-+  install(EXPORT harfbuzzConfig
-+      NAMESPACE harfbuzz::
-+      FILE harfbuzz-config.cmake
-+      DESTINATION share/harfbuzz
-+  )
-   if (HB_BUILD_UTILS)
-     install(TARGETS hb-view
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 019e205..8a464a5 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -795,7 +795,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)

+   )

+   install(EXPORT harfbuzzConfig

+       NAMESPACE harfbuzz::

+-      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz

++      DESTINATION share/harfbuzz

+   )

+   if (HB_BUILD_UTILS)

+     if (WIN32 AND BUILD_SHARED_LIBS)

diff --git a/ports/harfbuzz/0002-fix-macos-build.patch b/ports/harfbuzz/0002-fix-macos-build.patch
deleted file mode 100644
index 3b32092c1..000000000
--- a/ports/harfbuzz/0002-fix-macos-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 5c613e0..32d3a29 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -1,4 +1,4 @@

--cmake_minimum_required(VERSION 2.8.0)

-+cmake_minimum_required(VERSION 3.5.0)

- project(harfbuzz)

- 

- enable_testing()

-@@ -316,6 +316,10 @@ if (HB_HAVE_GLIB)

- 

-   find_package(Threads REQUIRED)

-   find_package(unofficial-iconv REQUIRED)

-+  if(APPLE)

-+    find_package(unofficial-gettext CONFIG REQUIRED)

-+    list(APPEND THIRD_PARTY_LIBS unofficial::gettext::libintl)

-+  endif()

-   find_package(unofficial-glib CONFIG REQUIRED)

- 

-   list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc)

diff --git a/ports/harfbuzz/0001-fix-uwp-build.patch b/ports/harfbuzz/0002-fix-uwp-build.patch
index 24b5bf894..beb5ce750 100644
--- a/ports/harfbuzz/0001-fix-uwp-build.patch
+++ b/ports/harfbuzz/0002-fix-uwp-build.patch
@@ -1,15 +1,15 @@
 diff --git a/src/hb-ft.cc b/src/hb-ft.cc
-index f578e9d..f224c07 100644
+index 1900f30..add9917 100644
 --- a/src/hb-ft.cc
 +++ b/src/hb-ft.cc
 @@ -31,6 +31,10 @@
- 
+
  #include "hb-ft.h"
- 
+
 +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
 +#define generic GenericFromFreeTypeLibrary
 +#endif
 +
- #include "hb-font-private.hh"
- 
- #include FT_ADVANCES_H
+ #include "hb-font.hh"
+ #include "hb-machinery.hh"
+ #include "hb-cache.hh"
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index fccb549ff..010118683 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 1.8.4-4
+Version: 2.3.1
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch
deleted file mode 100644
index 85dbbdeec..000000000
--- a/ports/harfbuzz/find-package-freetype-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index defd5d6..03f9d4e 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -267,7 +267,7 @@ set (subset_project_headers

- 

- ## Find and include needed header folders and libraries

- if (HB_HAVE_FREETYPE)

--  include (FindFreetype)

-+  find_package(Freetype REQUIRED)

-   if (NOT FREETYPE_FOUND)

-     message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")

-   endif ()

diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch
deleted file mode 100644
index ddbc96712..000000000
--- a/ports/harfbuzz/glib-cmake.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d6e77e8..36e4b4e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -306,22 +306,14 @@ endif ()
- if (HB_HAVE_GLIB)
-   add_definitions(-DHAVE_GLIB)
- 
--  # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake
--  find_package(PkgConfig)
--  pkg_check_modules(PC_GLIB QUIET glib-2.0)
--
--  find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS})
--  find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include)
--  find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0)
--
--  include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR})
-+  find_package(Threads REQUIRED)
-+  find_package(unofficial-iconv REQUIRED)
-+  find_package(unofficial-glib CONFIG REQUIRED)
- 
-   list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc)
-   list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h)
- 
--  list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES})
--
--  mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR)
-+  list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib)
- endif ()
- 
- if (HB_HAVE_ICU)
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index d1455e5dc..40729c8f7 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -3,15 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 1.8.4
-    SHA512 92742b754713d1df8975d4d8467de04765784d7fd566b7e07e7e7a261b0338e997a5fc11fa4fe282d6d5540d242db40c993812fbc4a881becd95fd3aae598c80
+    REF 2.3.1
+    SHA512 c90f8a530bf49e91f5297f6a3c2f4be65f8907e3b41892cd5fbc1353ce7036aae7e182bfd0ea8cb32b0310cbe7284a3de8b6622e08db9736c3f0bba6cb1f9f01
     HEAD_REF master
     PATCHES
-        0001-fix-uwp-build.patch
-        find-package-freetype-2.patch
-        glib-cmake.patch
         0001-fix-cmake-export.patch
-        0002-fix-macos-build.patch
+        0002-fix-uwp-build.patch
 )
 
 SET(HB_HAVE_ICU "OFF")
@@ -52,6 +49,7 @@ vcpkg_configure_cmake(
         -DHB_HAVE_ICU=${HB_HAVE_ICU}
         -DHB_HAVE_GLIB=${HAVE_GLIB}
         -DHB_HAVE_GRAPHITE2=${HB_HAVE_GRAPHITE2}
+        -DHB_BUILD_TESTS=OFF
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
@@ -61,7 +59,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz)
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/harfbuzz/COPYING ${CURRENT_PACKAGES_DIR}/share/harfbuzz/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright)
 
 vcpkg_test_cmake(PACKAGE_NAME harfbuzz)