aboutsummaryrefslogtreecommitdiff
path: root/ports/graphite2
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-09-19 08:17:21 +0800
committerGitHub <noreply@github.com>2020-09-18 17:17:21 -0700
commit13590753fec479c5b0a3d48dd553dde8d49615fc (patch)
treefad155e091ef56d6f91fda2b212ecfc5c0b53b5d /ports/graphite2
parent35d7e4f0b30800691c59b25c5ea95e4d64e0623f (diff)
downloadvcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.tar.gz
vcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.zip
[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)
* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision * Fix license path for fastrtps and remove bin with static build for kd-soap
Diffstat (limited to 'ports/graphite2')
-rw-r--r--ports/graphite2/CONTROL2
-rw-r--r--ports/graphite2/disable-tests.patch15
-rw-r--r--ports/graphite2/portfile.cmake11
3 files changed, 14 insertions, 14 deletions
diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL
index 38bc0e4a4..0c4899fc9 100644
--- a/ports/graphite2/CONTROL
+++ b/ports/graphite2/CONTROL
@@ -1,5 +1,5 @@
Source: graphite2
-Version: 1.3.13
+Version: 1.3.14
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.
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch
index 67a0d90e7..d1c1fd971 100644
--- a/ports/graphite2/disable-tests.patch
+++ b/ports/graphite2/disable-tests.patch
@@ -20,26 +20,29 @@ index 496712d..3df05c7 100644
set(version 3.0.1)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 389cf5a..94b7f99 100644
+index b6ac26b..851a97f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -127,7 +127,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -127,9 +127,9 @@ 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 ()
+- endif ()
++ endif()
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-@@ -141,7 +141,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- LINKER_LANGUAGE C)
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
+@@ -144,7 +144,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ endif()
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 ()
++ 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 110363571..44fe08ba6 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -1,11 +1,8 @@
-
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO silnrsi/graphite
- REF b45f9b271214b95f3b42e5c9863eae4b0bfb7fd7
- SHA512 5bd1052c1e21ab523ce17804b7123858d17ca9893cbd972f0af58119c5419d771df13d374569a14dd82605536674d9b1a4787300eac4bd89a177a40df5a05282
+ REF 92f59dcc52f73ce747f1cdc831579ed2546884aa # 1.3.14
+ SHA512 011855576124b2f9ae9d7d3a0dfc5489794cf82b81bebc02c11c9cca350feb9fbb411844558811dff1ebbacac58a24a7cf56a374fc2c27e97a5fb4795a01486e
HEAD_REF master
PATCHES disable-tests.patch
)
@@ -24,5 +21,5 @@ vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2 RENAME copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)