From 1a1285c56ec42096eb5cbdc7cd9066f16c495956 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Apr 2026 09:37:46 +0200 Subject: [PATCH 1/3] [libfontenc] Update to 1.1.9 --- ports/libfontenc/build.patch | 22 ++++++++-------------- ports/libfontenc/configure.ac.patch | 13 ------------- ports/libfontenc/portfile.cmake | 16 +++++++--------- ports/libfontenc/vcpkg.json | 3 +-- versions/baseline.json | 12 ++++++------ versions/l-/libfontenc.json | 5 +++++ 6 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 ports/libfontenc/configure.ac.patch diff --git a/ports/libfontenc/build.patch b/ports/libfontenc/build.patch index c5e1b75011f396..7d971c9bcef8b5 100644 --- a/ports/libfontenc/build.patch +++ b/ports/libfontenc/build.patch @@ -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 +#ifndef _MSC_VER @@ -14,18 +14,12 @@ index 548110ede..61952b9ce 100644 #include #include - --#include "zlib.h" -+#include - 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 +#ifndef _MSC_VER diff --git a/ports/libfontenc/configure.ac.patch b/ports/libfontenc/configure.ac.patch deleted file mode 100644 index 2a9fa85a86eb52..00000000000000 --- a/ports/libfontenc/configure.ac.patch +++ /dev/null @@ -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 diff --git a/ports/libfontenc/portfile.cmake b/ports/libfontenc/portfile.cmake index 26672296225169..8be6262b3a84ef 100644 --- a/ports/libfontenc/portfile.cmake +++ b/ports/libfontenc/portfile.cmake @@ -1,17 +1,18 @@ 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 ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") @@ -26,7 +27,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") diff --git a/ports/libfontenc/vcpkg.json b/ports/libfontenc/vcpkg.json index 2a3b3fc285c129..836aeb2af26eb6 100644 --- a/ports/libfontenc/vcpkg.json +++ b/ports/libfontenc/vcpkg.json @@ -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, diff --git a/versions/baseline.json b/versions/baseline.json index 4982e46c08a377..26e3ae20ceaf94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/l-/libfontenc.json b/versions/l-/libfontenc.json index 74df6669b7d115..c35b7bea57b792 100644 --- a/versions/l-/libfontenc.json +++ b/versions/l-/libfontenc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2817cf9a0034173172296d5adbb17feeacee39e", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "4df89b668447dcaae8f2672cc798f61b935b317f", "version": "1.1.4", From 52bc54a20ed5e69752ac7610f94b884a52919f88 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Apr 2026 11:17:36 +0200 Subject: [PATCH 2/3] [libfontenc] Use meson --- ports/libfontenc/portfile.cmake | 8 +++----- ports/libfontenc/vcpkg.json | 3 +-- versions/l-/libfontenc.json | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ports/libfontenc/portfile.cmake b/ports/libfontenc/portfile.cmake index 8be6262b3a84ef..0e826a35a91dfc 100644 --- a/ports/libfontenc/portfile.cmake +++ b/ports/libfontenc/portfile.cmake @@ -14,14 +14,12 @@ vcpkg_from_gitlab( PATCHES build.patch ) -set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") -vcpkg_make_configure( +vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" - AUTORECONF ) - -vcpkg_make_install() +vcpkg_install_meson() +vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libfontenc/vcpkg.json b/ports/libfontenc/vcpkg.json index 836aeb2af26eb6..7e8900999a87c5 100644 --- a/ports/libfontenc/vcpkg.json +++ b/ports/libfontenc/vcpkg.json @@ -7,10 +7,9 @@ "dependencies": [ "font-util", { - "name": "vcpkg-make", + "name": "vcpkg-tool-meson", "host": true }, - "xorg-macros", "xproto", "zlib" ] diff --git a/versions/l-/libfontenc.json b/versions/l-/libfontenc.json index c35b7bea57b792..e9b1e0c721a553 100644 --- a/versions/l-/libfontenc.json +++ b/versions/l-/libfontenc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f2817cf9a0034173172296d5adbb17feeacee39e", + "git-tree": "6352e1131d2d77351444f1706d29b394cdf3584f", "version": "1.1.9", "port-version": 0 }, From 1d0b893c8c563610a72a90b0c01afe86ff273cde Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Apr 2026 13:23:46 +0200 Subject: [PATCH 3/3] Revert "[libfontenc] Use meson" This reverts commit 52bc54a20ed5e69752ac7610f94b884a52919f88. --- ports/libfontenc/portfile.cmake | 10 +++++++--- ports/libfontenc/vcpkg.json | 3 ++- versions/l-/libfontenc.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libfontenc/portfile.cmake b/ports/libfontenc/portfile.cmake index 0e826a35a91dfc..9c3cd745787073 100644 --- a/ports/libfontenc/portfile.cmake +++ b/ports/libfontenc/portfile.cmake @@ -14,12 +14,16 @@ vcpkg_from_gitlab( PATCHES build.patch ) +file(MAKE_DIRECTORY "${SOURCE_PATH}/m4") -vcpkg_configure_meson( +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" + AUTORECONF ) -vcpkg_install_meson() -vcpkg_copy_pdbs() + +vcpkg_make_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libfontenc/vcpkg.json b/ports/libfontenc/vcpkg.json index 7e8900999a87c5..836aeb2af26eb6 100644 --- a/ports/libfontenc/vcpkg.json +++ b/ports/libfontenc/vcpkg.json @@ -7,9 +7,10 @@ "dependencies": [ "font-util", { - "name": "vcpkg-tool-meson", + "name": "vcpkg-make", "host": true }, + "xorg-macros", "xproto", "zlib" ] diff --git a/versions/l-/libfontenc.json b/versions/l-/libfontenc.json index e9b1e0c721a553..ef427e930ce307 100644 --- a/versions/l-/libfontenc.json +++ b/versions/l-/libfontenc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6352e1131d2d77351444f1706d29b394cdf3584f", + "git-tree": "c703e01bed7c13658714bed8fa91bc8a1371a4e4", "version": "1.1.9", "port-version": 0 },