Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[libxfont] Update to 2.0.9 (#53748)

This commit is contained in:
SunBlack 2026-09-04 08:31:25 +02:00 committed by GitHub
parent e1825542de
commit 04a9d8e521
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ports/libxfont/build.patch
View File

@ -1,9 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
index 5af2e237a..e75fd1755 100644
--- a/Makefile.am
index 07a0e25..6327418 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,14 +159,14 @@ endif
EXTRA_DIST = src/builtins/buildfont README.md
@@ -154,17 +154,17 @@ libXfont2_la_SOURCES += \
src/fc/fstrans.c
endif
-EXTRA_DIST = src/builtins/buildfont README.md
+# EXTRA_DIST = src/builtins/buildfont README.md
# Test utilities
-EXTRA_DIST += test/utils/README
@ -20,11 +24,28 @@ index 5af2e237a..e75fd1755 100644
+# lsfontdir_SOURCES = test/utils/lsfontdir.c $(TEST_UTIL_SRCS)
+# lsfontdir_LDADD = libXfont2.la $(LTLIBOBJS)
# Security regression tests
TESTS =
@@ -248,11 +248,11 @@ clean-local:
-rmdir $(TEST_FONT_DIRS) test/data 2>/dev/null || true
endif HAVE_PYTHON
-EXTRA_DIST += test/gen_evil_pcf_repad.py \
- test/gen_evil_pcf_props.py \
- test/gen_evil_pcf_bitmapscale.py \
- test/gen_evil_pcf_encoding.py \
- test/gen_evil_pcf_norepad.py
+# EXTRA_DIST += test/gen_evil_pcf_repad.py \
+# test/gen_evil_pcf_props.py \
+# test/gen_evil_pcf_bitmapscale.py \
+# test/gen_evil_pcf_encoding.py \
+# test/gen_evil_pcf_norepad.py
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index 06e49f5f0..6b68dfcb8 100644
--- a/include/X11/fonts/fontmisc.h
index 06e49f5..6b68dfc 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -34,7 +34,9 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xfuncs.h>

104
ports/libxfont/portfile.cmake
View File

@ -1,52 +1,52 @@
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)
return()
endif()
vcpkg_download_distfile(
LIBXFONT2_ARCHIVE
URLS "https://www.x.org/archive/individual/lib/libXfont2-${VERSION}.tar.xz"
FILENAME "libXfont2-${VERSION}.tar.xz"
SHA512 f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${LIBXFONT2_ARCHIVE}"
PATCHES
build.patch
build2.patch
configure.patch
)
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
if(VCPKG_TARGET_IS_WINDOWS)
string(APPEND VCPKG_CXX_FLAGS " /D_WILLWINSOCK_") # /showIncludes are not passed on so I cannot figure out which header is responsible for this
string(APPEND VCPKG_C_FLAGS " /D_WILLWINSOCK_")
endif()
vcpkg_make_configure(
SOURCE_PATH "${SOURCE_PATH}"
AUTORECONF
OPTIONS
--with-bzip2=yes
)
vcpkg_make_install()
if(VCPKG_TARGET_IS_WINDOWS)
set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xfont2.pc")
file(READ "${_file}" _contents)
string(REPLACE "-lm" "" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
if(NOT VCPKG_BUILD_TYPE)
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc")
file(READ "${_file}" _contents)
string(REPLACE "-lm" "" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
endif()
endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
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)
return()
endif()
vcpkg_download_distfile(
LIBXFONT2_ARCHIVE
URLS "https://www.x.org/archive/individual/lib/libXfont2-${VERSION}.tar.xz"
FILENAME "libXfont2-${VERSION}.tar.xz"
SHA512 ccd6d6abf6aa814a940d137813dba638f8259c3672abf00808d82df033c1026ae29d40c9068da4f112637338ad0d0fc15818a4afa9369a626c8f17e466b4fa72
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${LIBXFONT2_ARCHIVE}"
PATCHES
build.patch
build2.patch
configure.patch
)
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
if(VCPKG_TARGET_IS_WINDOWS)
string(APPEND VCPKG_CXX_FLAGS " /D_WILLWINSOCK_") # /showIncludes are not passed on so I cannot figure out which header is responsible for this
string(APPEND VCPKG_C_FLAGS " /D_WILLWINSOCK_")
endif()
vcpkg_make_configure(
SOURCE_PATH "${SOURCE_PATH}"
AUTORECONF
OPTIONS
--with-bzip2=yes
)
vcpkg_make_install()
if(VCPKG_TARGET_IS_WINDOWS)
set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xfont2.pc")
file(READ "${_file}" _contents)
string(REPLACE "-lm" "" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
if(NOT VCPKG_BUILD_TYPE)
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc")
file(READ "${_file}" _contents)
string(REPLACE "-lm" "" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
endif()
endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

2
ports/libxfont/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "libxfont",
"version": "2.0.7",
"version": "2.0.9",
"description": "X font handling library for server & utilities",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont",
"license": null,

2
versions/baseline.json
View File

@ -6037,7 +6037,7 @@
"port-version": 1
},
"libxfont": {
"baseline": "2.0.7",
"baseline": "2.0.9",
"port-version": 0
},
"libxft": {

5
versions/l-/libxfont.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "457777af5915a46370e64db7513dfc539f0e1a8a",
"version": "2.0.9",
"port-version": 0
},
{
"git-tree": "1f2ba49916df62b4408426e3bd2846549bb8083f",
"version": "2.0.7",