From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 11 16:16:41 2021 Received: (at 45842) by debbugs.gnu.org; 11 Mar 2021 21:16:41 +0000 Received: from localhost ([127.0.0.1]:55036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKSfg-0004O2-IS for submit@debbugs.gnu.org; Thu, 11 Mar 2021 16:16:41 -0500 Received: from mail-il1-f180.google.com ([209.85.166.180]:33259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKSfe-0004Np-I8 for 45842@debbugs.gnu.org; Thu, 11 Mar 2021 16:16:39 -0500 Received: by mail-il1-f180.google.com with SMTP id r7so697108ilb.0 for <45842@debbugs.gnu.org>; Thu, 11 Mar 2021 13:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=bxMjU7ACnq/CARQqz2QgFOecGa93tszpFqsIiS2Bw70=; b=Zfj5xO9Xht6CXubzexeKdJXh2Vl/yjnTCbjDXIR0oih8IoponHz6twxiJ6rlGSOrny RSS8yRJepomxQ1yjci/tkpaJQvnv4RqUlN5kf1iCr/81O2ikhAnPpfDnaiYaei989l6D ZIbXVyQJh6krpGyfYbIeXunb0NEpZIpf1dWcZbjcqKTqsLcok32RHy6gNz8CdPp5Ksm6 ERIpJKQ1PbO00bsMGTR+geQR1y2NmZVgoXWZoNP9Uh/mBxIcGaaR5guYVkAQ6MC7k5H6 2LpCUW2x/drAcsH2BCUms0WaNbqaI0qLn51aAnJrvk90Rt+i0yAZGUzVQbZa1ZSzZbeR qTHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=bxMjU7ACnq/CARQqz2QgFOecGa93tszpFqsIiS2Bw70=; b=QmVbIhSgZl5zSX+3qk0tyckJCi50kS1g5TZrT7ixwHe9GdfDEbQAjm6XbfVd9E5toq cnfEdRn2mJz6KTa6x5FRa7FCLt4fLGTZTKsE0qvDF5v0v/B9lscPrG0ncoEuej8FLfBj Dyyk6qt2qriXcSuD03gSYRNnsAkbZ0zR/MJIoVwzcSiQGKTRVPATrtxS+AEkcLdclUVE ZApgo77kq6fmj5YI9EgCPlbfvdIDXRtv5OseXUpjclInRXT/403qPLKa+MJ9Jvxk3IM9 VyzgUzWZtyKfMutyNoaT8ZRe4WVYvx7+shvT0kp328lXDKo4pKXOyGelY+wb3IV5dTUW i3RQ== X-Gm-Message-State: AOAM533L69NcArETdHZzTIJRbp2lZBg87ILqTVOG6hPt/MfV0SOU3PIj NqEZ4dyYlcMrVU4a3SfRm99JMd9mATc2IuMha+n82y/yGdiTEdnD X-Google-Smtp-Source: ABdhPJwHaUyIY700UMnHs24NeyXFeq52b1bz3bAK2+EDcQPP9/j+hlRwBjxCvBMi4liNmMaBWS64hwewZZlu73QWGsg= X-Received: by 2002:a92:d58f:: with SMTP id a15mr308260iln.257.1615497392473; Thu, 11 Mar 2021 13:16:32 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Greg Hogan Date: Thu, 11 Mar 2021 16:16:21 -0500 Message-ID: Subject: Re: bug#45842: Acknowledgement ([PATCH] gnu: abseil-cpp: Update to 20200923.2.) To: 45842@debbugs.gnu.org Content-Type: multipart/mixed; boundary="00000000000036f68805bd494c4c" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45842 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000036f68805bd494c4c Content-Type: multipart/alternative; boundary="00000000000036f68505bd494c4a" --00000000000036f68505bd494c4a Content-Type: text/plain; charset="UTF-8" A second patch from an unreleased upstream commit, which for me is necessary to build the first patch off Guix master. On Mon, Feb 1, 2021 at 9:14 AM Greg Hogan wrote: > Another version bump. > > From 4153f16143405a4439cabe8c13f3b75440e1f1cc Mon Sep 17 00:00:00 2001 > From: Greg Hogan > Date: Mon, 1 Feb 2021 14:01:11 +0000 > Subject: [PATCH] gnu: abseil-cpp: Update to 20200923.3. > > * gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.3. > [arguments]: Enable external googletest. > * gnu/packages/patches/abseil-cpp-fix.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > --- > gnu/local.mk | 1 + > gnu/packages/cpp.scm | 7 +++++-- > gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++ > 3 files changed, 22 insertions(+), 2 deletions(-) > create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index e93425f394..0dba1b5855 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -783,6 +783,7 @@ 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.patch \ > %D%/packages/patches/adb-add-libraries.patch \ > %D%/packages/patches/aegis-constness-error.patch \ > %D%/packages/patches/aegis-perl-tempdir1.patch \ > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm > index ae47490755..438713c38a 100644 > --- a/gnu/packages/cpp.scm > +++ b/gnu/packages/cpp.scm > @@ -672,7 +672,7 @@ point and then, after each tween step, plugging back > the result.") > (define-public abseil-cpp > (package > (name "abseil-cpp") > - (version "20200225.2") > + (version "20200923.3") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -681,11 +681,14 @@ point and then, after each tween step, plugging back > the result.") > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) > + "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl")) > + ;; Remove after next googletest release and update. > + (patches (search-patches "abseil-cpp-fix.patch")))) > (build-system cmake-build-system) > (arguments > `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" > "-DABSL_RUN_TESTS=ON" > + "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" > ;; Needed, else we get errors like: > ;; > ;; ld: > CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o: > diff --git a/gnu/packages/patches/abseil-cpp-fix.patch > b/gnu/packages/patches/abseil-cpp-fix.patch > new file mode 100644 > index 0000000000..38971448f3 > --- /dev/null > +++ b/gnu/packages/patches/abseil-cpp-fix.patch > @@ -0,0 +1,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); > + > -- > 2.30.0 > > On Wed, Jan 13, 2021 at 10:13 AM GNU bug Tracking System < > help-debbugs@gnu.org> wrote: > >> Thank you for filing a new bug report with debbugs.gnu.org. >> >> This is an automatically generated reply to let you know your message >> has been received. >> >> Your message is being forwarded to the package maintainers and other >> interested parties for their attention; they will reply in due course. >> >> Your message has been sent to the package maintainer(s): >> guix-patches@gnu.org >> >> If you wish to submit further information on this problem, please >> send it to 45842@debbugs.gnu.org. >> >> Please do not send mail to help-debbugs@gnu.org unless you wish >> to report a problem with the Bug-tracking system. >> >> -- >> 45842: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45842 >> GNU Bug Tracking System >> Contact help-debbugs@gnu.org with problems >> > --00000000000036f68505bd494c4a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
A second patch from an unreleased upstream commit, which f= or me is necessary to build the first patch off Guix master.

On Mon, Feb 1, = 2021 at 9:14 AM Greg Hogan <code@g= reghogan.com> wrote:
Another version bump.

From 4153f= 16143405a4439cabe8c13f3b75440e1f1cc Mon Sep 17 00:00:00 2001
From= : Greg Hogan <co= de@greghogan.com>
Date: Mon, 1 Feb 2021 14:01:11 +0000
Subject: [PATCH] gnu: abseil-cpp: Update to 20200923.3.
* gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.3.
[arguments]: Enable external googletest.
* gnu/packages/pa= tches/abseil-cpp-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
=
---
=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=A01 +
=C2=A0gnu/p= ackages/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=A07 +++++--
=C2=A0gnu/packages/patches/abs= eil-cpp-fix.patch | 16 ++++++++++++++++
=C2=A03 files changed, 22= insertions(+), 2 deletions(-)
=C2=A0create mode 100644 gnu/packa= ges/patches/abseil-cpp-fix.patch

diff --git a/gnu/= local.mk b/gnu/local.mk
index e93425f394= ..0dba1b5855 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -783,6 +783,7 @@ dist_patch_DATA = =3D \
=C2=A0 =C2= =A0%D%/packages/patches/abcl-fix-build-xml.patch \
=C2=A0 =C2=A0%D%/packages/patches/ableton-lin= k-system-libraries-debian.patch \
=C2=A0 =C2=A0%D%/packages/patches/abiword-explictly-cast-bools= .patch \
+ =C2=A0%D%/= packages/patches/abseil-cpp-fix.patch = \
=C2=A0 =C2=A0%D%/packages/patches/adb-add-libraries.pa= tch \
=C2=A0 =C2=A0= %D%/packages/patches/aegis-constness-error.patch =C2=A0 =C2=A0 =C2=A0 =C2= =A0 \
=C2=A0 =C2=A0%= D%/packages/patches/aegis-perl-tempdir1.patch =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 \
diff --git = a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ae47490755..4= 38713c38a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/p= ackages/cpp.scm
@@ -672,7 +672,7 @@ point and then, after each tw= een step, plugging back the result.")
=C2=A0(define-public a= bseil-cpp
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(na= me "abseil-cpp")
- =C2=A0 =C2=A0(version "20200225= .2")
+ =C2=A0 =C2=A0(version "20200923.3")
=C2=A0 =C2=A0 =C2=A0(source (origin
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method git-fetch)
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (git-reference
@@ -= 681,11 +681,14 @@ point and then, after each tween step, 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"0dwxg54pv6ihphbia0iw65r64whd= 7v8nm4wwhcz219642cgpv54y"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaaw= npsi362hkl"))
+ =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 (search-patches "= ;abseil-cpp-fix.patch"))))
=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 (list "-DBUILD_SHARED_LIBS=3DON&= quot;
=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 "-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 "-DABSL_USE_EX= TERNAL_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 ;;
=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 ;; ld: CMak= eFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:<= /div>
diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/pack= ages/patches/abseil-cpp-fix.patch
new file mode 100644
= index 0000000000..38971448f3
--- /dev/null
+++ b/gnu/pa= ckages/patches/abseil-cpp-fix.patch
@@ -0,0 +1,16 @@
+T= he GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googlete= st
+in commit 0b024bd9 on master. It has been used in an abseil-c= pp 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 {
<= div>+ =C2=A0 }
+ };
+
++#ifdef GTEST_ALLOW_UN= INSTANTIATED_PARAMETERIZED_TEST
+ GTEST_ALLOW_UNINSTANTIATED_PARA= METERIZED_TEST(UniquePtrModifiersTest);
++#endif
+
+ TYPED_TEST_SUITE_P(UniquePtrModifiersTest);
+
-= -
2.30.0

On Wed, Jan 13, 2021 at 10:13 AM GNU bug Trac= king System <h= elp-debbugs@gnu.org> wrote:
Thank you for = filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
=C2=A0guix-patche= s@gnu.org

If you wish to submit further information on this problem, please
send it to 45842= @debbugs.gnu.org.

Please do not send mail to help-debbugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.

--
45842: http://debbugs.gnu.org/cgi/bugreport.cgi?= bug=3D45842
GNU Bug Tracking System
Contact help-debb= ugs@gnu.org with problems
--00000000000036f68505bd494c4a-- --00000000000036f68805bd494c4c Content-Type: application/octet-stream; name="0001-gnu-abseil-cpp-Update-to-20200923.3.patch" Content-Disposition: attachment; filename="0001-gnu-abseil-cpp-Update-to-20200923.3.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_km5dbscg0 RnJvbSA5ZDBhNGQwZDY4MGZmMTE2Y2E5MTBlZjU2NTQ2OTBlMTJhYTQyYWIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IE1vbiwgMSBGZWIgMjAyMSAxNDowMToxMSArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBnbnU6 IGFic2VpbC1jcHA6IFVwZGF0ZSB0byAyMDIwMDkyMy4zLgoKKiBnbnUvcGFja2FnZXMvY3BwLnNj bSAoYWJzZWlsLWNwcCk6IFVwZGF0ZSB0byAyMDIwMDkyMy4zLgpbYXJndW1lbnRzXTogRW5hYmxl IGV4dGVybmFsIGdvb2dsZXRlc3QuCiogZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1m aXgucGF0Y2g6IE5ldyBmaWxlLgoqIGdudS9sb2NhbC5tayAoZGlzdF9wYXRjaF9EQVRBKTogUmVn aXN0ZXIgaXQuCi0tLQogZ251L2xvY2FsLm1rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fCAgMSArCiBnbnUvcGFja2FnZXMvY3BwLnNjbSAgICAgICAgICAgICAgICAgICAgICB8ICA3ICsr KysrLS0KIGdudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LnBhdGNoIHwgMTYgKysr KysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1j cHAtZml4LnBhdGNoCgpkaWZmIC0tZ2l0IGEvZ251L2xvY2FsLm1rIGIvZ251L2xvY2FsLm1rCmlu ZGV4IGEzOWM1ZDg1OTIuLjNlZTY3MGQ3ZmYgMTAwNjQ0Ci0tLSBhL2dudS9sb2NhbC5taworKysg Yi9nbnUvbG9jYWwubWsKQEAgLTc4Nyw2ICs3ODcsNyBAQCBkaXN0X3BhdGNoX0RBVEEgPQkJCQkJ CVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJjbC1maXgtYnVpbGQteG1sLnBhdGNoCVwKICAg JUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJsZXRvbi1saW5rLXN5c3RlbS1saWJyYXJpZXMtZGViaWFu LnBhdGNoCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWJpd29yZC1leHBsaWN0bHktY2FzdC1i b29scy5wYXRjaAlcCisgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LnBhdGNo CQkJXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9hZGItYWRkLWxpYnJhcmllcy5wYXRjaAkJCVwK ICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWVnaXMtY29uc3RuZXNzLWVycm9yLnBhdGNoICAgICAg ICAgCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvYWVnaXMtcGVybC10ZW1wZGlyMS5wYXRjaCAg ICAgICAgICAgCVwKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jcHAuc2NtIGIvZ251L3BhY2th Z2VzL2NwcC5zY20KaW5kZXggY2U5Yzk1MDJlZi4uZTY1OWUzNzhmOSAxMDA2NDQKLS0tIGEvZ251 L3BhY2thZ2VzL2NwcC5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NwcC5zY20KQEAgLTY3OCw3ICs2 NzgsNyBAQCBwb2ludCBhbmQgdGhlbiwgYWZ0ZXIgZWFjaCB0d2VlbiBzdGVwLCBwbHVnZ2luZyBi YWNrIHRoZSByZXN1bHQuIikKIChkZWZpbmUtcHVibGljIGFic2VpbC1jcHAKICAgKHBhY2thZ2UK ICAgICAobmFtZSAiYWJzZWlsLWNwcCIpCi0gICAgKHZlcnNpb24gIjIwMjAwMjI1LjIiKQorICAg ICh2ZXJzaW9uICIyMDIwMDkyMy4zIikKICAgICAoc291cmNlIChvcmlnaW4KICAgICAgICAgICAg ICAgKG1ldGhvZCBnaXQtZmV0Y2gpCiAgICAgICAgICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UK QEAgLTY4NywxMSArNjg3LDE0IEBAIHBvaW50IGFuZCB0aGVuLCBhZnRlciBlYWNoIHR3ZWVuIHN0 ZXAsIHBsdWdnaW5nIGJhY2sgdGhlIHJlc3VsdC4iKQogICAgICAgICAgICAgICAoZmlsZS1uYW1l IChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAgICAgICAgICAgIChzaGEyNTYKICAg ICAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICAgICAiMGR3eGc1NHB2NmlocGhiaWEw aXc2NXI2NHdoZDd2OG5tNHd3aGN6MjE5NjQyY2dwdjU0eSIpKSkpCisgICAgICAgICAgICAgICAg IjFwNGRqaG0xZjAxMWZpY2Jqanh4M244NDI4cDg0ODFwMjBqNGdscGFhd25wc2kzNjJoa2wiKSkK KyAgICAgICAgICAgICAgOzsgUmVtb3ZlIGFmdGVyIG5leHQgZ29vZ2xldGVzdCByZWxlYXNlIGFu ZCB1cGRhdGUuCisgICAgICAgICAgICAgIChwYXRjaGVzIChzZWFyY2gtcGF0Y2hlcyAiYWJzZWls LWNwcC1maXgucGF0Y2giKSkpKQogICAgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVt KQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncyAobGlzdCAiLURCVUlM RF9TSEFSRURfTElCUz1PTiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLURBQlNM X1JVTl9URVNUUz1PTiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLURBQlNMX1VT RV9FWFRFUk5BTF9HT09HTEVURVNUPU9OIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDs7IE5lZWRlZCwgZWxzZSB3ZSBnZXQgZXJyb3JzIGxpa2U6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgOzsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBsZDogQ01h a2VGaWxlcy9hYnNsX3BlcmlvZGljX3NhbXBsZXJfdGVzdC5kaXIvaW50ZXJuYWwvcGVyaW9kaWNf c2FtcGxlcl90ZXN0LmNjLm86CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNl aWwtY3BwLWZpeC5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LnBh dGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjM4OTcxNDQ4ZjMKLS0t IC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRj aApAQCAtMCwwICsxLDE2IEBACitUaGUgR1RFU1RfQUxMT1dfVU5JTlNUQU5USUFURURfUEFSQU1U RVJJWkVEX1RFU1QgbWFjcm8gd2FzIGFkZGVkIHRvIGdvb2dsZXRlc3QKK2luIGNvbW1pdCAwYjAy NGJkOSBvbiBtYXN0ZXIuIEl0IGhhcyBiZWVuIHVzZWQgaW4gYW4gYWJzZWlsLWNwcCByZWxlYXNl IGJlZm9yZQorYSBnb29nbGV0ZXN0IHJlbGVhc2UuCisKKy0tLSBhL2Fic2wvY29udGFpbmVyL2lu dGVybmFsL3Vub3JkZXJlZF9tYXBfbW9kaWZpZXJzX3Rlc3QuaAorKysrIGIvYWJzbC9jb250YWlu ZXIvaW50ZXJuYWwvdW5vcmRlcmVkX21hcF9tb2RpZmllcnNfdGVzdC5oCitAQCAtMjg2LDcgKzI4 Niw5IEBAIGNsYXNzIFVuaXF1ZVB0ck1vZGlmaWVyc1Rlc3QgOiBwdWJsaWMgOjp0ZXN0aW5nOjpU ZXN0IHsKKyAgIH0KKyB9OworCisrI2lmZGVmIEdURVNUX0FMTE9XX1VOSU5TVEFOVElBVEVEX1BB UkFNRVRFUklaRURfVEVTVAorIEdURVNUX0FMTE9XX1VOSU5TVEFOVElBVEVEX1BBUkFNRVRFUkla RURfVEVTVChVbmlxdWVQdHJNb2RpZmllcnNUZXN0KTsKKysjZW5kaWYKKworIFRZUEVEX1RFU1Rf U1VJVEVfUChVbmlxdWVQdHJNb2RpZmllcnNUZXN0KTsKKwotLSAKMi4zMC4yCgo= --00000000000036f68805bd494c4c Content-Type: application/octet-stream; name="0002-gnu-abseil-cpp-Patch-sterror_test.patch" Content-Disposition: attachment; filename="0002-gnu-abseil-cpp-Patch-sterror_test.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_km5dbvfv1 RnJvbSA5ZGVlMzg0MDI5MjMyMzhiNzdhMGU5MDEwZWIwMzgwODQ5Yjg0MGFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFRodSwgMTEgTWFyIDIwMjEgMjA6NTM6MTUgKzAwMDAKU3ViamVjdDogW1BBVENIIDIvMl0gZ251 OiBhYnNlaWwtY3BwOiBQYXRjaCBzdGVycm9yX3Rlc3QuCgoqIGdudS9wYWNrYWdlcy9wYXRjaGVz L2Fic2VpbC1jcHAtZml4LWd0ZXN0LnBhdGNoOiBSZW5hbWVkIGZpbGUuCiogZ251L3BhY2thZ2Vz L3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaDogTmV3IGZpbGUuCiog Z251L2xvY2FsLm1rIChkaXN0X3BhdGNoX0RBVEEpOiBSZW5hbWUgLyBhZGQgZmlsZXMuCiogZ251 L3BhY2thZ2VzL2NwcC5zY20gKGFic2VpbC1jcHApW3NvdXJjZV06IFVzZSBmaWxlcy4KLS0tCiBn bnUvbG9jYWwubWsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArLQogZ251 L3BhY2thZ2VzL2NwcC5zY20gICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDUgKystCiAuLi5w LWZpeC5wYXRjaCA9PiBhYnNlaWwtY3BwLWZpeC1ndGVzdC5wYXRjaH0gfCAgMAogLi4uL2Fic2Vp bC1jcHAtZml4LXN0cmVycm9yX3Rlc3QucGF0Y2ggICAgICAgIHwgNDIgKysrKysrKysrKysrKysr KysrKwogNCBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQog cmVuYW1lIGdudS9wYWNrYWdlcy9wYXRjaGVzL3thYnNlaWwtY3BwLWZpeC5wYXRjaCA9PiBhYnNl aWwtY3BwLWZpeC1ndGVzdC5wYXRjaH0gKDEwMCUpCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3Bh Y2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaAoKZGlmZiAt LWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2NhbC5tawppbmRleCAzZWU2NzBkN2ZmLi44ZWE4 NzY3MzQ3IDEwMDY0NAotLS0gYS9nbnUvbG9jYWwubWsKKysrIGIvZ251L2xvY2FsLm1rCkBAIC03 ODcsNyArNzg3LDggQEAgZGlzdF9wYXRjaF9EQVRBID0JCQkJCQlcCiAgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2FiY2wtZml4LWJ1aWxkLXhtbC5wYXRjaAlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVz L2FibGV0b24tbGluay1zeXN0ZW0tbGlicmFyaWVzLWRlYmlhbi5wYXRjaAlcCiAgICVEJS9wYWNr YWdlcy9wYXRjaGVzL2FiaXdvcmQtZXhwbGljdGx5LWNhc3QtYm9vbHMucGF0Y2gJXAotICAlRCUv cGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC5wYXRjaAkJCVwKKyAgJUQlL3BhY2thZ2Vz L3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtZ3Rlc3QucGF0Y2gJCVwKKyAgJUQlL3BhY2thZ2VzL3Bh dGNoZXMvYWJzZWlsLWNwcC1maXgtc3RyZXJyb3JfdGVzdC5wYXRjaAlcCiAgICVEJS9wYWNrYWdl cy9wYXRjaGVzL2FkYi1hZGQtbGlicmFyaWVzLnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMvcGF0 Y2hlcy9hZWdpcy1jb25zdG5lc3MtZXJyb3IucGF0Y2ggICAgICAgICAJXAogICAlRCUvcGFja2Fn ZXMvcGF0Y2hlcy9hZWdpcy1wZXJsLXRlbXBkaXIxLnBhdGNoICAgICAgICAgICAJXApkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL2NwcC5zY20gYi9nbnUvcGFja2FnZXMvY3BwLnNjbQppbmRleCBl NjU5ZTM3OGY5Li43YjhiNGNlOGIwIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvY3BwLnNjbQor KysgYi9nbnUvcGFja2FnZXMvY3BwLnNjbQpAQCAtNjg5LDcgKzY4OSwxMCBAQCBwb2ludCBhbmQg dGhlbiwgYWZ0ZXIgZWFjaCB0d2VlbiBzdGVwLCBwbHVnZ2luZyBiYWNrIHRoZSByZXN1bHQuIikK ICAgICAgICAgICAgICAgIChiYXNlMzIKICAgICAgICAgICAgICAgICAiMXA0ZGpobTFmMDExZmlj YmpqeHgzbjg0MjhwODQ4MXAyMGo0Z2xwYWF3bnBzaTM2MmhrbCIpKQogICAgICAgICAgICAgICA7 OyBSZW1vdmUgYWZ0ZXIgbmV4dCBnb29nbGV0ZXN0IHJlbGVhc2UgYW5kIHVwZGF0ZS4KLSAgICAg ICAgICAgICAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzICJhYnNlaWwtY3BwLWZpeC5wYXRjaCIp KSkpCisgICAgICAgICAgICAgIChwYXRjaGVzCisgICAgICAgICAgICAgICAoc2VhcmNoLXBhdGNo ZXMKKyAgICAgICAgICAgICAgICAiYWJzZWlsLWNwcC1maXgtZ3Rlc3QucGF0Y2giCisgICAgICAg ICAgICAgICAgImFic2VpbC1jcHAtZml4LXN0cmVycm9yX3Rlc3QucGF0Y2giKSkpKQogICAgIChi dWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMKICAgICAgYCgj OmNvbmZpZ3VyZS1mbGFncyAobGlzdCAiLURCVUlMRF9TSEFSRURfTElCUz1PTiIKZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LnBhdGNoIGIvZ251L3BhY2th Z2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtZ3Rlc3QucGF0Y2gKc2ltaWxhcml0eSBpbmRleCAx MDAlCnJlbmFtZSBmcm9tIGdudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LnBhdGNo CnJlbmFtZSB0byBnbnUvcGFja2FnZXMvcGF0Y2hlcy9hYnNlaWwtY3BwLWZpeC1ndGVzdC5wYXRj aApkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvYWJzZWlsLWNwcC1maXgtc3RyZXJy b3JfdGVzdC5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1jcHAtZml4LXN0cmVy cm9yX3Rlc3QucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uNzI2 MTQ5YjAxNQotLS0gL2Rldi9udWxsCisrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Fic2VpbC1j cHAtZml4LXN0cmVycm9yX3Rlc3QucGF0Y2gKQEAgLTAsMCArMSw0MiBAQAorRnJvbSBlMmIxYmFi MTlhNzgyY2I2MmJiMDEwZDFjMjkyNWFiNzMxNGZiMTEzIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAw MQorZGlmZiAtLWdpdCBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJvci5jYyBiL2Fic2wvYmFz ZS9pbnRlcm5hbC9zdHJlcnJvci5jYworaW5kZXggZDY2YmExMjAuLjBkNjIyNmZkIDEwMDY0NAor LS0tIGEvYWJzbC9iYXNlL2ludGVybmFsL3N0cmVycm9yLmNjCisrKysgYi9hYnNsL2Jhc2UvaW50 ZXJuYWwvc3RyZXJyb3IuY2MKK0BAIC01MSw3ICs1MSw2IEBAIGNvbnN0IGNoYXIqIFN0ckVycm9y QWRhcHRvcihpbnQgZXJybnVtLCBjaGFyKiBidWYsIHNpemVfdCBidWZsZW4pIHsKKyB9CisgCisg c3RkOjpzdHJpbmcgU3RyRXJyb3JJbnRlcm5hbChpbnQgZXJybnVtKSB7CistICBhYnNsOjpiYXNl X2ludGVybmFsOjpFcnJub1NhdmVyIGVycm5vX3NhdmVyOworICAgY2hhciBidWZbMTAwXTsKKyAg IGNvbnN0IGNoYXIqIHN0ciA9IFN0ckVycm9yQWRhcHRvcihlcnJudW0sIGJ1Ziwgc2l6ZW9mIGJ1 Zik7CisgICBpZiAoKnN0ciA9PSAnXDAnKSB7CitAQCAtNzYsNiArNzUsNyBAQCBzdGQ6OmFycmF5 PHN0ZDo6c3RyaW5nLCBrU3lzTmVycj4qIE5ld1N0ckVycm9yVGFibGUoKSB7CisgfSAgLy8gbmFt ZXNwYWNlCisgCisgc3RkOjpzdHJpbmcgU3RyRXJyb3IoaW50IGVycm51bSkgeworKyAgYWJzbDo6 YmFzZV9pbnRlcm5hbDo6RXJybm9TYXZlciBlcnJub19zYXZlcjsKKyAgIHN0YXRpYyBjb25zdCBh dXRvKiB0YWJsZSA9IE5ld1N0ckVycm9yVGFibGUoKTsKKyAgIGlmIChlcnJudW0gPj0gMCAmJiBl cnJudW0gPCBzdGF0aWNfY2FzdDxpbnQ+KHRhYmxlLT5zaXplKCkpKSB7CisgICAgIHJldHVybiAo KnRhYmxlKVtlcnJudW1dOworZGlmZiAtLWdpdCBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJv cl90ZXN0LmNjIGIvYWJzbC9iYXNlL2ludGVybmFsL3N0cmVycm9yX3Rlc3QuY2MKK2luZGV4IGE1 M2RhOTdmLi5lMzJkNWI1YyAxMDA2NDQKKy0tLSBhL2Fic2wvYmFzZS9pbnRlcm5hbC9zdHJlcnJv cl90ZXN0LmNjCisrKysgYi9hYnNsL2Jhc2UvaW50ZXJuYWwvc3RyZXJyb3JfdGVzdC5jYworQEAg LTYyLDEyICs2MiwxNCBAQCBURVNUKFN0ckVycm9yVGVzdCwgTXVsdGlwbGVUaHJlYWRzKSB7Cisg ICAgICAgKytjb3VudGVyOworICAgICAgIGVycm5vID0gRVJBTkdFOworICAgICAgIGNvbnN0IHN0 ZDo6c3RyaW5nIHZhbHVlID0gYWJzbDo6YmFzZV9pbnRlcm5hbDo6U3RyRXJyb3IoaSk7CisrICAg ICAgLy8gRVhQRUNUXyogY291bGQgY2hhbmdlIGVycm5vLiBTdGFzaCBpdCBmaXJzdC4KKysgICAg ICBpbnQgY2hlY2tfZXJyID0gZXJybm87CisrICAgICAgRVhQRUNUX1RIQVQoY2hlY2tfZXJyLCBF cShFUkFOR0UpKTsKKyAgICAgICAvLyBPbmx5IHRoZSBHTlUgaW1wbGVtZW50YXRpb24gaXMgZ3Vh cmFudGVlZCB0byBwcm92aWRlIHRoZQorICAgICAgIC8vIHN0cmluZyAiVW5rbm93biBlcnJvciBu bm4iLiBQT1NJWCBkb2Vzbid0IHNheSBhbnl0aGluZy4KKyAgICAgICBpZiAoIWFic2w6OlN0YXJ0 c1dpdGgodmFsdWUsICJVbmtub3duIGVycm9yICIpKSB7CistICAgICAgICBFWFBFQ1RfVEhBVChh YnNsOjpiYXNlX2ludGVybmFsOjpTdHJFcnJvcihpKSwgRXEoZXhwZWN0ZWRfc3RyaW5nc1tpXSkp OworKyAgICAgICAgRVhQRUNUX1RIQVQodmFsdWUsIEVxKGV4cGVjdGVkX3N0cmluZ3NbaV0pKTsK KyAgICAgICB9CistICAgICAgRVhQRUNUX1RIQVQoZXJybm8sIEVxKEVSQU5HRSkpOworICAgICB9 CisgICB9OworIAotLSAKMi4zMC4yCgo= --00000000000036f68805bd494c4c--