Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9f95340
[zlib] Update to v1.3.2.
scschaefer Mar 18, 2026
f1dacbd
Fixed build failures if VCPKG_BUILD_TYPE is defined to only build one…
scschaefer Mar 18, 2026
6ba0b27
Updated versions database.
scschaefer Mar 18, 2026
1f0aee0
Build fixes.
scschaefer Mar 18, 2026
8439bc9
Implemented review suggestions.
scschaefer Mar 19, 2026
456e6fe
Oversight concerning Windows specific linking instructions fixed.
scschaefer Mar 19, 2026
f69a87e
Fixed _ZLIB_supported_components.
scschaefer Mar 20, 2026
f5fdd8f
Merge remote-tracking branch 'origin/master' into zlib
dg0yt Apr 18, 2026
ccdac06
[elfutils] Resolve crc32 symbol clash
dg0yt Apr 18, 2026
0b172df
[apsi] Drop CMAKE_FIND_PACKAGE_PREFER_CONFIG
dg0yt Apr 18, 2026
c939236
[sdl3-image] Disable CMAKE_FIND_PACKAGE_PREFER_CONFIG
dg0yt Apr 18, 2026
c6b6a09
[zlib] Fix and cleanup
dg0yt Apr 18, 2026
05f1cb0
v
dg0yt Apr 18, 2026
57eb357
[crashpad] Update zlib names
dg0yt Apr 18, 2026
1a1285c
[libfontenc] Update to 1.1.9
dg0yt Apr 18, 2026
d88d7cd
[python3] Update zlib names
dg0yt Apr 18, 2026
3469691
[qt5-base] Use zlib.pc
dg0yt Apr 18, 2026
2d3945a
[serf] Revise dependency import
dg0yt Apr 18, 2026
0763950
[shiftmedia-libgnutls] Revise dependencies
dg0yt Apr 18, 2026
52bc54a
[libfontenc] Use meson
dg0yt Apr 18, 2026
1d0b893
Revert "[libfontenc] Use meson"
dg0yt Apr 18, 2026
0bf3fdb
Feature baseline
dg0yt Apr 18, 2026
2e09f4a
Merge branch 'libfontenc' into zlib
dg0yt Apr 18, 2026
ae4b5fb
Fixup
dg0yt Apr 18, 2026
c18d577
Fixup
dg0yt Apr 19, 2026
7071605
baseline libpq workaround
dg0yt Apr 19, 2026
7881834
[python3] Fixup
dg0yt Apr 19, 2026
4ef9171
Fixup
dg0yt Apr 19, 2026
b029576
[dlib] Fixup
dg0yt Apr 19, 2026
34aa458
Update downstream AC_SEARCH_LIBS
dg0yt Apr 19, 2026
167f7e4
Fixup
dg0yt Apr 19, 2026
917a29f
[ffmpeg] Only pkgconfig for zlib
dg0yt Apr 19, 2026
9013220
omniorb cross builds need work
dg0yt Apr 19, 2026
3211349
ffmpeg
dg0yt Apr 20, 2026
162f1fb
[omniorb] WIP
dg0yt Apr 21, 2026
d5d4b56
Merge remote-tracking branch 'origin/master' into zlib
dg0yt Apr 21, 2026
e183510
Fixup
dg0yt Apr 21, 2026
c192853
[dlib] Skip try_compile tests
dg0yt Apr 21, 2026
9a60980
pkgconfig substitutions
dg0yt Apr 21, 2026
e9ad001
More cleanup
dg0yt Apr 21, 2026
803704e
[qpdf] Pass PKGCONFIG to project mode
dg0yt Apr 22, 2026
748993a
[serf] Restore original CRLF for this PR
dg0yt Apr 22, 2026
49f63dd
Merge branch 'master' into zlib
dg0yt Apr 22, 2026
4922188
Merge branch 'microsoft:master' into zlib
dg0yt Apr 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ports/apsi/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
-DAPSI_BUILD_TESTS=OFF
-DAPSI_BUILD_CLI=OFF
${FEATURE_OPTIONS}
Expand Down
1 change: 1 addition & 0 deletions ports/apsi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "apsi",
"version-semver": "0.11.0",
"port-version": 1,
"description": "APSI is a research library for asymmetric private set intersection.",
"homepage": "https://github.com/microsoft/APSI",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion ports/coin-or-buildtools/buildtools.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index 46501b207..a0ff20a6f 100644
AC_CHECK_HEADER([zlib.h],[coin_has_zlib=yes])
if test x$coin_has_zlib = xyes ; then
- AC_CHECK_LIB([z],[gzopen],[],[coin_has_zlib=no])
+ AC_SEARCH_LIBS([gzopen],[z zlib zlibd],[],[coin_has_zlib=no])
+ AC_SEARCH_LIBS([gzopen],[z zs zlib zd zsd zlibd],[],[coin_has_zlib=no])
fi
if test x$coin_has_zlib = xyes ; then
m4_foreach_w([myvar],[$1],
Expand Down
2 changes: 1 addition & 1 deletion ports/coin-or-buildtools/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "coin-or-buildtools",
"version-date": "2023-02-02",
"port-version": 1,
"port-version": 2,
"description": "Macros and patches for GNU autotools ",
"homepage": "https://coin-or-tools.github.io/BuildTools/",
"license": "EPL-2.0"
Expand Down
4 changes: 2 additions & 2 deletions ports/crashpad/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
NO_DEFAULT_PATH)

