From 3767a12b99e6ddae276204af489bf1b1db988f39 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 10 Jul 2025 12:18:03 +0000
Subject: [PATCH] minizip: Update to match S/UNPACKDIR changes

Extract the source to expected location and append minizip's
subdir to S. This supports the S/UNPACKDIR changes done in
oe-core/whinlatter and keeps backwards compatibility with
older yocto versions.

Pick-to: 6.10 6.9 6.8
Change-Id: I10942cc8ca337b321bf80f06661ab83cb4b20c35
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 recipes-core/minizip/minizip_1.2.11.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core/minizip/minizip_1.2.11.bb b/recipes-core/minizip/minizip_1.2.11.bb
index 5fd004b..f2d41e9 100644
--- a/recipes-core/minizip/minizip_1.2.11.bb
+++ b/recipes-core/minizip/minizip_1.2.11.bb
@@ -6,10 +6,10 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz;subdir=${BP};striplevel=1"
 UPSTREAM_CHECK_URI = "http://zlib.net/"
 
-S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+S .= "/contrib/minizip"
 
 SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
 SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"