SHA256
1
0
forked from pool/rnp

Accepting request 1164361 from security:privacy

OBS-URL: https://build.opensuse.org/request/show/1164361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rnp?expand=0&rev=14
This commit is contained in:
Ana Guerrero 2024-04-03 15:21:31 +00:00 committed by Git OBS Bridge
commit b0c471548a
3 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,20 @@
https://github.com/rnpgp/rnp/pull/2209
GoogleTest 1.14.0 requires C++ 14:
[ 26s] /usr/include/gtest/internal/gtest-port.h:279:2: error: #error C++ versions less than C++14 are not supported.
[ 26s] 279 | #error C++ versions less than C++14 are not supported.
[ 26s] | ^~~~~
Index: rnp-v0.17.0/CMakeLists.txt
===================================================================
--- rnp-v0.17.0.orig/CMakeLists.txt
+++ rnp-v0.17.0/CMakeLists.txt
@@ -137,7 +137,7 @@ endif(WIN32)
# set a few other things at the top level to prevent incompatibilities
set(CMAKE_C_STANDARD 99)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
add_definitions(-D_GNU_SOURCE)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 3 11:14:34 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
- switch to C++14 to fix build with new GoogleTest 1.14.0
add rnp-v0.17.0-cpp14-googletest.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 20 09:52:21 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de> Sat Jan 20 09:52:21 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -30,6 +30,7 @@ Patch0: rnp-v0.17.0-disable-static.patch
Patch2: rnp-v0.17.0-system-sexp.patch Patch2: rnp-v0.17.0-system-sexp.patch
Patch3: rnp-v0.17.0-tests.patch Patch3: rnp-v0.17.0-tests.patch
Patch4: rnp-v0.17.0-test-SHA1-cutoff.patch Patch4: rnp-v0.17.0-test-SHA1-cutoff.patch
Patch5: rnp-v0.17.0-cpp14-googletest.patch
BuildRequires: cmake >= 3.18 BuildRequires: cmake >= 3.18
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gpg2 >= 2.2 BuildRequires: gpg2 >= 2.2