Andrew Krasavin <noiseless...@yandex.ru> writes:
> On Sat, Feb 05, 2022 at 06:05:17PM +0100, Omar Polo wrote: >>hello :) >> >>thanks for worknig on the update, i have a similar diff locally but >>stopped due to the fact that some ports didn't build. I'll try to do >>another round of testing tho. >> >>I wanted to report thought that the diff is mangled :/ >> > > Thanks for the reply! > > Oh, I'm sorry, I was sloppy when I sent the email the second time > (the first email couldn't reach for 12 hours and I decided to resend > it for some reason). The first one should be ok. Just in case, > I am also attaching the diff to this letter, in the archive. > > What ports did you have problems with? I'm re-checking and it was devel/msgpack, which I see now it builds when overriding the c++ standard. Another thing, upstream won't release further versions and suggest to build from the latest commit instead... so I'd fetch from a specific commit instead of keeping a long list of PATCHFILES. cf https://github.com/google/googletest/releases/tag/release-1.11.0 > GoogleTest will not accept patches of new features to v1.11.0. > We recommend building GoogleTest from the latest commit instead. > Exceptional critical bug fixes may be considered. FWIW i had the following diff locally (which has to be updated to the latest commit) and I can confirm that devel/msgpack and proj still builds fine with this and test are passing. I'll update it to 14aa11db02d9851d957f93ef9fddb110c1aafdc6 (latest commit as of now), cherry pick you fix-gtest-help-test (which is the only test failing for me here), do a mini bulk overnight and report back how it goes :) thanks! Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/gtest/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 31 Oct 2021 16:09:26 -0000 1.25 +++ Makefile 18 Dec 2021 11:32:37 -0000 @@ -5,11 +5,10 @@ BROKEN-alpha = googletest/test/gtest_uni COMMENT = C++ unit test framework -V= 1.8.1 GH_ACCOUNT= google GH_PROJECT= googletest -GH_TAGNAME= release-$V -PKGNAME = gtest-$V +GH_COMMIT= 97a467571a0f615a4d96e79e4399c43221ca1232 +DISTNAME = gtest-1.11.0.20211215 SHARED_LIBS += gmock 0.1 # .0.0 SHARED_LIBS += gmock_main 0.1 # .0.0 Index: distinfo =================================================================== RCS file: /home/cvs/ports/devel/gtest/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 31 Oct 2021 16:09:26 -0000 1.5 +++ distinfo 18 Dec 2021 11:29:13 -0000 @@ -1,2 +1,3 @@ -SHA256 (googletest-1.8.1.tar.gz) = m/H+UYKmBLQTXtwaQlrjVsmtFemyP58SoC6AGEw6JJw= -SIZE (googletest-1.8.1.tar.gz) = 992298 +SHA256 (-97a46757.tar.gz) = DhiBguiND4Iwtq+FyeyH5cfZBNDhhW/PXov/xcWTORU= +SHA256 (gtest-1.11.0.20211215-97a46757.tar.gz) = DhiBguiND4Iwtq+FyeyH5cfZBNDhhW/PXov/xcWTORU= +SIZE (gtest-1.11.0.20211215-97a46757.tar.gz) = 833895 Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/gtest/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 31 Oct 2021 16:09:26 -0000 1.4 +++ pkg/PLIST 18 Dec 2021 11:20:35 -0000 @@ -2,35 +2,27 @@ include/gmock/ include/gmock/gmock-actions.h include/gmock/gmock-cardinalities.h -include/gmock/gmock-generated-actions.h -include/gmock/gmock-generated-actions.h.pump -include/gmock/gmock-generated-function-mockers.h -include/gmock/gmock-generated-function-mockers.h.pump -include/gmock/gmock-generated-matchers.h -include/gmock/gmock-generated-matchers.h.pump -include/gmock/gmock-generated-nice-strict.h -include/gmock/gmock-generated-nice-strict.h.pump +include/gmock/gmock-function-mocker.h include/gmock/gmock-matchers.h include/gmock/gmock-more-actions.h include/gmock/gmock-more-matchers.h +include/gmock/gmock-nice-strict.h include/gmock/gmock-spec-builders.h include/gmock/gmock.h include/gmock/internal/ include/gmock/internal/custom/ include/gmock/internal/custom/README.md include/gmock/internal/custom/gmock-generated-actions.h -include/gmock/internal/custom/gmock-generated-actions.h.pump include/gmock/internal/custom/gmock-matchers.h include/gmock/internal/custom/gmock-port.h -include/gmock/internal/gmock-generated-internal-utils.h -include/gmock/internal/gmock-generated-internal-utils.h.pump include/gmock/internal/gmock-internal-utils.h include/gmock/internal/gmock-port.h +include/gmock/internal/gmock-pp.h include/gtest/ include/gtest/gtest-death-test.h +include/gtest/gtest-matchers.h include/gtest/gtest-message.h include/gtest/gtest-param-test.h -include/gtest/gtest-param-test.h.pump include/gtest/gtest-printers.h include/gtest/gtest-spi.h include/gtest/gtest-test-part.h @@ -47,17 +39,11 @@ include/gtest/internal/custom/gtest.h include/gtest/internal/gtest-death-test-internal.h include/gtest/internal/gtest-filepath.h include/gtest/internal/gtest-internal.h -include/gtest/internal/gtest-linked_ptr.h -include/gtest/internal/gtest-param-util-generated.h -include/gtest/internal/gtest-param-util-generated.h.pump include/gtest/internal/gtest-param-util.h include/gtest/internal/gtest-port-arch.h include/gtest/internal/gtest-port.h include/gtest/internal/gtest-string.h -include/gtest/internal/gtest-tuple.h -include/gtest/internal/gtest-tuple.h.pump include/gtest/internal/gtest-type-util.h -include/gtest/internal/gtest-type-util.h.pump lib/cmake/ lib/cmake/GTest/ lib/cmake/GTest/GTestConfig.cmake
