From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eF2/H8j9TWGKjQAAgWs5BA (envelope-from ) for ; Fri, 24 Sep 2021 18:33:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GKd6G8j9TWHcWQAA1q6Kng (envelope-from ) for ; Fri, 24 Sep 2021 16:33:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E570AE6C7 for ; Fri, 24 Sep 2021 18:33:11 +0200 (CEST) Received: from localhost ([::1]:47638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTo8L-0004hS-Qq for larch@yhetil.org; Fri, 24 Sep 2021 12:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTo8F-0004hC-08 for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTo8E-0003jb-PK for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTo8E-00055Z-JM for guix-patches@gnu.org; Fri, 24 Sep 2021 12:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50783] [PATCH staging] Update googletest and abseil-cpp Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Sep 2021 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50783@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163250114819502 (code B ref -1); Fri, 24 Sep 2021 16:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2021 16:32:28 +0000 Received: from localhost ([127.0.0.1]:59144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTo7f-00054T-Uy for submit@debbugs.gnu.org; Fri, 24 Sep 2021 12:32:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:50992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTo7b-00054H-EN for submit@debbugs.gnu.org; Fri, 24 Sep 2021 12:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTo7b-0004aK-1F for guix-patches@gnu.org; Fri, 24 Sep 2021 12:32:23 -0400 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]:44626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTo7X-0003Er-1m for guix-patches@gnu.org; Fri, 24 Sep 2021 12:32:22 -0400 Received: by mail-il1-x133.google.com with SMTP id x2so10966854ila.11 for ; Fri, 24 Sep 2021 09:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=CHBraEkst+4122QC3l2UDVbatD+FW35UY4NkSWrKWMM=; b=EBZBT3JT3tQIGx7YuNW8NOnHSQXAad2SOdJ7GRoL+RIglhn3DLizLGXWN3I69rtFVB nBNpQw9seAmnCTCnGIqd0juKQxppohIzMurd/JDA9bxxpPgSCynL88UPXrltGK7AC2FU KFZkU5O/8jcWpCaLL3EiBK2zmRj4KdYdRh96qtR5nnktTdPDzBhBTakagZfF5RJdaXBb mvAA1zDKJcwG1IIobah0DPuyDM7CE80b0N+M4iwMS6L+g+kr2VaWe/PsSLSDb7ypBL6O E8uPStTvaiEGKK3pgEg7OlMZ9ZKZU/Ps4I2RcMJ3MRGbfgYFn3SuaVHLlSN+PmJMPwsj yEgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=CHBraEkst+4122QC3l2UDVbatD+FW35UY4NkSWrKWMM=; b=LaaqL4Tb7rUXWqT20tITC9Hi56pgG2zIxMNywRrkK9qQKw5gtp8ZU0LXCgNup8Cuc+ TyqXJSBEhD1VIJdzI/3Fotuk3EljOlw0FiWifX9DT3MojKAkNYKe/E6cjihhI4Vp4Pfa s0qJGSKhhaQxo+SL20n56rOnl2rrvtFh2diKo6fEsKY4mHJzkEMnlXMDIisr3pOqjzdU wuBcmn7341ulLpYBL7wbDZCcpwHspj2rVfVkX6q/Y3wuoJYB/ZOGZUwHpces4bBp895F 3tR8Q/pVB4dsFKFp6DarpBmvSktWz+VaqGBy6f4/ZKWn0j37+kAQLlpDNfpFaLmzJZ5i aAtA== X-Gm-Message-State: AOAM533wcoh85fe+EjykHx8D6rNXq0R+lkaezk8iw6Iouw/6Qp9vowzd Ugfb6wAAnnI3IIbBUaYviP5jLd3ITo6FDcnWI0DOxP0U7FnO8cwTuiY= X-Google-Smtp-Source: ABdhPJwhciG1eKOSgpYL2v3kvmSyDo/HUyupcjcSVR0lAe1CbqSWUT/ArMrQ5mSaICpUxNfO1JqNdUuoaBoth//vwXw= X-Received: by 2002:a05:6e02:158c:: with SMTP id m12mr9269005ilu.64.1632501137335; Fri, 24 Sep 2021 09:32:17 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Fri, 24 Sep 2021 12:32:06 -0400 Message-ID: Content-Type: multipart/mixed; boundary="00000000000063412a05ccc04a9b" Received-SPF: none client-ip=2607:f8b0:4864:20::133; envelope-from=code@greghogan.com; helo=mail-il1-x133.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632501192; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=UrzeSM9U5zeDfX2wq7WjOJ5oaCUgFTUoiowS6is0wh0=; b=Ckyd3hDoID+DCBJmrTC45TZJ/lZoFtaTPh+ad4uECNTLjVBYY++JkZkeFexZ+CYO3eWV87 Ts69xp2RtUu/QIuz1usW5eFHqsaZ3F5dYsJT+XT/AtJO0/YEjbeWyhxTyjQtitT08Yot6d 1BK7d4rT2+vcNeIiXFTWh4HRLhYjFosfjJfBP/qbxx9TRjLiLxdhuNk8+qqDqKZNBvXs5S hJPr8FPFkQ1gz4b0x8e05898DvDgeraMp1dYfXEHlsQ1xsXIRxSUPaKX4kKPTWlvjHcMn3 qk3h3AX/1Tedq2FOz7KrPyqHEO9h8cDhF33VILuuAnUEoeEz0TEb/5BDsKFbVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632501192; a=rsa-sha256; cv=none; b=N3NErftEjbvotDtrc6Gjapfdmla1i5feSBH5FGFRLzr2X/CiiDejmPcqgjxXexevu4vqiI XvuU+W9/sWfreUSWIYTOumagmnX0IEcPRmrSAEQ9ljAZwqgtmMPy/uJxSlFLkldxVzKgra iOPtYTOjGDDPZnQ9GXVQGLZ0YpxT48hcWVJeeuTxoUyfapOvwiCBAFA3iTF8mGmxk1rxGB a9lNkeptGo5n7KnjC3SKlLFXHd+VK9Bwl94cZylUNQJywgKYy7Lp4QfjXci9cSEZUP8TQK fnzMOzM4rqUy4+q8etNHChJHYM4p+m2F0wiQfXR19CPgh7fgY3EO5DZz2C++6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=EBZBT3JT; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=greghogan-com.20210112.gappssmtp.com header.s=20210112 header.b=EBZBT3JT; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E570AE6C7 X-Spam-Score: -1.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: RSbtowkqgzRA --00000000000063412a05ccc04a9b Content-Type: multipart/alternative; boundary="00000000000063412905ccc04a99" --00000000000063412905ccc04a99 Content-Type: text/plain; charset="UTF-8" googletest has 350 dependent packages. abseil-cpp now requires a newer release of googletest. >From cb6fbe064c34af02f60c30f8b00163ea1a74489b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 14 Sep 2021 13:19:29 +0000 Subject: [PATCH 1/2] gnu: googletest: Update to 1.11.0. * gnu/packages/check.scm (googletest): Update to 1.11.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b49f9de157..622aa5afa3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -676,7 +676,7 @@ test coverage and has a web user interface that will refresh automatically.") (define-public googletest (package (name "googletest") - (version "1.10.0") + (version "1.11.0") (source (origin (method git-fetch) @@ -685,7 +685,7 @@ test coverage and has a web user interface that will refresh automatically.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz")))) + (base32 "0pd4y1gpx1z8fiyarkvqlmk6hbv0lc8fr00ivnsvqzi1xg34jfaa")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) -- 2.33.0 >From 9ef812ad1c7de0e0254af5ca75c8167b39bc67b1 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 30 Mar 2021 13:16:22 +0000 Subject: [PATCH 2/2] gnu: abseil-cpp: Update to 20210324.2. * gnu/packages/cpp.scm (abseil-cpp): Update to 20210324.2. [source]: Remove patches. [arguments]: Update configure flags. * gnu/packages/patches/abseil-cpp-fix.patch, gnu/packages/patches/abseil-cpp-fix-strerror_test.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Deregister them. --- gnu/local.mk | 2 - gnu/packages/cpp.scm | 11 ++--- .../patches/abseil-cpp-fix-gtest.patch | 16 ------- .../abseil-cpp-fix-strerror_test.patch | 42 ------------------- 4 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/abseil-cpp-fix-gtest.patch delete mode 100644 gnu/packages/patches/abseil-cpp-fix-strerror_test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7d706f6f6e..6a1c1e209d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -805,8 +805,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 \ %D%/packages/patches/aegis-constness-error.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4af71ba93a..40378f0499 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -744,7 +744,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200923.3") + (version "20210324.2") (source (origin (method git-fetch) (uri (git-reference @@ -753,16 +753,11 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl")) - ;; Remove after next googletest release and update. - (patches - (search-patches - "abseil-cpp-fix-gtest.patch" - "abseil-cpp-fix-strerror_test.patch")))) + "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" - "-DABSL_RUN_TESTS=ON" + "-DBUILD_TESTING=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" ;; Needed, else we get errors like: ;; 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 38971448f3..0000000000 --- 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); - diff --git a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch deleted file mode 100644 index 726149b015..0000000000 --- a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon Sep 17 00:00:00 2001 -diff --git a/absl/base/internal/strerror.cc b/absl/base/internal/strerror.cc -index d66ba120..0d6226fd 100644 ---- a/absl/base/internal/strerror.cc -+++ b/absl/base/internal/strerror.cc -@@ -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t buflen) { - } - - std::string StrErrorInternal(int errnum) { -- absl::base_internal::ErrnoSaver errno_saver; - char buf[100]; - const char* str = StrErrorAdaptor(errnum, buf, sizeof buf); - if (*str == '\0') { -@@ -76,6 +75,7 @@ std::array* NewStrErrorTable() { - } // namespace - - std::string StrError(int errnum) { -+ absl::base_internal::ErrnoSaver errno_saver; - static const auto* table = NewStrErrorTable(); - if (errnum >= 0 && errnum < static_cast(table->size())) { - return (*table)[errnum]; -diff --git a/absl/base/internal/strerror_test.cc b/absl/base/internal/strerror_test.cc -index a53da97f..e32d5b5c 100644 ---- a/absl/base/internal/strerror_test.cc -+++ b/absl/base/internal/strerror_test.cc -@@ -62,12 +62,14 @@ TEST(StrErrorTest, MultipleThreads) { - ++counter; - errno = ERANGE; - const std::string value = absl::base_internal::StrError(i); -+ // EXPECT_* could change errno. Stash it first. -+ int check_err = errno; -+ EXPECT_THAT(check_err, Eq(ERANGE)); - // Only the GNU implementation is guaranteed to provide the - // string "Unknown error nnn". POSIX doesn't say anything. - if (!absl::StartsWith(value, "Unknown error ")) { -- EXPECT_THAT(absl::base_internal::StrError(i), Eq(expected_strings[i])); -+ EXPECT_THAT(value, Eq(expected_strings[i])); - } -- EXPECT_THAT(errno, Eq(ERANGE)); - } - }; - -- 2.33.0 --00000000000063412905ccc04a99 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
googletest has 350 dependent packages.

