diff mbox series

[meta-oe] minizip: backport fix for the missing header

Message ID 20260420084638.985052-1-samuli.piippo@qt.io
State Accepted
Headers show
Series [meta-oe] minizip: backport fix for the missing header | expand

Commit Message

Samuli Piippo April 20, 2026, 8:46 a.m. UTC
Minizip release v1.3.2 is missing required ints.h header that
causes build failure on components using it:

| ../../../../../recipe-sysroot/usr/include/minizip/ioapi.h:74:10: fatal error: ints.h: No such file or directory
|    74 | #include "ints.h"
|       |          ^~~~~~~~

Backport fix from https://github.com/madler/zlib/commit/cb14dc9ade3759352417a300e6c2ed73268f1d97

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
 ...ncy-to-ints.h-in-minizip-Makefile.am.patch | 25 +++++++++++++++++++
 meta-oe/recipes-core/minizip/minizip_1.3.2.bb |  4 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch b/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch
new file mode 100644
index 0000000000..1d05989c74
--- /dev/null
+++ b/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch
@@ -0,0 +1,25 @@ 
+From cb14dc9ade3759352417a300e6c2ed73268f1d97 Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui@chenrui.dev>
+Date: Tue, 17 Feb 2026 10:48:39 -0500
+Subject: [PATCH] Add dependency to ints.h in minizip Makefile.am.
+
+So that ints.h is part of the installation.
+
+Upstream-Status: Backport
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ contrib/minizip/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
+index d343011..b7dea4f 100644
+--- a/contrib/minizip/Makefile.am
++++ b/contrib/minizip/Makefile.am
+@@ -27,6 +27,7 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
+ minizip_includedir = $(includedir)/minizip
+ minizip_include_HEADERS = \
+ 	crypt.h \
++	ints.h \
+ 	ioapi.h \
+ 	mztools.h \
+ 	unzip.h \
diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.2.bb b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
index 49e4a4b561..95a605ecf4 100644
--- a/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
+++ b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
@@ -8,7 +8,9 @@  LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=b7d2930a7332b2bc68f
 
 GITHUB_BASE_URI ?= "https://github.com/madler/zlib/releases/"
 
-SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/zlib-${PV}.tar.xz"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/zlib-${PV}.tar.xz \
+           file://0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch;patchdir=../.. \
+           "
 
 S = "${UNPACKDIR}/zlib-${PV}/contrib/minizip"