* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimetic/files/, dev-libs/mimetic/
@ 2020-02-19 1:31 Georgy Yakovlev
0 siblings, 0 replies; 2+ messages in thread
From: Georgy Yakovlev @ 2020-02-19 1:31 UTC (permalink / raw
To: gentoo-commits
commit: 73e3cff3e5c20ce30b90326849b215c31aa5cb3e
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 01:26:18 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 01:30:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e3cff3
dev-libs/mimetic: keyword on ~ppc64
add signed char patch to allow build on arches
where char is unsigned
======================================
Tests Statistics
--------------------------------------
Functions Checks
Success 65 2740
Failed 0 0
--------------------------------------
Total 65 2740
======================================
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-libs/mimetic/files/signed-char.patch | 31 +++++++++++++++++++++++++++++++
dev-libs/mimetic/mimetic-0.9.8.ebuild | 6 ++++--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/dev-libs/mimetic/files/signed-char.patch b/dev-libs/mimetic/files/signed-char.patch
new file mode 100644
index 00000000000..df33df9e2b7
--- /dev/null
+++ b/dev-libs/mimetic/files/signed-char.patch
@@ -0,0 +1,31 @@
+Description: fix FTBFS on architectures where char is unsigned
+ Fix error
+ base64.cxx:30:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
+ by making Base64::sDecTable a signed char.
+Bug-Debian: https://bugs.debian.org/859963
+Forwarded: via email
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2017-04-10
+
+--- a/mimetic/codec/base64.cxx
++++ b/mimetic/codec/base64.cxx
+@@ -13,7 +13,7 @@
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789+/=";
+
+-const char Base64::sDecTable[] = {
++const signed char Base64::sDecTable[] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+--- a/mimetic/codec/base64.h
++++ b/mimetic/codec/base64.h
+@@ -20,7 +20,7 @@
+ enum { default_maxlen = 76 };
+ enum { eq_sign = 100 };
+ static const char sEncTable[];
+- static const char sDecTable[];
++ static const signed char sDecTable[];
+ static const int sDecTableSz;
+ public:
+ class Encoder; class Decoder;
diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild
index ffa4669138a..3f54ec09712 100644
--- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
+++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,11 +11,13 @@ SRC_URI="http://www.codesink.org/download/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="doc examples"
DEPEND="doc? ( app-doc/doxygen )"
+PATCHES=( "${FILESDIR}/signed-char.patch" )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimetic/files/, dev-libs/mimetic/
@ 2021-04-20 11:43 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2021-04-20 11:43 UTC (permalink / raw
To: gentoo-commits
commit: f206ad5a195c242092f603e6dfa2775564413b25
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 11:42:45 2021 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> 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 <d.sunnerer <AT> vfemail.net>
Closes: https://bugs.gentoo.org/729910
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Palimaka <kensington <AT> 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 <stefano@parkopedia.com>
+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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-20 11:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-19 1:31 [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimetic/files/, dev-libs/mimetic/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2021-04-20 11:43 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox