From 7e6f0784cc0c33e8d5fcb368248168c6656f73c8 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Tue, 4 Jun 2024 09:28:53 -0700 Subject: [PATCH] Remedy conflict between libzip and minizip zip.h. minizip.pc.in would add @include@/minizip to the include path, which would permit simply #include to use minizip. However that conflicts with the zip.h from libzip that is put in the root include directory. This now does not add /minizip to the include path. Now when using pkg-config, #include must be used, where #include would be used for libzip. This is an incompatible change with the previous state. Users of minizip and pkg-config will need to update their code. #include will need to be updated to #include as well. --- contrib/minizip/minizip.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in index 69b5b7fdc..6339d8b1b 100644 --- a/contrib/minizip/minizip.pc.in +++ b/contrib/minizip/minizip.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/minizip +includedir=@includedir@ Name: minizip Description: Minizip zip file manipulation library