Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[font-chef] Update to 1.1.0 #21398

Merged
merged 6 commits into from
Nov 15, 2021
Merged

[font-chef] Update to 1.1.0 #21398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fbb716
Update font-chef to 1.1.0
chausner Nov 13, 2021
2f518a2
Update CI baseline
chausner Nov 13, 2021
300ba45
Fix build on 64 bit platforms
chausner Nov 13, 2021
452008c
Update git-tree hash
chausner Nov 13, 2021
78cdbd2
Add comment
chausner Nov 13, 2021
9c0be07
Update git-tree hash
chausner Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/font-chef/disable-warnings-as-errors.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/font-chef/CMakeLists.txt b/src/font-chef/CMakeLists.txt
--- a/src/font-chef/CMakeLists.txt
+++ b/src/font-chef/CMakeLists.txt
@@ -68,7 +68,7 @@ target_include_directories(font-chef++ INTERFACE
if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
target_compile_options(font-chef PRIVATE
$<$<OR:$<C_COMPILER_ID:Clang>,$<C_COMPILER_ID:GNU>>:-Wall -Wextra -pedantic -fvisibility=hidden -Werror>
- $<$<C_COMPILER_ID:MSVC>:/W3 /WX /wd4820 /wd4668 /wd4204>
+ $<$<C_COMPILER_ID:MSVC>:/W3 /wd4820 /wd4668 /wd4204>
)
endif()

17 changes: 9 additions & 8 deletions ports/font-chef/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mobius3/font-chef
REF v1.0.1
SHA512 0d73d095a2f6346cde5fc58a07be7cbe2c180ab5c83a4af21f765a6be1e9dcc5a403fa1d4c64f71dad5609eb72c8b05df8606b4035fceadca74fe6a87bb8efef
REF v1.1.0
SHA512 3df1e31e4405bcbb05ffed8fe618eb953498389adef3d83d337ac570644008bee031e08cd64382443ad123c4abf7e0acca5e3e16288caf6225672d6796a9494f
HEAD_REF master
PATCHES
disable-warnings-as-errors.patch # to workaround https://github.com/mobius3/font-chef/issues/3
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${PORT}")
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
15 changes: 12 additions & 3 deletions ports/font-chef/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"name": "font-chef",
"version-string": "1.0.1",
"port-version": 1,
"version": "1.1.0",
"description": "A font cooking library",
"homepage": "https://github.com/mobius3/font-chef"
"homepage": "https://github.com/mobius3/font-chef",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2213,8 +2213,8 @@
"port-version": 3
},
"font-chef": {
"baseline": "1.0.1",
"port-version": 1
"baseline": "1.1.0",
"port-version": 0
},
"fontconfig": {
"baseline": "2.13.94",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/font-chef.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "38744fa5fa1e86217669332c7860e193550b1a81",
"version": "1.1.0",
"port-version": 0
},
{
"git-tree": "907533e8f03e495fcddd47a6c0cd59cc73dfcc0b",
"version-string": "1.0.1",
Expand Down