Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimetic/files/, dev-libs/mimetic/
Date: Tue, 20 Apr 2021 11:43:32
Message-Id: 1618919000.f206ad5a195c242092f603e6dfa2775564413b25.kensington@gentoo
1 commit: f206ad5a195c242092f603e6dfa2775564413b25
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 20 11:42:45 2021 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 20 11:43:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f206ad5a
7
8 dev-libs/mimetic: backport patch from upstream solving build failure
9
10 Thanks-to: Daniel Sunnerer <d.sunnerer <AT> vfemail.net>
11 Closes: https://bugs.gentoo.org/729910
12 Package-Manager: Portage-3.0.17, Repoman-3.0.2
13 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
14
15 .../mimetic/files/mimetic-0.9.8-build-mmap.patch | 22 ++++++++++++++++++++++
16 dev-libs/mimetic/mimetic-0.9.8.ebuild | 5 ++++-
17 2 files changed, 26 insertions(+), 1 deletion(-)
18
19 diff --git a/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch
20 new file mode 100644
21 index 00000000000..d6c6582cd42
22 --- /dev/null
23 +++ b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch
24 @@ -0,0 +1,22 @@
25 +From bf84940f9021950c80846e6b1a5f8b0b55991b00 Mon Sep 17 00:00:00 2001
26 +From: Stefano Barbato <stefano@××××××××××.com>
27 +Date: Sat, 27 Apr 2019 15:00:58 +0200
28 +Subject: [PATCH] better mmap error check
29 +
30 +---
31 + mimetic/os/mmfile.cxx | 2 +-
32 + 1 file changed, 1 insertion(+), 1 deletion(-)
33 +
34 +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx
35 +index dfc95b7..9627516 100644
36 +--- a/mimetic/os/mmfile.cxx
37 ++++ b/mimetic/os/mmfile.cxx
38 +@@ -57,7 +57,7 @@ bool MMFile::open(int mode)
39 + bool MMFile::map()
40 + {
41 + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0);
42 +- if(m_beg > 0)
43 ++ if(m_beg != MAP_FAILED)
44 + {
45 + m_end = m_beg + m_st.st_size;
46 + #if HAVE_MADVISE
47
48 diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild
49 index a685af2319f..1190360ea4d 100644
50 --- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
51 +++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
52 @@ -16,7 +16,10 @@ IUSE="doc examples"
53
54 BDEPEND="doc? ( app-doc/doxygen )"
55
56 -PATCHES=( "${FILESDIR}/signed-char.patch" )
57 +PATCHES=(
58 + "${FILESDIR}/signed-char.patch"
59 + "${FILESDIR}/${P}-build-mmap.patch"
60 +)
61
62 src_prepare() {
63 default