= abseil-cpp now requires a newer release of googletest.

From cb6fbe064c34af02f60c30f8b00163ea1a74489b Mon Sep 17 00:00:00 2= 001
From: Greg Hogan <code@greg= hogan.com>
Date: Tue, 14 Sep 2021 13:19:29 +0000
Subject: [PAT= CH 1/2] gnu: googletest: Update to 1.11.0.

* gnu/packages/check.scm = (googletest): Update to 1.11.0.
---
=C2=A0gnu/packages/check.scm | 4 = ++--
=C2=A01 file changed, 2 insertions(+), 2 deletions(-)

diff -= -git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b49f9de157.= .622aa5afa3 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/ch= eck.scm
@@ -676,7 +676,7 @@ test coverage and has a web user interface t= hat will refresh automatically.")
=C2=A0(define-public googletest=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "googletest"= )
- =C2=A0 =C2=A0(version "1.10.0")
+ =C2=A0 =C2=A0(version= "1.11.0")
=C2=A0 =C2=A0 =C2=A0(source
=C2=A0 =C2=A0 =C2=A0= (origin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (method git-fetch)
@@ -685,7 +68= 5,7 @@ test coverage and has a web user interface that will refresh automat= ically.")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (commit = (string-append "release-" version))))
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 (file-name (git-file-name name version))
=C2=A0 =C2=A0 =C2=A0 =C2=A0= (sha256
- =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32 "1zbmab9295scgg4z2vcl= gfgjchfjailjnvzc6f5x9jvlsdi3dpwz"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= (base32 "0pd4y1gpx1z8fiyarkvqlmk6hbv0lc8fr00ivnsvqzi1xg34jfaa")))= )
=C2=A0 =C2=A0 =C2=A0(build-system cmake-build-system)
=C2=A0 =C2=A0= =C2=A0(arguments
=C2=A0 =C2=A0 =C2=A0 `(#:configure-flags '("-= DBUILD_SHARED_LIBS=3DON")))
--
2.33.0

<= /div>


From 9ef812ad1c7de0e0254af5ca75c816= 7b39bc67b1 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 30 Mar 2021= 13:16:22 +0000
Subject: [PATCH 2/2] gnu: abseil-cpp: Update to 20210324= .2.

* gnu/packages/cpp.scm (abseil-cpp): Update to 20210324.2.
[s= ource]: Remove patches.
[arguments]: Update configure flags.
* gnu/pa= ckages/patches/abseil-cpp-fix.patch,
gnu/packages/patches/abseil-cpp-fix= -strerror_test.patch: Delete files.
* gnu/lo= cal.mk (dist_patch_DATA): Deregister them.
---
=C2=A0gnu/local.mk =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| =C2=A02 -
=C2=A0gnu/packages/cpp.scm =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 11 ++---=C2=A0.../patches/abseil-cpp-fix-gtest.patch =C2=A0 =C2=A0 =C2=A0 =C2=A0| = 16 -------
=C2=A0.../abseil-cpp-fix-strerror_test.patch =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 42 -------------------
=C2=A04 files changed, 3 insertion= s(+), 68 deletions(-)
=C2=A0delete mode 100644 gnu/packages/patches/abse= il-cpp-fix-gtest.patch
=C2=A0delete mode 100644 gnu/packages/patches/abs= eil-cpp-fix-strerror_test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
ind= ex 7d706f6f6e..6a1c1e209d 100644
--- a/gnu/l= ocal.mk
+++ b/gnu/local.mk
@@ -80= 5,8 +805,6 @@ dist_patch_DATA =3D \
=C2=A0 =C2=A0%D%/packages/patch= es/abcl-fix-build-xml.patch \
=C2=A0 =C2=A0%D%/packages/patches/ableton-= link-system-libraries-debian.patch \
=C2=A0 =C2=A0%D%/packages/patches/a= biword-explictly-cast-bools.patch \
- =C2=A0%D%/packages/patches/abseil-= cpp-fix-gtest.patch \
- =C2=A0%D%/packages/patches/abseil-cpp-fix-strer= ror_test.patch \
=C2=A0 =C2=A0%D%/packages/patches/adb-add-libraries.pat= ch \
=C2=A0 =C2=A0%D%/packages/patches/adb-libssl_11-compatibility.pat= ch \
=C2=A0 =C2=A0%D%/packages/patches/aegis-constness-error.patch =C2= =A0 =C2=A0 =C2=A0 =C2=A0 \
diff --git a/gnu/packages/cpp.scm b/gnu/pack= ages/cpp.scm
index 4af71ba93a..40378f0499 100644
--- a/gnu/packages/c= pp.scm
+++ b/gnu/packages/cpp.scm
@@ -744,7 +744,7 @@ point and then,= after each tween step, plugging back the result.")
=C2=A0(define-p= ublic abseil-cpp
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name &quo= t;abseil-cpp")
- =C2=A0 =C2=A0(version "20200923.3")
+= =C2=A0 =C2=A0(version "20210324.2")
=C2=A0 =C2=A0 =C2=A0(sour= ce (origin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(metho= d git-fetch)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri= (git-reference
@@ -753,16 +753,11 @@ point and then, after each tween s= tep, plugging back the result.")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(file-name (git-file-name name version))
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"1p4djhm1f011ficbjjxx3n8428p8481p20j= 4glpaawnpsi362hkl"))
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0;; Remove after next googletest release and update.
- =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(patches
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 (search-patches
- =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"abseil-cpp-fix-gtest.patch"
- = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"abseil-cpp-fix= -strerror_test.patch"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x= "))))
=C2=A0 =C2=A0 =C2=A0(build-system cmake-build-system)
=C2= =A0 =C2=A0 =C2=A0(arguments
=C2=A0 =C2=A0 =C2=A0 `(#:configure-flags (li= st "-DBUILD_SHARED_LIBS=3DON"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "-DABSL_RUN_TESTS=3DON"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= quot;-DBUILD_TESTING=3DON"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= quot;-DABSL_USE_EXTERNAL_GOOGLETEST=3DON"
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 ;; Needed, else we get errors like:
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ;;
diff --git a/gnu/packages/patches/abseil-cpp-fix-gt= est.patch b/gnu/packages/patches/abseil-cpp-fix-gtest.patch
deleted file= mode 100644
index 38971448f3..0000000000
--- a/gnu/packages/patches/= abseil-cpp-fix-gtest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The GTE= ST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest
= -in commit 0b024bd9 on master. It has been used in an abseil-cpp release be= fore
-a googletest release.
-
---- a/absl/container/internal/unord= ered_map_modifiers_test.h
-+++ b/absl/container/internal/unordered_map_m= odifiers_test.h
-@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : publ= ic ::testing::Test {
- =C2=A0 }
- };
-
-+#ifdef GTEST_ALLOW_UNI= NSTANTIATED_PARAMETERIZED_TEST
- GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZE= D_TEST(UniquePtrModifiersTest);
-+#endif
-
- TYPED_TEST_SUITE_P(Un= iquePtrModifiersTest);
-
diff --git a/gnu/packages/patches/abseil-cpp= -fix-strerror_test.patch b/gnu/packages/patches/abseil-cpp-fix-strerror_tes= t.patch
deleted file mode 100644
index 726149b015..0000000000
--- = a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch
+++ /dev/null<= br>@@ -1,42 +0,0 @@
-From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon S= ep 17 00:00:00 2001
-diff --git a/absl/base/internal/strerror.cc b/absl/= base/internal/strerror.cc
-index d66ba120..0d6226fd 100644
---- a/abs= l/base/internal/strerror.cc
-+++ b/absl/base/internal/strerror.cc
-@@= -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t b= uflen) {
- }
-
- std::string StrErrorInternal(int errnum) {
--= =C2=A0absl::base_internal::ErrnoSaver errno_saver;
- =C2=A0 char buf[10= 0];
- =C2=A0 const char* str =3D StrErrorAdaptor(errnum, buf, sizeof buf= );
- =C2=A0 if (*str =3D=3D '\0') {
-@@ -76,6 +75,7 @@ std::a= rray<std::string, kSysNerr>* NewStrErrorTable() {
- } =C2=A0// nam= espace
-
- std::string StrError(int errnum) {
-+ =C2=A0absl::base= _internal::ErrnoSaver errno_saver;
- =C2=A0 static const auto* table =3D= NewStrErrorTable();
- =C2=A0 if (errnum >=3D 0 && errnum <= ; static_cast<int>(table->size())) {
- =C2=A0 =C2=A0 return (*t= able)[errnum];
-diff --git a/absl/base/internal/strerror_test.cc b/absl/= base/internal/strerror_test.cc
-index a53da97f..e32d5b5c 100644
---- = a/absl/base/internal/strerror_test.cc
-+++ b/absl/base/internal/strerror= _test.cc
-@@ -62,12 +62,14 @@ TEST(StrErrorTest, MultipleThreads) {
-= =C2=A0 =C2=A0 =C2=A0 ++counter;
- =C2=A0 =C2=A0 =C2=A0 errno =3D ERANGE= ;
- =C2=A0 =C2=A0 =C2=A0 const std::string value =3D absl::base_internal= ::StrError(i);
-+ =C2=A0 =C2=A0 =C2=A0// EXPECT_* could change errno. St= ash it first.
-+ =C2=A0 =C2=A0 =C2=A0int check_err =3D errno;
-+ =C2= =A0 =C2=A0 =C2=A0EXPECT_THAT(check_err, Eq(ERANGE));
- =C2=A0 =C2=A0 =C2= =A0 // Only the GNU implementation is guaranteed to provide the
- =C2=A0= =C2=A0 =C2=A0 // string "Unknown error nnn". POSIX doesn't s= ay anything.
- =C2=A0 =C2=A0 =C2=A0 if (!absl::StartsWith(value, "U= nknown error ")) {
-- =C2=A0 =C2=A0 =C2=A0 =C2=A0EXPECT_THAT(absl::= base_internal::StrError(i), Eq(expected_strings[i]));
-+ =C2=A0 =C2=A0 = =C2=A0 =C2=A0EXPECT_THAT(value, Eq(expected_strings[i]));
- =C2=A0 =C2= =A0 =C2=A0 }
-- =C2=A0 =C2=A0 =C2=A0EXPECT_THAT(errno, Eq(ERANGE));
-= =C2=A0 =C2=A0 }
- =C2=A0 };
-
--
2.33.0
--00000000000063412905ccc04a99-- --00000000000063412a05ccc04a9b Content-Type: application/octet-stream; name="0002-gnu-abseil-cpp-Update-to-20210324.2.patch" Content-Disposition: attachment; filename="0002-gnu-abseil-cpp-Update-to-20210324.2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ktykytg70 RnJvbSA5ZWY4MTJhZDFjN2RlMGUwMjU0YWY1Y2E3NWM4MTY3YjM5YmM2N2IxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFR1ZSwgMzAgTWFyIDIwMjEgMTM6MTY6MjIgKzAwMDAKU3ViamVjdDogW1BBVENIIDIvMl0gZ251 OiBhYnNlaWwtY3BwOiBVcGRhdGUgdG8gMjAyMTAzMjQuMi4KCiogZ251L3BhY2thZ2VzL2NwcC5z Y20gKGFic2VpbC1jcHApOiBVcGRhdGUgdG8gMjAyMTAzMjQuMi4KW3NvdXJjZV06IFJlbW92ZSBw YXRjaGVzLgpbYXJndW1lbnRzXTogVXBkYXRlIGNvbmZpZ3VyZSBmbGFncy4KKiBnbnUvcGFja2Fn ZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRjaCwKZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJz ZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaDogRGVsZXRlIGZpbGVzLgoqIGdudS9sb2Nh bC5tayAoZGlzdF9wYXRjaF9EQVRBKTogRGVyZWdpc3RlciB0aGVtLgotLS0KIGdudS9sb2NhbC5t ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAyIC0KIGdudS9wYWNrYWdlcy9j cHAuc2NtICAgICAgICAgICAgICAgICAgICAgICAgICB8IDExICsrLS0tCiAuLi4vcGF0Y2hlcy9h YnNlaWwtY3BwLWZpeC1ndGVzdC5wYXRjaCAgICAgICAgfCAxNiAtLS0tLS0tCiAuLi4vYWJzZWls LWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaCAgICAgICAgfCA0MiAtLS0tLS0tLS0tLS0tLS0t LS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCiBk ZWxldGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtZ3Rl c3QucGF0Y2gKIGRlbGV0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwt Y3BwLWZpeC1zdHJlcnJvcl90ZXN0LnBhdGNoCgpkaWZmIC0tZ2l0IGEvZ251L2xvY2FsLm1rIGIv Z251L2xvY2FsLm1rCmluZGV4IDdkNzA2ZjZmNmUuLjZhMWMxZTIwOWQgMTAwNjQ0Ci0tLSBhL2du dS9sb2NhbC5taworKysgYi9nbnUvbG9jYWwubWsKQEAgLTgwNSw4ICs4MDUsNiBAQCBkaXN0X3Bh dGNoX0RBVEEgPQkJCQkJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJjbC1maXgtYnVpbGQt eG1sLnBhdGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJsZXRvbi1saW5rLXN5c3RlbS1s aWJyYXJpZXMtZGViaWFuLnBhdGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJpd29yZC1l eHBsaWN0bHktY2FzdC1ib29scy5wYXRjaAlcCi0gICVEJS9wYWNrYWdlcy9wYXRjaGVzL2Fic2Vp bC1jcHAtZml4LWd0ZXN0LnBhdGNoCQlcCi0gICVEJS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1j cHAtZml4LXN0cmVycm9yX3Rlc3QucGF0Y2gJXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9hZGIt YWRkLWxpYnJhcmllcy5wYXRjaAkJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWRiLWxpYnNz bF8xMS1jb21wYXRpYmlsaXR5LnBhdGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWVnaXMt Y29uc3RuZXNzLWVycm9yLnBhdGNoICAgICAgICAgCVwKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdl cy9jcHAuc2NtIGIvZ251L3BhY2thZ2VzL2NwcC5zY20KaW5kZXggNGFmNzFiYTkzYS4uNDAzNzhm MDQ5OSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2NwcC5zY20KKysrIGIvZ251L3BhY2thZ2Vz L2NwcC5zY20KQEAgLTc0NCw3ICs3NDQsNyBAQCBwb2ludCBhbmQgdGhlbiwgYWZ0ZXIgZWFjaCB0 d2VlbiBzdGVwLCBwbHVnZ2luZyBiYWNrIHRoZSByZXN1bHQuIikKIChkZWZpbmUtcHVibGljIGFi c2VpbC1jcHAKICAgKHBhY2thZ2UKICAgICAobmFtZSAiYWJzZWlsLWNwcCIpCi0gICAgKHZlcnNp b24gIjIwMjAwOTIzLjMiKQorICAgICh2ZXJzaW9uICIyMDIxMDMyNC4yIikKICAgICAoc291cmNl IChvcmlnaW4KICAgICAgICAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCiAgICAgICAgICAgICAg ICh1cmkgKGdpdC1yZWZlcmVuY2UKQEAgLTc1MywxNiArNzUzLDExIEBAIHBvaW50IGFuZCB0aGVu LCBhZnRlciBlYWNoIHR3ZWVuIHN0ZXAsIHBsdWdnaW5nIGJhY2sgdGhlIHJlc3VsdC4iKQogICAg ICAgICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAg ICAgICAgICAgIChzaGEyNTYKICAgICAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICAg ICAiMXA0ZGpobTFmMDExZmljYmpqeHgzbjg0MjhwODQ4MXAyMGo0Z2xwYWF3bnBzaTM2MmhrbCIp KQotICAgICAgICAgICAgICA7OyBSZW1vdmUgYWZ0ZXIgbmV4dCBnb29nbGV0ZXN0IHJlbGVhc2Ug YW5kIHVwZGF0ZS4KLSAgICAgICAgICAgICAgKHBhdGNoZXMKLSAgICAgICAgICAgICAgIChzZWFy Y2gtcGF0Y2hlcwotICAgICAgICAgICAgICAgICJhYnNlaWwtY3BwLWZpeC1ndGVzdC5wYXRjaCIK LSAgICAgICAgICAgICAgICAiYWJzZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaCIpKSkp CisgICAgICAgICAgICAgICAgIjBnOXJiaGszbXdqZGZ4azdjc2NkMDR2bThmcGhkNWZsejl5eWtw Z3Z5eTFud2EzNHprM3giKSkpKQogICAgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVt KQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncyAobGlzdCAiLURCVUlM RF9TSEFSRURfTElCUz1PTiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLURBQlNM X1JVTl9URVNUUz1PTiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLURCVUlMRF9U RVNUSU5HPU9OIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICItREFCU0xfVVNFX0VY VEVSTkFMX0dPT0dMRVRFU1Q9T04iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsg TmVlZGVkLCBlbHNlIHdlIGdldCBlcnJvcnMgbGlrZToKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA7OwpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1m aXgtZ3Rlc3QucGF0Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC1ndGVz dC5wYXRjaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzg5NzE0NDhmMy4uMDAwMDAw MDAwMAotLS0gYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC1ndGVzdC5wYXRj aAorKysgL2Rldi9udWxsCkBAIC0xLDE2ICswLDAgQEAKLVRoZSBHVEVTVF9BTExPV19VTklOU1RB TlRJQVRFRF9QQVJBTVRFUklaRURfVEVTVCBtYWNybyB3YXMgYWRkZWQgdG8gZ29vZ2xldGVzdAot aW4gY29tbWl0IDBiMDI0YmQ5IG9uIG1hc3Rlci4gSXQgaGFzIGJlZW4gdXNlZCBpbiBhbiBhYnNl aWwtY3BwIHJlbGVhc2UgYmVmb3JlCi1hIGdvb2dsZXRlc3QgcmVsZWFzZS4KLQotLS0tIGEvYWJz bC9jb250YWluZXIvaW50ZXJuYWwvdW5vcmRlcmVkX21hcF9tb2RpZmllcnNfdGVzdC5oCi0rKysg Yi9hYnNsL2NvbnRhaW5lci9pbnRlcm5hbC91bm9yZGVyZWRfbWFwX21vZGlmaWVyc190ZXN0LmgK LUBAIC0yODYsNyArMjg2LDkgQEAgY2xhc3MgVW5pcXVlUHRyTW9kaWZpZXJzVGVzdCA6IHB1Ymxp YyA6OnRlc3Rpbmc6OlRlc3QgewotICAgfQotIH07Ci0KLSsjaWZkZWYgR1RFU1RfQUxMT1dfVU5J TlNUQU5USUFURURfUEFSQU1FVEVSSVpFRF9URVNUCi0gR1RFU1RfQUxMT1dfVU5JTlNUQU5USUFU RURfUEFSQU1FVEVSSVpFRF9URVNUKFVuaXF1ZVB0ck1vZGlmaWVyc1Rlc3QpOwotKyNlbmRpZgot Ci0gVFlQRURfVEVTVF9TVUlURV9QKFVuaXF1ZVB0ck1vZGlmaWVyc1Rlc3QpOwotCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC1zdHJlcnJvcl90ZXN0LnBh dGNoIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5w YXRjaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNzI2MTQ5YjAxNS4uMDAwMDAwMDAw MAotLS0gYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC1zdHJlcnJvcl90ZXN0 LnBhdGNoCisrKyAvZGV2L251bGwKQEAgLTEsNDIgKzAsMCBAQAotRnJvbSBlMmIxYmFiMTlhNzgy Y2I2MmJiMDEwZDFjMjkyNWFiNzMxNGZiMTEzIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQotZGlm ZiAtLWdpdCBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJvci5jYyBiL2Fic2wvYmFzZS9pbnRl cm5hbC9zdHJlcnJvci5jYwotaW5kZXggZDY2YmExMjAuLjBkNjIyNmZkIDEwMDY0NAotLS0tIGEv YWJzbC9iYXNlL2ludGVybmFsL3N0cmVycm9yLmNjCi0rKysgYi9hYnNsL2Jhc2UvaW50ZXJuYWwv c3RyZXJyb3IuY2MKLUBAIC01MSw3ICs1MSw2IEBAIGNvbnN0IGNoYXIqIFN0ckVycm9yQWRhcHRv cihpbnQgZXJybnVtLCBjaGFyKiBidWYsIHNpemVfdCBidWZsZW4pIHsKLSB9Ci0gCi0gc3RkOjpz dHJpbmcgU3RyRXJyb3JJbnRlcm5hbChpbnQgZXJybnVtKSB7Ci0tICBhYnNsOjpiYXNlX2ludGVy bmFsOjpFcnJub1NhdmVyIGVycm5vX3NhdmVyOwotICAgY2hhciBidWZbMTAwXTsKLSAgIGNvbnN0 IGNoYXIqIHN0ciA9IFN0ckVycm9yQWRhcHRvcihlcnJudW0sIGJ1Ziwgc2l6ZW9mIGJ1Zik7Ci0g ICBpZiAoKnN0ciA9PSAnXDAnKSB7Ci1AQCAtNzYsNiArNzUsNyBAQCBzdGQ6OmFycmF5PHN0ZDo6 c3RyaW5nLCBrU3lzTmVycj4qIE5ld1N0ckVycm9yVGFibGUoKSB7Ci0gfSAgLy8gbmFtZXNwYWNl Ci0gCi0gc3RkOjpzdHJpbmcgU3RyRXJyb3IoaW50IGVycm51bSkgewotKyAgYWJzbDo6YmFzZV9p bnRlcm5hbDo6RXJybm9TYXZlciBlcnJub19zYXZlcjsKLSAgIHN0YXRpYyBjb25zdCBhdXRvKiB0 YWJsZSA9IE5ld1N0ckVycm9yVGFibGUoKTsKLSAgIGlmIChlcnJudW0gPj0gMCAmJiBlcnJudW0g PCBzdGF0aWNfY2FzdDxpbnQ+KHRhYmxlLT5zaXplKCkpKSB7Ci0gICAgIHJldHVybiAoKnRhYmxl KVtlcnJudW1dOwotZGlmZiAtLWdpdCBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJvcl90ZXN0 LmNjIGIvYWJzbC9iYXNlL2ludGVybmFsL3N0cmVycm9yX3Rlc3QuY2MKLWluZGV4IGE1M2RhOTdm Li5lMzJkNWI1YyAxMDA2NDQKLS0tLSBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJvcl90ZXN0 LmNjCi0rKysgYi9hYnNsL2Jhc2UvaW50ZXJuYWwvc3RyZXJyb3JfdGVzdC5jYwotQEAgLTYyLDEy ICs2MiwxNCBAQCBURVNUKFN0ckVycm9yVGVzdCwgTXVsdGlwbGVUaHJlYWRzKSB7Ci0gICAgICAg Kytjb3VudGVyOwotICAgICAgIGVycm5vID0gRVJBTkdFOwotICAgICAgIGNvbnN0IHN0ZDo6c3Ry aW5nIHZhbHVlID0gYWJzbDo6YmFzZV9pbnRlcm5hbDo6U3RyRXJyb3IoaSk7Ci0rICAgICAgLy8g RVhQRUNUXyogY291bGQgY2hhbmdlIGVycm5vLiBTdGFzaCBpdCBmaXJzdC4KLSsgICAgICBpbnQg Y2hlY2tfZXJyID0gZXJybm87Ci0rICAgICAgRVhQRUNUX1RIQVQoY2hlY2tfZXJyLCBFcShFUkFO R0UpKTsKLSAgICAgICAvLyBPbmx5IHRoZSBHTlUgaW1wbGVtZW50YXRpb24gaXMgZ3VhcmFudGVl ZCB0byBwcm92aWRlIHRoZQotICAgICAgIC8vIHN0cmluZyAiVW5rbm93biBlcnJvciBubm4iLiBQ T1NJWCBkb2Vzbid0IHNheSBhbnl0aGluZy4KLSAgICAgICBpZiAoIWFic2w6OlN0YXJ0c1dpdGgo dmFsdWUsICJVbmtub3duIGVycm9yICIpKSB7Ci0tICAgICAgICBFWFBFQ1RfVEhBVChhYnNsOjpi YXNlX2ludGVybmFsOjpTdHJFcnJvcihpKSwgRXEoZXhwZWN0ZWRfc3RyaW5nc1tpXSkpOwotKyAg ICAgICAgRVhQRUNUX1RIQVQodmFsdWUsIEVxKGV4cGVjdGVkX3N0cmluZ3NbaV0pKTsKLSAgICAg ICB9Ci0tICAgICAgRVhQRUNUX1RIQVQoZXJybm8sIEVxKEVSQU5HRSkpOwotICAgICB9Ci0gICB9 OwotIAotLSAKMi4zMy4wCgo= --00000000000063412a05ccc04a9b Content-Type: application/octet-stream; name="0001-gnu-googletest-Update-to-1.11.0.patch" Content-Disposition: attachment; filename="0001-gnu-googletest-Update-to-1.11.0.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ktykywij1 RnJvbSBjYjZmYmUwNjRjMzRhZjAyZjYwYzMwZjhiMDAxNjNlYTFhNzQ0ODliIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFR1ZSwgMTQgU2VwIDIwMjEgMTM6MTk6MjkgKzAwMDAKU3ViamVjdDogW1BBVENIIDEvMl0gZ251 OiBnb29nbGV0ZXN0OiBVcGRhdGUgdG8gMS4xMS4wLgoKKiBnbnUvcGFja2FnZXMvY2hlY2suc2Nt IChnb29nbGV0ZXN0KTogVXBkYXRlIHRvIDEuMTEuMC4KLS0tCiBnbnUvcGFja2FnZXMvY2hlY2su c2NtIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jaGVjay5zY20gYi9nbnUvcGFja2FnZXMv Y2hlY2suc2NtCmluZGV4IGI0OWY5ZGUxNTcuLjYyMmFhNWFmYTMgMTAwNjQ0Ci0tLSBhL2dudS9w YWNrYWdlcy9jaGVjay5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NoZWNrLnNjbQpAQCAtNjc2LDcg KzY3Niw3IEBAIHRlc3QgY292ZXJhZ2UgYW5kIGhhcyBhIHdlYiB1c2VyIGludGVyZmFjZSB0aGF0 IHdpbGwgcmVmcmVzaCBhdXRvbWF0aWNhbGx5LiIpCiAoZGVmaW5lLXB1YmxpYyBnb29nbGV0ZXN0 CiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImdvb2dsZXRlc3QiKQotICAgICh2ZXJzaW9uICIxLjEw LjAiKQorICAgICh2ZXJzaW9uICIxLjExLjAiKQogICAgIChzb3VyY2UKICAgICAgKG9yaWdpbgog ICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQpAQCAtNjg1LDcgKzY4NSw3IEBAIHRlc3QgY292ZXJh Z2UgYW5kIGhhcyBhIHdlYiB1c2VyIGludGVyZmFjZSB0aGF0IHdpbGwgcmVmcmVzaCBhdXRvbWF0 aWNhbGx5LiIpCiAgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAicmVsZWFzZS0i IHZlcnNpb24pKSkpCiAgICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNp b24pKQogICAgICAgIChzaGEyNTYKLSAgICAgICAgKGJhc2UzMiAiMXpibWFiOTI5NXNjZ2c0ejJ2 Y2xnZmdqY2hmamFpbGpudnpjNmY1eDlqdmxzZGkzZHB3eiIpKSkpCisgICAgICAgIChiYXNlMzIg IjBwZDR5MWdweDF6OGZpeWFya3ZxbG1rNmhidjBsYzhmcjAwaXZuc3ZxemkxeGczNGpmYWEiKSkp KQogICAgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMK ICAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncyAnKCItREJVSUxEX1NIQVJFRF9MSUJTPU9OIikpKQot LSAKMi4zMy4wCgo= --00000000000063412a05ccc04a9b--