Skip to content

Commit 04a9d8e

Browse files
SunBlackSunBlack
authored
[libxfont] Update to 2.0.9 (#53748)
1 parent e182554 commit 04a9d8e

5 files changed

Lines changed: 86 additions & 60 deletions

File tree

‎ports/libxfont/build.patch‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
diff --git a/Makefile.am b/Makefile.am
2-
index 5af2e237a..e75fd1755 100644
3-
--- a/Makefile.am
2+
index 07a0e25..6327418 100644
3+
--- a/Makefile.am
44
+++ b/Makefile.am
5-
@@ -159,14 +159,14 @@ endif
6-
EXTRA_DIST = src/builtins/buildfont README.md
5+
@@ -154,17 +154,17 @@ libXfont2_la_SOURCES += \
6+
src/fc/fstrans.c
7+
endif
8+
9+
-EXTRA_DIST = src/builtins/buildfont README.md
10+
+# EXTRA_DIST = src/builtins/buildfont README.md
711

812
# Test utilities
913
-EXTRA_DIST += test/utils/README
@@ -20,11 +24,28 @@ index 5af2e237a..e75fd1755 100644
2024
+# lsfontdir_SOURCES = test/utils/lsfontdir.c $(TEST_UTIL_SRCS)
2125
+# lsfontdir_LDADD = libXfont2.la $(LTLIBOBJS)
2226

27+
# Security regression tests
28+
TESTS =
29+
@@ -248,11 +248,11 @@ clean-local:
30+
-rmdir $(TEST_FONT_DIRS) test/data 2>/dev/null || true
31+
endif HAVE_PYTHON
32+
33+
-EXTRA_DIST += test/gen_evil_pcf_repad.py \
34+
- test/gen_evil_pcf_props.py \
35+
- test/gen_evil_pcf_bitmapscale.py \
36+
- test/gen_evil_pcf_encoding.py \
37+
- test/gen_evil_pcf_norepad.py
38+
+# EXTRA_DIST += test/gen_evil_pcf_repad.py \
39+
+# test/gen_evil_pcf_props.py \
40+
+# test/gen_evil_pcf_bitmapscale.py \
41+
+# test/gen_evil_pcf_encoding.py \
42+
+# test/gen_evil_pcf_norepad.py
43+
2344

2445
MAINTAINERCLEANFILES = ChangeLog INSTALL
2546
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
26-
index 06e49f5f0..6b68dfcb8 100644
27-
--- a/include/X11/fonts/fontmisc.h
47+
index 06e49f5..6b68dfc 100644
48+
--- a/include/X11/fonts/fontmisc.h
2849
+++ b/include/X11/fonts/fontmisc.h
2950
@@ -34,7 +34,9 @@ in this Software without prior written authorization from The Open Group.
3051
#include <X11/Xfuncs.h>

‎ports/libxfont/portfile.cmake‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
2-
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!")
3-
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
4-
return()
5-
endif()
6-
7-
vcpkg_download_distfile(
8-
LIBXFONT2_ARCHIVE
9-
URLS "https://www.x.org/archive/individual/lib/libXfont2-${VERSION}.tar.xz"
10-
FILENAME "libXfont2-${VERSION}.tar.xz"
11-
SHA512 f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0
12-
)
13-
14-
vcpkg_extract_source_archive(
15-
SOURCE_PATH
16-
ARCHIVE "${LIBXFONT2_ARCHIVE}"
17-
PATCHES
18-
build.patch
19-
build2.patch
20-
configure.patch
21-
)
22-
23-
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
24-
if(VCPKG_TARGET_IS_WINDOWS)
25-
string(APPEND VCPKG_CXX_FLAGS " /D_WILLWINSOCK_") # /showIncludes are not passed on so I cannot figure out which header is responsible for this
26-
string(APPEND VCPKG_C_FLAGS " /D_WILLWINSOCK_")
27-
endif()
28-
vcpkg_make_configure(
29-
SOURCE_PATH "${SOURCE_PATH}"
30-
AUTORECONF
31-
OPTIONS
32-
--with-bzip2=yes
33-
)
34-
35-
vcpkg_make_install()
36-
if(VCPKG_TARGET_IS_WINDOWS)
37-
set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xfont2.pc")
38-
file(READ "${_file}" _contents)
39-
string(REPLACE "-lm" "" _contents "${_contents}")
40-
file(WRITE "${_file}" "${_contents}")
41-
if(NOT VCPKG_BUILD_TYPE)
42-
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc")
43-
file(READ "${_file}" _contents)
44-
string(REPLACE "-lm" "" _contents "${_contents}")
45-
file(WRITE "${_file}" "${_contents}")
46-
endif()
47-
endif()
48-
vcpkg_fixup_pkgconfig()
49-
50-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
51-
52-
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
1+
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
2+
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!")
3+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
4+
return()
5+
endif()
6+
7+
vcpkg_download_distfile(
8+
LIBXFONT2_ARCHIVE
9+
URLS "https://www.x.org/archive/individual/lib/libXfont2-${VERSION}.tar.xz"
10+
FILENAME "libXfont2-${VERSION}.tar.xz"
11+
SHA512 ccd6d6abf6aa814a940d137813dba638f8259c3672abf00808d82df033c1026ae29d40c9068da4f112637338ad0d0fc15818a4afa9369a626c8f17e466b4fa72
12+
)
13+
14+
vcpkg_extract_source_archive(
15+
SOURCE_PATH
16+
ARCHIVE "${LIBXFONT2_ARCHIVE}"
17+
PATCHES
18+
build.patch
19+
build2.patch
20+
configure.patch
21+
)
22+
23+
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
24+
if(VCPKG_TARGET_IS_WINDOWS)
25+
string(APPEND VCPKG_CXX_FLAGS " /D_WILLWINSOCK_") # /showIncludes are not passed on so I cannot figure out which header is responsible for this
26+
string(APPEND VCPKG_C_FLAGS " /D_WILLWINSOCK_")
27+
endif()
28+
vcpkg_make_configure(
29+
SOURCE_PATH "${SOURCE_PATH}"
30+
AUTORECONF
31+
OPTIONS
32+
--with-bzip2=yes
33+
)
34+
35+
vcpkg_make_install()
36+
if(VCPKG_TARGET_IS_WINDOWS)
37+
set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xfont2.pc")
38+
file(READ "${_file}" _contents)
39+
string(REPLACE "-lm" "" _contents "${_contents}")
40+
file(WRITE "${_file}" "${_contents}")
41+
if(NOT VCPKG_BUILD_TYPE)
42+
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc")
43+
file(READ "${_file}" _contents)
44+
string(REPLACE "-lm" "" _contents "${_contents}")
45+
file(WRITE "${_file}" "${_contents}")
46+
endif()
47+
endif()
48+
vcpkg_fixup_pkgconfig()
49+
50+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
51+
52+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

‎ports/libxfont/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "libxfont",
3-
"version": "2.0.7",
3+
"version": "2.0.9",
44
"description": "X font handling library for server & utilities",
55
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont",
66
"license": null,

‎versions/baseline.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6037,7 +6037,7 @@
60376037
"port-version": 1
60386038
},
60396039
"libxfont": {
6040-
"baseline": "2.0.7",
6040+
"baseline": "2.0.9",
60416041
"port-version": 0
60426042
},
60436043
"libxft": {

‎versions/l-/libxfont.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "457777af5915a46370e64db7513dfc539f0e1a8a",
5+
"version": "2.0.9",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "1f2ba49916df62b4408426e3bd2846549bb8083f",
510
"version": "2.0.7",

0 commit comments

Comments
 (0)