mirror of https://github.com/microsoft/vcpkg.git
[font-util] Update to 1.4.2 (#51420)
This commit is contained in:
parent
031f4afe03
commit
fddb61bab0
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/bdftruncate.c b/bdftruncate.c
|
||||
index 2b317c0b0..3ab84978f 100644
|
||||
--- a/bdftruncate.c
|
||||
index 815d2ef..d344ef2 100644
|
||||
--- a/bdftruncate.c
|
||||
+++ b/bdftruncate.c
|
||||
@@ -40,7 +40,13 @@
|
||||
@@ -42,7 +42,13 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
@ -14,14 +14,14 @@ index 2b317c0b0..3ab84978f 100644
|
|||
+# define SSIZE_MAX LONG_MAX
|
||||
+# endif
|
||||
+#endif
|
||||
#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define ATTR_NORETURN __attribute((noreturn))
|
||||
#ifndef __has_attribute
|
||||
# define __has_attribute(x) 0 /* Compatibility with older compilers. */
|
||||
#endif
|
||||
diff --git a/ucs2any.c b/ucs2any.c
|
||||
index 1f575d14f..75b662b3d 100644
|
||||
--- a/ucs2any.c
|
||||
index 33c018d..c673197 100644
|
||||
--- a/ucs2any.c
|
||||
+++ b/ucs2any.c
|
||||
@@ -49,7 +49,9 @@
|
||||
@@ -51,7 +51,9 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -3,17 +3,22 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
|||
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
else()
|
||||
return()
|
||||
endif()
|
||||
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL https://gitlab.freedesktop.org/xorg
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO font/util
|
||||
REF "font-util-${VERSION}"
|
||||
SHA512 93285c2e8c5c01f069a7621dba0bbb1175c0ebbea27d521395b40f036443c162fc1948c4d3cb34fe6c509d1818d95ed7e6d38919e3f7857dfa53e388aadb9128
|
||||
HEAD_REF master
|
||||
PATCHES build.patch
|
||||
)
|
||||
vcpkg_download_distfile(
|
||||
FONTUTIL_ARCHIVE
|
||||
URLS "https://www.x.org/archive//individual/font/font-util-${VERSION}.tar.xz"
|
||||
FILENAME "font-util-${VERSION}.tar.xz"
|
||||
SHA512 3def5f08bcb30ec3e0008f648478ebe1f65127d03e821613de550e95247812751b4ff31383739ad120123b2f69c87d819c18d44d1edee2ca51075a3c031e3a6f
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
SOURCE_PATH
|
||||
ARCHIVE "${FONTUTIL_ARCHIVE}"
|
||||
PATCHES
|
||||
build.patch
|
||||
)
|
||||
|
||||
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
|
||||
|
||||
|
|
@ -52,6 +57,5 @@ if(NOT VCPKG_BUILD_TYPE)
|
|||
string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}")
|
||||
file(WRITE "${_file}" "${_contents}")
|
||||
endif()
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
|
||||
endif()
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "font-util",
|
||||
"version": "1.4.1",
|
||||
"port-version": 1,
|
||||
"version": "1.4.2",
|
||||
"description": "X.Org font package creation/installation utilities",
|
||||
"homepage": "https://gitlab.freedesktop.org/xorg/font/util",
|
||||
"license": null,
|
||||
|
|
|
|||
|
|
@ -3141,8 +3141,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"font-util": {
|
||||
"baseline": "1.4.1",
|
||||
"port-version": 1
|
||||
"baseline": "1.4.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"fontconfig": {
|
||||
"baseline": "2.17.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "5949f12d652d6f907d7663c4c89102634565e6be",
|
||||
"version": "1.4.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "81aa656857c5372d36a97c7dcc0c2b276c56c9ac",
|
||||
"version": "1.4.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue