Re: CVS commit: pkgsrc/www/firefox60

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Leonardo Taccari writes:
> [...]
> When trying to rebuild it I have noticed that
> patch-dom_fetch_FetchConsumer.cpp no longer applies.
>
> Attached patch in this email adjust that (but the build of firefox60
> is still running so I haven't completely tested them).
> [...]

...and whoops, I forgot to attach it, sorry!

firefox60: Adjust patch-dom_fetch_FetchConsumer.cpp to 60.5.2

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox60/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    26 Feb 2019 11:23:53 -0000      1.5
+++ distinfo    26 Feb 2019 12:46:36 -0000
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = fdabcc9b055f6439fdbda9
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
-SHA1 (patch-dom_fetch_FetchConsumer.cpp) = a164b68b968633e2f2e29c1c3917a77ac55a886b
+SHA1 (patch-dom_fetch_FetchConsumer.cpp) = e39f1edc563890d0bc54223172f26670dbf5b645
 SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
 SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336
Index: patches/patch-dom_fetch_FetchConsumer.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox60/patches/patch-dom_fetch_FetchConsumer.cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dom_fetch_FetchConsumer.cpp
--- patches/patch-dom_fetch_FetchConsumer.cpp   28 Jun 2018 14:04:10 -0000      1.1
+++ patches/patch-dom_fetch_FetchConsumer.cpp   26 Feb 2019 12:46:36 -0000
@@ -1,13 +1,13 @@
 $NetBSD: patch-dom_fetch_FetchConsumer.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
 
---- dom/fetch/FetchConsumer.cpp.orig   2018-05-03 16:58:26.000000000 +0000
+--- dom/fetch/FetchConsumer.cpp.orig   2019-02-21 19:22:42.000000000 +0000
 +++ dom/fetch/FetchConsumer.cpp
-@@ -616,7 +616,7 @@ FetchBodyConsumer<Derived>::ContinueCons
-   RefPtr<Promise> localPromise = mConsumePromise.forget();
+@@ -560,7 +560,7 @@ void FetchBodyConsumer<Derived>::Continu
  
    RefPtr<FetchBodyConsumer<Derived>> self = this;
--  auto autoReleaseObject = mozilla::MakeScopeExit([&] {
-+  auto autoReleaseObject = mozilla::MakeScopeExit([self] {
-     self->ReleaseObject();
-   });
+   auto autoReleaseObject =
+-      mozilla::MakeScopeExit([&] { self->ReleaseObject(); });
++      mozilla::MakeScopeExit([self] { self->ReleaseObject(); });
  
+   if (aShuttingDown) {
+     // If shutting down, we don't want to resolve any promise.