Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/pstoedit/, media-gfx/pstoedit/files/
Date: Mon, 30 May 2022 07:25:46
Message-Id: 1653895533.7fb1ad844228c4c67efef3039abc4d2862241de6.sam@gentoo
1 commit: 7fb1ad844228c4c67efef3039abc4d2862241de6
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 07:23:03 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 07:25:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb1ad84
7
8 media-gfx/pstoedit: fix build with GCC 12
9
10 Closes: https://bugs.gentoo.org/844040
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch | 13 +++++++++++++
14 media-gfx/pstoedit/pstoedit-3.75.ebuild | 7 +++++--
15 2 files changed, 18 insertions(+), 2 deletions(-)
16
17 diff --git a/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch b/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch
18 new file mode 100644
19 index 000000000000..fa42a7a831b6
20 --- /dev/null
21 +++ b/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch
22 @@ -0,0 +1,13 @@
23 +https://src.fedoraproject.org/rpms/pstoedit/raw/rawhide/f/pstoedit-fix-gcc12.patch
24 +https://bugs.gentoo.org/844040
25 +--- a/src/drvpptx.cpp
26 ++++ b/src/drvpptx.cpp
27 +@@ -65,6 +65,7 @@
28 + #define ZIP_EXTERN extern
29 +
30 + #include <zip.h>
31 ++#include <memory>
32 +
33 + #ifdef _MSC_VER
34 + // MS VC++ Windows
35 +
36
37 diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
38 index 6469d052b2b6..e866acb3c778 100644
39 --- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
40 +++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2021 Gentoo Authors
43 +# Copyright 1999-2022 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=7
47 @@ -30,7 +30,10 @@ DEPEND="${RDEPEND}"
48 DOCS=( doc/readme.txt )
49 HTML_DOCS=( doc/{changelog,pstoedit}.htm )
50
51 -PATCHES=( "${FILESDIR}"/${P}-libdl.patch )
52 +PATCHES=(
53 + "${FILESDIR}"/${P}-libdl.patch
54 + "${FILESDIR}"/${P}-gcc12.patch
55 +)
56
57 src_prepare() {
58 default