[libfontenc] Update to 1.1.9 (#51238)

This commit is contained in:
Kai Pastor 2026-04-21 00:55:42 +02:00 committed by GitHub
parent a39810a0ed
commit efb05273bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 29 additions and 44 deletions

View File

@ -1,9 +1,9 @@
diff --git a/src/encparse.c b/src/encparse.c
index 548110ede..61952b9ce 100644
--- a/src/encparse.c
index bf9ea23..395dd16 100644
--- a/src/encparse.c
+++ b/src/encparse.c
@@ -28,12 +28,16 @@ THE SOFTWARE.
to be pure ASCII. Bloody ``Code Set Independence''. */
@@ -32,7 +32,11 @@ THE SOFTWARE.
#endif
#include <string.h>
+#ifndef _MSC_VER
@ -14,18 +14,12 @@ index 548110ede..61952b9ce 100644
#include <stdio.h>
#include <stdlib.h>
-#include "zlib.h"
+#include <zlib.h>
typedef gzFile FontFilePtr;
#define FontFileGetc(f) gzgetc(f)
diff --git a/src/fontenc.c b/src/fontenc.c
index c4ccd5eb0..e87d1089d 100644
--- a/src/fontenc.c
index d0a43e8..b7df75e 100644
--- a/src/fontenc.c
+++ b/src/fontenc.c
@@ -23,7 +23,11 @@ THE SOFTWARE.
/* Backend-independent encoding code */
@@ -27,7 +27,11 @@ THE SOFTWARE.
#endif
#include <string.h>
+#ifndef _MSC_VER

View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index cadc653a0..aa645af81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
# zlib
AC_CHECK_HEADER([zlib.h], [],
AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))
-AC_CHECK_LIB(z, gzclose, [],
+AC_SEARCH_LIBS(gzclose, [z zlib zlibd], [],
AC_MSG_FAILURE([zlib is required to compile libfontenc]))
# Obtain compiler/linker options for depedencies

View File

@ -1,18 +1,21 @@
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 lib/libfontenc
REF 2baea13978759d1a011fc6d739465893b554d30a #1.1.4
SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e
REF libfontenc-${VERSION}
SHA512 bbce25c1b0f1110cd6e954c833b8a5fda148e018292ed37bfcea84af63fe2b36f8471d5129771825948d2cea75d813e4cae82e44d8e2ab01cb578773105a0c45
HEAD_REF master
PATCHES configure.ac.patch
build.patch
PATCHES
build.patch
)
file(MAKE_DIRECTORY "${SOURCE_PATH}/m4")
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
vcpkg_make_configure(
@ -26,7 +29,4 @@ vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# # Handle copyright
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright)
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

View File

@ -1,7 +1,6 @@
{
"name": "libfontenc",
"version": "1.1.4",
"port-version": 1,
"version": "1.1.9",
"description": "X font encoding library",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
"license": null,

View File

@ -3796,10 +3796,10 @@
"baseline": "2.11.1",
"port-version": 0
},
"hical61-hical": {
"baseline": "1.0.1",
"port-version": 0
},
"hical61-hical": {
"baseline": "1.0.1",
"port-version": 0
},
"hidapi": {
"baseline": "0.15.0",
"port-version": 1
@ -4961,8 +4961,8 @@
"port-version": 0
},
"libfontenc": {
"baseline": "1.1.4",
"port-version": 1
"baseline": "1.1.9",
"port-version": 0
},
"libfork": {
"baseline": "3.8.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c703e01bed7c13658714bed8fa91bc8a1371a4e4",
"version": "1.1.9",
"port-version": 0
},
{
"git-tree": "4df89b668447dcaae8f2672cc798f61b935b317f",
"version": "1.1.4",