3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[graphite2] Update to 1.3.12. Fixes #4091.

Browse Source
This commit is contained in:
Robert Schumacher 2018-08-21 17:17:49 -07:00
parent bb1cc71095
commit 9a35830ff3
5 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/graphite2/CONTROL
View File

@ -1,4 +1,4 @@
Source: graphite2
Version: 1.3.10
Version: 1.3.12
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.

19
ports/graphite2/disable-tests-docs.patch
View File

@ -1,19 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3466c5f..6d5c6bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,13 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR
message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")
add_subdirectory(src)
+if(NOT DISABLE_TESTS)
add_subdirectory(tests)
+endif()
+if(NOT DISABLE_DOCS)
add_subdirectory(doc)
-if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+endif()
+if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE) AND NOT DISABLE_TESTS)
add_subdirectory(gr2fonttest)
endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))

18
ports/graphite2/disable-tests.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4c648e..db90735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,11 +80,13 @@ if (BUILD_SHARED_LIBS)
endif (BUILD_SHARED_LIBS)
add_subdirectory(src)
+if(NOT DISABLE_TESTS)
add_subdirectory(tests)
add_subdirectory(doc)
if (NOT GRAPHITE2_NFILEFACE)
add_subdirectory(gr2fonttest)
endif (NOT GRAPHITE2_NFILEFACE)
+endif()
set(version 3.0.1)
set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

21
ports/graphite2/fix-static-build.patch
View File

@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3466c5f..d88b3bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,11 +63,11 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR
message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")
add_subdirectory(src)
-add_subdirectory(tests)
-add_subdirectory(doc)
-if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
- add_subdirectory(gr2fonttest)
-endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+# add_subdirectory(tests)
+# add_subdirectory(doc)
+# if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+# add_subdirectory(gr2fonttest)
+# endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
set(version 3.0.1)
set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

11
ports/graphite2/portfile.cmake
View File

@ -4,14 +4,10 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO silnrsi/graphite
REF 99658129785a218556929db0595a002a668b40b0
SHA512 50cf6f727a2ea13ccbf55b4dad282358c40973aa0a0d97db6d721208b70fe848791aab183062c7bed8ce5b0dc3fecd6b604f6defdd5ae89b46ce267069ee0ed1
REF 1.3.12
SHA512 d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-tests-docs.patch"
PATCHES disable-tests.patch
)
vcpkg_configure_cmake(
@ -19,7 +15,6 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DDISABLE_TESTS=ON
-DDISABLE_DOCS=ON
)
vcpkg_install_cmake()