if(_LIBRARY_REL MATCHES "-NOTFOUND")
message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}")
message(FATAL_ERROR "Could not find release library with names: ${LIBRARY_NAMES}")
endif()

if(VCPKG_BUILD_TYPE STREQUAL "release")
Expand All @@ -75,7 +75,7 @@ endfunction()
replace_gn_dependency(
"${CMAKE_CURRENT_LIST_DIR}/zlib.gn"
"${SOURCE_PATH}/third_party/zlib/BUILD.gn"
"z;zlib;zlibd"
"z;zs;zlib;zd;zsd;zlibd"
)

set(OPTIONS "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"")
Expand Down
2 changes: 1 addition & 1 deletion ports/crashpad/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "crashpad",
"version-date": "2024-04-11",
"port-version": 10,
"port-version": 11,
"description": [
"Crashpad is a crash-reporting system.",
"Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."
Expand Down
3 changes: 2 additions & 1 deletion ports/dlib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ vcpkg_from_github(
PATCHES
fix-dependencies.patch
)

file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external")

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -35,8 +34,10 @@ vcpkg_cmake_configure(
${COMMON_OPTIONS}
-DDLIB_PNG_SUPPORT=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON
-Dtest_for_libpng_worked=TRUE # try_compile ignores vcpkg setup
-DDLIB_JPEG_SUPPORT=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON
-Dtest_for_libjpeg_worked=TRUE # try_compile ignores vcpkg setup
-DDLIB_USE_BLAS=ON
-DDLIB_USE_LAPACK=ON
-DDLIB_GIF_SUPPORT=OFF
Expand Down
2 changes: 1 addition & 1 deletion ports/dlib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dlib",
"version": "20.0.1",
"port-version": 1,
"port-version": 2,
"description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
"homepage": "https://github.com/davisking/dlib",
"license": "BSL-1.0",
Expand Down
28 changes: 28 additions & 0 deletions ports/elfutils/crc32.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/lib/crc32.c b/lib/crc32.c
index eae6582..3064c65 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -90,6 +90,10 @@ static const uint32_t crc32_table[256] =
0x2d02ef8d
};

+/* crc32 is owned by zlib. */
+#ifndef crc32
+#define crc32 eu_crc32
+#endif
uint32_t
crc32 (uint32_t crc, unsigned char *buf, size_t len)
{
diff --git a/lib/libeu.h b/lib/libeu.h
index e849a79..522fc74 100644
--- a/lib/libeu.h
+++ b/lib/libeu.h
@@ -42,6 +42,8 @@ extern char *xstrndup (const char *, size_t) __attribute__ ((__malloc__));
extern char *xasprintf(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((__malloc__));

+/* crc32 is owned by zlib. */
+#define crc32 eu_crc32
extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
extern int crc32_file (int fd, uint32_t *resp);

1 change: 1 addition & 0 deletions ports/elfutils/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
crc32.diff
disable-werror.diff
link-libs.diff
rpath-link.diff
Expand Down
1 change: 1 addition & 0 deletions ports/elfutils/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "elfutils",
"version": "0.195",
"port-version": 1,
"description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
"homepage": "https://sourceware.org/elfutils/",
"license": null,
Expand Down
6 changes: 4 additions & 2 deletions ports/ffmpeg/0004-dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ index 1759694..fcbae49 100644
+++ b/configure
@@ -7184,7 +7184,7 @@ fi

enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
check_lib zlib zlib.h zlibVersion -lz; }
-enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
- check_lib zlib zlib.h zlibVersion -lz; }
-enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
+
+enabled zlib && require_pkg_config zlib zlib zlib.h zlibVersion
+enabled bzlib && require_pkg_config bzlib bzip2 bzlib.h BZ2_bzlibVersion
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma

Expand Down
4 changes: 2 additions & 2 deletions ports/ffmpeg/0007-fix-lib-naming.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ diff --git a/configure b/configure
index d6c4388..75b96c3 100644
--- a/configure
+++ b/configure
@@ -4781,6 +4781,7 @@ msvc_common_flags(){
@@ -4781,6 +4781,6 @@ msvc_common_flags(){
-mfp16-format=*) ;;
-lz) echo zlib.lib ;;
- -lz) echo zlib.lib ;;
-lx264) echo libx264.lib ;;
+ -lmp3lame) echo libmp3lame.lib ;;
-lstdc++) ;;
Expand Down
2 changes: 1 addition & 1 deletion ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "8.1",
"port-version": 2,
"port-version": 3,
"description": [
"A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index b05c334..dd4063c 100644
dnl Checks for libraries
if test "$enable_zlib" != "no"; then
- AC_CHECK_LIB(z, gzopen)
+ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no")
+ AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd], have_zlib="yes", have_zlib="no")
fi
if test "$enable_bzlib" != "no"; then
AC_CHECK_LIB(bz2, BZ2_bzCompressInit)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ index 8b54efda..d043fb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,7 +191,7 @@ if test "$enable_zlib" != "no"; then
AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no")
AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd], have_zlib="yes", have_zlib="no")
fi
if test "$enable_bzlib" != "no"; then
- AC_CHECK_LIB(bz2, BZ2_bzCompressInit)
Expand Down
10 changes: 6 additions & 4 deletions ports/libmagic/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(extra_patches "")
if(VCPKG_TARGET_IS_WINDOWS)
set(PATCHES
list(APPEND extra_patches
"0001-Use-libtre.patch"
"0002-Change-zlib-lib-name-to-match-CMake-output.patch"
"0003-Fix-WIN32-macro-checks.patch"
"0004-Typedef-POSIX-types-on-Windows.patch"
"0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch"
Expand All @@ -14,7 +14,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
"0013-Check-for-backslash-in-argv-0-on-Windows.patch"
"0015-MSYS2-Remove-ioctl-call.patch"
"0016-Fix-file_famagic-function.patch"
"0017-Change-bzlib-name-to-match-CMake-output.patch"
)
endif()

Expand All @@ -24,7 +23,10 @@ vcpkg_from_github(
REF FILE5_46
SHA512 fb8157ee8065feaf57412ccdeee57cd8fc853b54ac49b0ddc818eeb1ca3555a7cfd25dea08996503f7c565dcba8c57fd7e4dc5fe3452872c617f5612a94a8f0e
HEAD_REF master
PATCHES ${PATCHES}
PATCHES
0002-Change-zlib-lib-name-to-match-CMake-output.patch
0017-Change-bzlib-name-to-match-CMake-output.patch
${extra_patches}
)

if(VCPKG_TARGET_IS_WINDOWS)
Expand Down
4 changes: 2 additions & 2 deletions ports/libmagic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libmagic",
"version": "5.46",
"port-version": 2,
"port-version": 3,
"description": "This library can be used to classify files according to magic number tests.",
"homepage": "https://github.com/file/file",
"license": "BSD-2-Clause",
Expand All @@ -11,7 +11,7 @@
"platform": "windows"
},
{
"name": "getopt",
"name": "getopt-win32",
"platform": "windows"
},
{
Expand Down
2 changes: 1 addition & 1 deletion ports/libwandio/configure.lib.patch
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ index 428e66a..21e39db 100644
AS_IF([test "x$with_zlib" != "xno"],
[
- AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
+ AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no)
+ AC_SEARCH_LIBS(deflate, [z zs zlib zd zsd zlibd], have_zlib=yes, have_zlib=no)
], [have_zlib=no])

