Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
Date: Wed, 29 Dec 2021 07:21:16
Message-Id: 1640762458.8e680a4ed8101da64e79f204241f5b894e625218.sam@gentoo
1 commit: 8e680a4ed8101da64e79f204241f5b894e625218
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 07:20:58 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 07:20:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e680a4e
7
8 sys-block/partimage: fix build on musl
9
10 Closes: https://bugs.gentoo.org/715756
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../files/partimage-0.6.9-missing-includes.patch | 34 ++++++++++++++++++++++
14 sys-block/partimage/partimage-0.6.9-r2.ebuild | 1 +
15 2 files changed, 35 insertions(+)
16
17 diff --git a/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
18 new file mode 100644
19 index 000000000000..956afe8319a6
20 --- /dev/null
21 +++ b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
22 @@ -0,0 +1,34 @@
23 +From 0b7b162fbbab1b1d4adf61c5e33f508be0e68895 Mon Sep 17 00:00:00 2001
24 +From: Jory Pratt <anarchy@g.o>
25 +Date: Sun, 12 Apr 2020 13:25:49 -0500
26 +Subject: [PATCH] add missing includes
27 +
28 +---
29 + src/client/misc.cpp | 1 +
30 + src/shared/common.h | 1 +
31 + 2 files changed, 2 insertions(+)
32 +
33 +diff --git a/src/client/misc.cpp b/src/client/misc.cpp
34 +index a094803..1c96ef6 100644
35 +--- a/src/client/misc.cpp
36 ++++ b/src/client/misc.cpp
37 +@@ -40,6 +40,7 @@
38 +
39 + #include <ctype.h>
40 + #include <sys/types.h>
41 ++#include <sys/sysmacros.h>
42 + #include <sys/ioctl.h>
43 + #include <sys/mount.h>
44 + #include <sys/time.h>
45 +diff --git a/src/shared/common.h b/src/shared/common.h
46 +index 71de058..eead7e3 100644
47 +--- a/src/shared/common.h
48 ++++ b/src/shared/common.h
49 +@@ -23,6 +23,7 @@
50 + #include <pthread.h>
51 +
52 + #include <sys/param.h>
53 ++#include <sys/types.h>
54 +
55 + #include "partimage.h"
56 +
57
58 diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
59 index e747631d8dc5..34732ed47292 100644
60 --- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
61 +++ b/sys-block/partimage/partimage-0.6.9-r2.ebuild
62 @@ -35,6 +35,7 @@ src_prepare() {
63 eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
64 eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
65 eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
66 + eapply "${FILESDIR}"/${P}-missing-includes.patch
67
68 eapply_user