[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/115: gnu: abseil-cpp: Remove googletest patch.
From: |
guix-commits |
Subject: |
54/115: gnu: abseil-cpp: Remove googletest patch. |
Date: |
Fri, 15 Oct 2021 09:49:04 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 0e8de584cab513535693d0b78ee132e7bb48db93
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 8 22:40:30 2021 -0400
gnu: abseil-cpp: Remove googletest patch.
* gnu/packages/patches/abseil-cpp-fix-gtest.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/cpp.scm (abseil-cpp)[source]: Remove patch.
Co-authored-by: Greg Hogan <code@greghogan.com>
---
gnu/local.mk | 1 -
gnu/packages/cpp.scm | 5 +----
gnu/packages/patches/abseil-cpp-fix-gtest.patch | 16 ----------------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 09a2764..7a4db54 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -822,7 +822,6 @@ dist_patch_DATA =
\
%D%/packages/patches/abcl-fix-build-xml.patch \
%D%/packages/patches/ableton-link-system-libraries-debian.patch \
%D%/packages/patches/abiword-explictly-cast-bools.patch \
- %D%/packages/patches/abseil-cpp-fix-gtest.patch \
%D%/packages/patches/abseil-cpp-fix-strerror_test.patch \
%D%/packages/patches/adb-add-libraries.patch \
%D%/packages/patches/adb-libssl_11-compatibility.patch \
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index a9072af..0f56c50 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -757,11 +757,8 @@ point and then, after each tween step, plugging back the
result.")
(sha256
(base32
"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
- ;; Remove after next googletest release and update.
(patches
- (search-patches
- "abseil-cpp-fix-gtest.patch"
- "abseil-cpp-fix-strerror_test.patch"))))
+ (search-patches "abseil-cpp-fix-strerror_test.patch"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
diff --git a/gnu/packages/patches/abseil-cpp-fix-gtest.patch
b/gnu/packages/patches/abseil-cpp-fix-gtest.patch
deleted file mode 100644
index 3897144..0000000
--- a/gnu/packages/patches/abseil-cpp-fix-gtest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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);
-
- 44/115: gnu: gst-plugins-bad: Update to 1.19.2., (continued)
- 44/115: gnu: gst-plugins-bad: Update to 1.19.2., guix-commits, 2021/10/15
- 46/115: gnu: gst-libav: Update to 1.19.2., guix-commits, 2021/10/15
- 45/115: gnu: gst-plugins-ugly: Update to 1.19.2., guix-commits, 2021/10/15
- 48/115: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/15
- 50/115: gnu: lib2geom: Update to 1.1., guix-commits, 2021/10/15
- 51/115: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/15
- 52/115: Revert commits made to resolve a gdk-pixbuf+svg propagation issue., guix-commits, 2021/10/15
- 56/115: gnu: mozjs-78: Update to 78.13.0., guix-commits, 2021/10/15
- 53/115: gnu: googletest: Update to 1.11.0., guix-commits, 2021/10/15
- 55/115: gnu: abseil-cpp: Update to 20210324.2., guix-commits, 2021/10/15
- 54/115: gnu: abseil-cpp: Remove googletest patch.,
guix-commits <=
- 57/115: gnu: Add a missing copyright., guix-commits, 2021/10/15
- 64/115: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/15
- 65/115: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/15
- 59/115: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/15
- 67/115: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/15
- 73/115: bluez: Update to 5.61., guix-commits, 2021/10/15
- 61/115: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/15
- 58/115: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/15
- 60/115: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/15
- 63/115: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/15