diff options
| author |   Peter Levine <plevine457@gmail.com> | 2023-04-04 22:48:32 -0400 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2023-04-28 10:43:44 +0300 |
| commit | 226042015d009bb30121508182b19a31131d175e (patch) | |
| tree | 03298df5501eec3249494cdfea0ba8105e15d177 | |
| parent | app-crypt/tpm2-abrmd: Move dbus config file from /etc to /usr/share (diff) | |
| download | gentoo-226042015d009bb30121508182b19a31131d175e.tar.gz gentoo-226042015d009bb30121508182b19a31131d175e.tar.bz2 gentoo-226042015d009bb30121508182b19a31131d175e.zip | |
app-admin/passwordsafe: fix building against gtest-1.13
dev-cpp/gtest-1.13.0 now requires building with c++14 or higher, and
'-std=gnu++11' has been removed upstream.
Closes: https://bugs.gentoo.org/895140
Closes: https://github.com/gentoo/gentoo/pull/30483
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
| -rw-r--r-- | app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch | 13 | ||||
| -rw-r--r-- | app-admin/passwordsafe/passwordsafe-1.15.0.ebuild | 10 |
2 files changed, 16 insertions, 7 deletions
diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch new file mode 100644 index 000000000000..fe39281f29b1 --- /dev/null +++ b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gtest-no-gnu++11.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/893464 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -248,7 +248,7 @@ + + else () + set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -fPIC -Wall -std=gnu++11 -DUNICODE -DWCHAR_INCOMPATIBLE_XMLCH ${CMAKE_WXWINDOWS_CXX_FLAGS}") ++ "${CMAKE_CXX_FLAGS} -fPIC -Wall -DUNICODE -DWCHAR_INCOMPATIBLE_XMLCH ${CMAKE_WXWINDOWS_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG") + if (USE_ASAN) + set(CMAKE_CXX_FLAGS_DEBUG diff --git a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild index bc3fbce0c6ee..43dc7b3551fa 100644 --- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild +++ b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit cmake desktop flag-o-matic optfeature wxwidgets xdg +inherit cmake desktop optfeature wxwidgets xdg MY_PV="${PV/_beta/BETA}" DESCRIPTION="Password manager with wxGTK based frontend" @@ -39,13 +39,9 @@ S="${WORKDIR}/pwsafe-${MY_PV}" PATCHES=( "${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch + "${FILESDIR}"/${PN}-1.15.0-gtest-no-gnu++11.patch ) -pkg_pretend() { - einfo "Checking for -std=c++11 support in compiler" - test-flags-CXX -std=c++11 > /dev/null || die -} - src_configure() { setup-wxwidgets |