From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BD6B13835A for ; Tue, 20 Apr 2021 11:43:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C40FE086D; Tue, 20 Apr 2021 11:43:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60355E086E for ; Tue, 20 Apr 2021 11:43:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06404335D4C for ; Tue, 20 Apr 2021 11:43:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 624556BD for ; Tue, 20 Apr 2021 11:43:28 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1618919000.f206ad5a195c242092f603e6dfa2775564413b25.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimetic/files/, dev-libs/mimetic/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch dev-libs/mimetic/mimetic-0.9.8.ebuild X-VCS-Directories: dev-libs/mimetic/files/ dev-libs/mimetic/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f206ad5a195c242092f603e6dfa2775564413b25 X-VCS-Branch: master Date: Tue, 20 Apr 2021 11:43:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a1833b9-16b3-429f-b88a-0851dc621996 X-Archives-Hash: 5d190ffcce87a80b8327ded2426f1bda commit: f206ad5a195c242092f603e6dfa2775564413b25 Author: Michael Palimaka gentoo org> AuthorDate: Tue Apr 20 11:42:45 2021 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Apr 20 11:43:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f206ad5a dev-libs/mimetic: backport patch from upstream solving build failure Thanks-to: Daniel Sunnerer vfemail.net> Closes: https://bugs.gentoo.org/729910 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Michael Palimaka gentoo.org> .../mimetic/files/mimetic-0.9.8-build-mmap.patch | 22 ++++++++++++++++++++++ dev-libs/mimetic/mimetic-0.9.8.ebuild | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..d6c6582cd42 --- /dev/null +++ b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch @@ -0,0 +1,22 @@ +From bf84940f9021950c80846e6b1a5f8b0b55991b00 Mon Sep 17 00:00:00 2001 +From: Stefano Barbato +Date: Sat, 27 Apr 2019 15:00:58 +0200 +Subject: [PATCH] better mmap error check + +--- + mimetic/os/mmfile.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..9627516 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,7 +57,7 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) ++ if(m_beg != MAP_FAILED) + { + m_end = m_beg + m_st.st_size; + #if HAVE_MADVISE diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild index a685af2319f..1190360ea4d 100644 --- a/dev-libs/mimetic/mimetic-0.9.8.ebuild +++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild @@ -16,7 +16,10 @@ IUSE="doc examples" BDEPEND="doc? ( app-doc/doxygen )" -PATCHES=( "${FILESDIR}/signed-char.patch" ) +PATCHES=( + "${FILESDIR}/signed-char.patch" + "${FILESDIR}/${P}-build-mmap.patch" +) src_prepare() { default