Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/files/, dev-libs/xapian/
Date: Mon, 14 Jun 2021 22:11:45
Message-Id: 1623708672.d836910165befa9b9cf98d3258784711176d96b3.sam@gentoo
1 commit: d836910165befa9b9cf98d3258784711176d96b3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 18:46:42 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 22:11:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8369101
7
8 dev-libs/xapian: fix build with GCC 11 in 1.4.17
9
10 Note that 1.4.18 already seems to work but we may as well include the patch
11 given somebody posted it.
12
13 Closes: https://bugs.gentoo.org/788046
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../xapian/files/xapian-1.4.17-gcc11-missing-include.patch | 11 +++++++++++
17 dev-libs/xapian/xapian-1.4.17.ebuild | 4 ++++
18 2 files changed, 15 insertions(+)
19
20 diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
21 new file mode 100644
22 index 00000000000..67693e968df
23 --- /dev/null
24 +++ b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
25 @@ -0,0 +1,11 @@
26 +https://bugs.gentoo.org/788046
27 +--- a/api/omdocument.cc
28 ++++ b/api/omdocument.cc
29 +@@ -39,6 +39,7 @@
30 +
31 + #include <algorithm>
32 + #include <string>
33 ++#include <limits>
34 +
35 + using namespace std;
36 +
37
38 diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
39 index d78cc9126d0..28d37a14393 100644
40 --- a/dev-libs/xapian/xapian-1.4.17.ebuild
41 +++ b/dev-libs/xapian/xapian-1.4.17.ebuild
42 @@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
43
44 S="${WORKDIR}/${MY_P}"
45
46 +PATCHES=(
47 + "${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch
48 +)
49 +
50 multilib_src_configure() {
51 local myconf=""