1 |
commit: 3cc6c155957fceb4367db5a76aa9c5ca91334347 |
2 |
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> |
3 |
AuthorDate: Tue Aug 23 17:27:02 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 18:56:54 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc6c155 |
7 |
|
8 |
dev-cpp/valijson: bump to 0.7 & fix test compilation with gcc12 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/866153 |
11 |
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/26988 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-cpp/valijson/Manifest | 2 +- |
16 |
dev-cpp/valijson/{valijson-0.6.ebuild => valijson-0.7.ebuild} | 4 ++++ |
17 |
2 files changed, 5 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/dev-cpp/valijson/Manifest b/dev-cpp/valijson/Manifest |
20 |
index ab196e007f5b..7c45f2998533 100644 |
21 |
--- a/dev-cpp/valijson/Manifest |
22 |
+++ b/dev-cpp/valijson/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST valijson-0.6.tar.gz 1881386 BLAKE2B 1dd7783e10f7d362673bd2b80920c911cca194068078ac1411897b212600032bc15ffe10dbb62c27e54d168a1c634d73ee40b394e4d534e72224694ec662e0a6 SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749 |
25 |
+DIST valijson-0.7.tar.gz 2060214 BLAKE2B d2e1c58e37213e44d7d6af173691cad3853e87648948c229ea683bfcba8b19256b0230852b0537c2dbdd7084fcf1ac068e320c5f59a69e446610390b82e76474 SHA512 662e53bf1cac4def19792392cda7cbfe2cbadf77b768eb69b2dec693b16f85f32fa2e9b97eae36569cfcc9ac45f1e6338967423cf415d6bcd90372bc49793a2d |
26 |
|
27 |
diff --git a/dev-cpp/valijson/valijson-0.6.ebuild b/dev-cpp/valijson/valijson-0.7.ebuild |
28 |
similarity index 85% |
29 |
rename from dev-cpp/valijson/valijson-0.6.ebuild |
30 |
rename to dev-cpp/valijson/valijson-0.7.ebuild |
31 |
index 879b255f1760..52fc96a2bad8 100644 |
32 |
--- a/dev-cpp/valijson/valijson-0.6.ebuild |
33 |
+++ b/dev-cpp/valijson/valijson-0.7.ebuild |
34 |
@@ -21,11 +21,15 @@ src_configure() { |
35 |
) |
36 |
|
37 |
if use test; then |
38 |
+ # Fix relative paths to test data |
39 |
sed -i -e "s:../tests/data/documents/:../${P}/tests/data/documents/:" tests/test_adapter_comparison.cpp || die |
40 |
sed -i -e "s:../tests/data:../${P}/tests/data:" tests/test_validation_errors.cpp || die |
41 |
sed -i -e "s:../thirdparty/:../${P}/thirdparty/:" -e "s:../doc/schema/:../${P}/doc/schema/:" tests/test_validator.cpp || die |
42 |
fi |
43 |
|
44 |
+ # -Werror is too aggressive due to false positives with gcc-12, see bug #866153 |
45 |
+ sed -i -e 's/-Werror//g' ../${P}/CMakeLists.txt || die |
46 |
+ |
47 |
cmake_src_configure |
48 |
} |