blob 86751c227b8edb64ebe6e2425a1f9ceaefc7c41d 573 bytes (raw)
name: gnu/packages/patches/abseil-cpp-fix.patch # note: path name is non-authoritative(*)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
| | The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest
in commit 0b024bd9 on master. It has been used in an abseil-cpp release before
a googletest release.
--- a/absl/container/internal/unordered_map_modifiers_test.h
+++ b/absl/container/internal/unordered_map_modifiers_test.h
@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test {
}
};
+#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest);
+#endif
TYPED_TEST_SUITE_P(UniquePtrModifiersTest);
|
debug log:
solving 86751c227b ...
found 86751c227b in https://yhetil.org/guix-patches/CA+3U0Z=vQ1h184WMVGKCMzptY7RJSt_7REj8X_UT_tUwOYaoPg@mail.gmail.com/
applying [1/1] https://yhetil.org/guix-patches/CA+3U0Z=vQ1h184WMVGKCMzptY7RJSt_7REj8X_UT_tUwOYaoPg@mail.gmail.com/
index 0000000000..86751c227b
error: corrupt patch at line 6
git apply error:; exit status=128
trying https://yhetil.org/guix-patches/CA+3U0Z=vQ1h184WMVGKCMzptY7RJSt_7REj8X_UT_tUwOYaoPg@mail.gmail.com/
applying [2/1] https://yhetil.org/guix-patches/CA+3U0Z=vQ1h184WMVGKCMzptY7RJSt_7REj8X_UT_tUwOYaoPg@mail.gmail.com/
diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-fix.patch
new file mode 100644
index 0000000000..86751c227b
2:16: trailing whitespace.
2:20: trailing whitespace.
2:22: trailing whitespace.
Checking patch gnu/packages/patches/abseil-cpp-fix.patch...
2:22: new blank line at EOF.
+
Applied patch gnu/packages/patches/abseil-cpp-fix.patch cleanly.
warning: 4 lines add whitespace errors.
index at:
100644 86751c227b8edb64ebe6e2425a1f9ceaefc7c41d gnu/packages/patches/abseil-cpp-fix.patch
(*) Git path names are given by the tree(s) the blob belongs to.
Blobs themselves have no identifier aside from the hash of its contents.^
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).