Merge branch 'master' into vcpkg_nuget

3 files changed, 42 insertions, 16 deletions

diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL
index e8af4d4a1..38bc0e4a4 100644
--- a/ports/graphite2/CONTROL
+++ b/ports/graphite2/CONTROL
@@ -1,5 +1,5 @@
 Source: graphite2
-Version: 1.3.12
+Version: 1.3.13
 Homepage: https://github.com/silnrsi/graphite
 Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
-  Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
\ No newline at end of file
+  Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch
index d88c1cee5..67a0d90e7 100644
--- a/ports/graphite2/disable-tests.patch
+++ b/ports/graphite2/disable-tests.patch
@@ -1,18 +1,45 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index a4c648e..db90735 100644

+index 496712d..3df05c7 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -80,11 +80,13 @@ if (BUILD_SHARED_LIBS)

- endif (BUILD_SHARED_LIBS)

+@@ -82,10 +82,12 @@ if (BUILD_SHARED_LIBS)

+ endif()

  

  add_subdirectory(src)

+-add_subdirectory(tests)

+-add_subdirectory(doc)

+-if (NOT GRAPHITE2_NFILEFACE)

+-    add_subdirectory(gr2fonttest)

 +if(NOT DISABLE_TESTS)

- add_subdirectory(tests)

- add_subdirectory(doc)

- if (NOT GRAPHITE2_NFILEFACE)

-     add_subdirectory(gr2fonttest)

- endif (NOT GRAPHITE2_NFILEFACE)

-+endif()

++    add_subdirectory(tests)

++    add_subdirectory(doc)

++    if (NOT GRAPHITE2_NFILEFACE)

++        add_subdirectory(gr2fonttest)

++    endif()

+ endif()

  

  set(version 3.0.1)

- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

+index 389cf5a..94b7f99 100644

+--- a/src/CMakeLists.txt

++++ b/src/CMakeLists.txt

+@@ -127,7 +127,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

+         endif ()

+     endif()

+     include(Graphite)

+-    if (BUILD_SHARED_LIBS)

++    if (NOT DISABLE_TESTS)

+         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

+     endif ()

+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")

+@@ -141,7 +141,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")

+         LINKER_LANGUAGE C)

+     target_link_libraries(graphite2 c)

+     include(Graphite)

+-    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

++    if (NOT DISABLE_TESTS)

++        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

++    endif ()

+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")

+     CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")

+ endif()

diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake
index f5292ba83..110363571 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO silnrsi/graphite
-    REF 1.3.12
-    SHA512 d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643
+    REF b45f9b271214b95f3b42e5c9863eae4b0bfb7fd7
+    SHA512 5bd1052c1e21ab523ce17804b7123858d17ca9893cbd972f0af58119c5419d771df13d374569a14dd82605536674d9b1a4787300eac4bd89a177a40df5a05282
     HEAD_REF master
     PATCHES disable-tests.patch
 )
@@ -19,8 +19,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/graphite2)
+vcpkg_fixup_cmake_targets()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)