AS_IF([test "x$have_zlib" = "xyes"], [
Expand Down
2 changes: 1 addition & 1 deletion ports/libwandio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libwandio",
"version": "4.2.6-1",
"port-version": 1,
"port-version": 2,
"description": "C library for simple and efficient file IO.",
"homepage": "https://github.com/wanduow/wandio",
"license": "LGPL-3.0-only",
Expand Down
2 changes: 1 addition & 1 deletion ports/libxfont/configure.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index f507c285a..a821e7311 100644
X_GZIP_FONT_COMPRESSION=1
AC_SUBST(X_GZIP_FONT_COMPRESSION)
-AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required]))
+AC_SEARCH_LIBS(gzopen, [z zlib zlibd] , [Z_LIBS="$ac_cv_search_gzopen"], AC_MSG_ERROR([*** zlib is required]))
+AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd] , [Z_LIBS="$ac_cv_search_gzopen"], AC_MSG_ERROR([*** zlib is required]))

AC_ARG_WITH(bzip2,
AS_HELP_STRING([--with-bzip2],
Expand Down
2 changes: 1 addition & 1 deletion ports/libxfont/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libxfont",
"version": "2.0.5",
"port-version": 2,
"port-version": 3,
"description": "X font handling library for server & utilities",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/omniorb/add_win_into_autotools.patch
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ index cef87f8bd..cf61556bd 100644
AC_DEFUN([OMNI_ENABLE_ZIOP],
-[AC_CHECK_LIB(z,compressBound,omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
-AC_CHECK_LIB(zstd,ZSTD_compress,omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
+[AC_SEARCH_LIBS(compressBound,[z zlib zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
+[AC_SEARCH_LIBS(compressBound,[z zs zlib zd zsd zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
+AC_SEARCH_LIBS(ZSTD_compress,[zstd zstdd],omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
omni_cv_enable_ziop="no"
if test "$omni_cv_enable_ziop_zlib" = "yes"; then
Expand Down
5 changes: 2 additions & 3 deletions ports/omniorb/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://netcologne.dl.sourceforge.net/project/omniorb/omniORB/omniORB-${VERSION}/omniORB-${VERSION}.tar.bz2"
URLS "https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/omniORB-4.3.0.tar.bz2/download"
FILENAME "omniORB-${VERSION}.tar.bz2"
SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
)
Expand Down Expand Up @@ -94,11 +94,10 @@ vcpkg_configure_make(
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel//mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoReleaseBuild=1\nBuildDebugBinary=1")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "python$(subst .,,$(PYVERSION)).lib" "python$(subst .,,$(PYVERSION))_d.lib")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "zlib.lib" "zlibd.lib")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/omniorb/python-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ index 84f10ac03..3b5a60b87 100644
CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR))
else
-PYLIB := python$(subst .,,$(PYVERSION)).lib
+PYLIB = python$(subst .,,$(PYVERSION)).lib zlib.lib Advapi32.lib
+PYLIB := python$(subst .,,$(PYVERSION)).lib advapi32.lib
CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR))
endif

2 changes: 1 addition & 1 deletion ports/omniorb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "omniorb",
"version": "4.3.0",
"port-version": 4,
"port-version": 5,
"description": "omniORB is a robust high performance CORBA ORB for C++",
"homepage": "https://omniorb.sourceforge.io/",
"license": "LGPL-2.1-or-later",
Expand Down
4 changes: 2 additions & 2 deletions ports/python3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
else()
message(STATUS "WARNING: Extensions have been disabled. No C extension modules will be available.")
endif()
find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(ZLIB_RELEASE NAMES z zs zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_DEBUG NAMES zd zsd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
list(APPEND add_libs_rel "${ZLIB_RELEASE}")
list(APPEND add_libs_dbg "${ZLIB_DEBUG}")

Expand Down
1 change: 1 addition & 0 deletions ports/python3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "python3",
"version": "3.12.13",
"port-version": 1,
"description": "The Python programming language",
"homepage": "https://github.com/python/cpython",
"license": "Python-2.0",
Expand Down
4 changes: 2 additions & 2 deletions ports/qpdf/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
)

vcpkg_find_acquire_program(PKGCONFIG)
set(ENV{PKG_CONFIG} "${PKGCONFIG}")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
Expand All @@ -28,9 +29,8 @@ vcpkg_cmake_configure(
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qpdf)
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qpdf)
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
Expand Down
1 change: 1 addition & 0 deletions ports/qpdf/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qpdf",
"version": "12.3.2",
"port-version": 1,
"description": "A content-preserving PDF document transformer",
"homepage": "https://qpdf.sourceforge.io/",
"license": "Apache-2.0 AND MIT",
Expand Down
Loading
Loading