diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-28 11:12:20 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-28 11:12:20 +0100 |
| commit | 7aa28e7310855bc5ef0d32b22e8b58eec55c28c9 (patch) | |
| tree | 9ceae60214a212f74f44e47506754fdeafb6947a /app-admin/passwordsafe | |
| parent | 2099ff9b640e648be67527e29760263a7c6274e5 (diff) | |
gentoo auto-resync : 28:04:2023 - 11:12:20
Diffstat (limited to 'app-admin/passwordsafe')
| -rw-r--r-- | app-admin/passwordsafe/Manifest | 3 | ||||
| -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 |
3 files changed, 18 insertions, 8 deletions
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest index cc5053937bbe..cda43fdab9e6 100644 --- a/app-admin/passwordsafe/Manifest +++ b/app-admin/passwordsafe/Manifest @@ -1,4 +1,5 @@ AUX passwordsafe-1.15.0-gcc12-time.patch 306 BLAKE2B 03c0d2cefc7cab1b1342df38bd49e6b4fcce6d4c656c0cfabc678a4dd037c95d45e4e5ddeebb4bf8b2031e4c3b2c3c8738eb4e4b8fcb567f472ccd5c861136fa SHA512 2f209a5ae3691b37144b5c32eb467dd50abfe1b8f440bf63b6e3c3f070f788a160a56dd1e28f631df695c58981bd5596534b3d931ce7096555cd0cd12a3bfdb7 +AUX passwordsafe-1.15.0-gtest-no-gnu++11.patch 467 BLAKE2B d3d09e3ed71c722abf11b07edcbf5f430b0eb1f1b530824cacee9ad35c301e45a942c5494c5767ef2cc62f4b63c3a3f9fd39877f4de5821b5164d12640e302f8 SHA512 a1f133b23e2e8651e30e15335b3e06e570c960cd0e31d567bdceb6862ad0df6576182f8784e97ba6cf66b6777ac99a052f7e6a077c6274af32401f9156edd605 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738 -EBUILD passwordsafe-1.15.0.ebuild 1949 BLAKE2B 858e729c9d37e72b71da39cebd890eae0660254ff95d836723c7c8516c161cd829ec66375b5bbd036113a7f1d73ddfc90937197e6975d34b81c4d3b1d5da35b3 SHA512 2aad0600254afa3687e79c8f8cb7edbb3e9c1ce71813f9b694a8257e43f534b219ebb67160f43cc47ad8554ad619474665fd3b3e90bd9ba8fa9d8f955c507dd5 +EBUILD passwordsafe-1.15.0.ebuild 1869 BLAKE2B 31576c5fc6aeafe6246e02c03c9b5d435b771f0139e54b536e6f10bffb4c4bbb0fafc55f51d0511dba84b2ffc959f3010ac0a0e61cf99d417109fef3076fdf37 SHA512 ddcb1d77847eb265a1b36b9259dc2390a6eaa5608f6a8da4e64ba3d72cfe61eee9c6df0ae530fefe2a031d62997f655c39fa54889538a13b76bf04ae1963461b MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246 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 |