Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/passwordsafe/files/, app-admin/passwordsafe/
Date: Thu, 30 Jun 2022 21:32:44
Message-Id: 1656624751.1cb089fd5ce61c66ead34b6fbd57e6d8f61336ea.sam@gentoo
1 commit: 1cb089fd5ce61c66ead34b6fbd57e6d8f61336ea
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 21:32:25 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 21:32:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb089fd
7
8 app-admin/passwordsafe: fix build with GCC 12
9
10 Closes: https://bugs.gentoo.org/854144
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch | 13 +++++++++++++
14 app-admin/passwordsafe/passwordsafe-1.15.0.ebuild | 4 ++++
15 2 files changed, 17 insertions(+)
16
17 diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
18 new file mode 100644
19 index 000000000000..0852e2888fdf
20 --- /dev/null
21 +++ b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
22 @@ -0,0 +1,13 @@
23 +https://bugs.gentoo.org/854144
24 +--- a/src/os/unix/pws_time.h
25 ++++ b/src/os/unix/pws_time.h
26 +@@ -10,9 +10,7 @@
27 +
28 + #include "../typedefs.h"
29 + #include <stdint.h>
30 +-#ifdef __FreeBSD__
31 + #include <time.h>
32 +-#endif
33 +
34 + #ifndef __TIME64_T_TYPE
35 + #define __TIME64_T_TYPE uint64_t
36
37 diff --git a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
38 index 209366001f8a..da104b993d4c 100644
39 --- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
40 +++ b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
41 @@ -37,6 +37,10 @@ BDEPEND="
42
43 S="${WORKDIR}/pwsafe-${MY_PV}"
44
45 +PATCHES=(
46 + "${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch
47 +)
48 +
49 pkg_pretend() {
50 einfo "Checking for -std=c++11 support in compiler"
51 test-flags-CXX -std=c++11 > /dev/null || die