Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libwpd/files/, app-text/libwpd/
Date: Sun, 13 Jan 2019 20:45:22
Message-Id: 1547412302.517db018c664c25c9a4db3883ef1ec39cc3588dd.asturm@gentoo
1 commit: 517db018c664c25c9a4db3883ef1ec39cc3588dd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 13 17:41:00 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 13 20:45:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517db018
7
8 app-text/libwpd: Fix build with GCC-4.8
9
10 Closes: https://bugs.gentoo.org/674402
11 Package-Manager: Portage-2.3.55, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-text/libwpd/files/libwpd-0.10.3-gcc-4.8.patch | 16 ++++++++++++++++
15 app-text/libwpd/libwpd-0.10.3.ebuild | 4 +++-
16 2 files changed, 19 insertions(+), 1 deletion(-)
17
18 diff --git a/app-text/libwpd/files/libwpd-0.10.3-gcc-4.8.patch b/app-text/libwpd/files/libwpd-0.10.3-gcc-4.8.patch
19 new file mode 100644
20 index 00000000000..f47847c1d21
21 --- /dev/null
22 +++ b/app-text/libwpd/files/libwpd-0.10.3-gcc-4.8.patch
23 @@ -0,0 +1,16 @@
24 +Authored by: David Tardon David Tardon 2018-12-30
25 +Commit 333c8a26f231bea26ec3d56245315041bbf5577f
26 +
27 +fix build with gcc 4.8
28 +
29 +--- a/src/lib/WPXTable.h
30 ++++ b/src/lib/WPXTable.h
31 +@@ -53,7 +53,7 @@
32 + ~WPXTable();
33 + void insertRow();
34 + void insertCell(unsigned char colSpan, unsigned char rowSpan, unsigned char borderBits);
35 +- const WPXTableCell *getCell(size_t i, size_t j)
36 ++ const WPXTableCell *getCell(std::size_t i, std::size_t j)
37 + {
38 + return &(m_tableRows[i])[j];
39 + }
40
41 diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
42 index febfff6725b..469e0bc7eba 100644
43 --- a/app-text/libwpd/libwpd-0.10.3.ebuild
44 +++ b/app-text/libwpd/libwpd-0.10.3.ebuild
45 @@ -1,4 +1,4 @@
46 -# Copyright 1999-2018 Gentoo Authors
47 +# Copyright 1999-2019 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 EAPI=7
51 @@ -21,6 +21,8 @@ BDEPEND="
52 doc? ( app-doc/doxygen )
53 "
54
55 +PATCHES=( "${FILESDIR}/${P}-gcc-4.8.patch" )
56 +
57 src_configure() {
58 local myeconfargs=(
59 --program-suffix=-${SLOT}