CVS commit: pkgsrc/www/firefox52

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Fri Jun  3 16:30:00 UTC 2022

Modified Files:
        pkgsrc/www/firefox52: Makefile distinfo
        pkgsrc/www/firefox52/patches: patch-js_src_vm_StructuredClone.cpp

Log Message:
One of the bigendian fixes accidently was 64bit only - make it
work on 32bit powerpc too.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.73 pkgsrc/www/firefox52/Makefile:1.74
--- pkgsrc/www/firefox52/Makefile:1.73  Mon Apr 18 19:12:17 2022
+++ pkgsrc/www/firefox52/Makefile       Fri Jun  3 16:30:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/04/18 19:12:17 adam Exp $
+# $NetBSD: Makefile,v 1.74 2022/06/03 16:30:00 martin Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   43
+PKGREVISION=   44
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.32 pkgsrc/www/firefox52/distinfo:1.33
--- pkgsrc/www/firefox52/distinfo:1.32  Sat May 28 18:31:13 2022
+++ pkgsrc/www/firefox52/distinfo       Fri Jun  3 16:30:00 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2022/05/28 18:31:13 martin Exp $
+$NetBSD: distinfo,v 1.33 2022/06/03 16:30:00 martin Exp $
 
 BLAKE2s (firefox-52.9.0esr.source.tar.xz) = 68da851ecfe1b03231157bf79732865d3cf81b7c10128a2e2a9e6e7be3963348
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
@@ -71,7 +71,7 @@ SHA1 (patch-js_src_jit_arm_Architecture-
 SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392
 SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 6196d576b98126bbbab2014c373c7a442ee6dc12
-SHA1 (patch-js_src_vm_StructuredClone.cpp) = 7e992825e996c43419318893b704a2aa380b0d2a
+SHA1 (patch-js_src_vm_StructuredClone.cpp) = e4b1d6e0dd440dafdb2c5a74e8463e0e2b18996a
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_XPCWrappedNative.cpp) = 6630b8cb20a2a2b8337e8c1250e741fd65be1e54
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e

Index: pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp
diff -u pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp:1.1 pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp:1.2
--- pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp:1.1        Wed Aug  8 08:49:58 2018
+++ pkgsrc/www/firefox52/patches/patch-js_src_vm_StructuredClone.cpp    Fri Jun  3 16:30:00 2022
@@ -1,15 +1,17 @@
-$NetBSD: patch-js_src_vm_StructuredClone.cpp,v 1.1 2018/08/08 08:49:58 martin Exp $
+$NetBSD: patch-js_src_vm_StructuredClone.cpp,v 1.2 2022/06/03 16:30:00 martin Exp $
 
 Fix a crash on big endian machines. Reported in bugzilla
 as #1481740.
 
 --- js/src/vm/StructuredClone.cpp.orig 2018-06-21 20:53:54.000000000 +0200
 +++ js/src/vm/StructuredClone.cpp      2018-08-08 10:15:04.949370197 +0200
-@@ -925,6 +925,7 @@ JSStructuredCloneData::discardTransferab
+@@ -923,8 +923,7 @@ JSStructuredCloneData::discardTransferab
+         if (!point.canPeek())
+             return;
  
-         void* content;
-         SCInput::getPtr(point.peek(), &content);
-+      content = (void*)NativeEndian::swapFromLittleEndian(reinterpret_cast<uint64_t>(content));
+-        void* content;
+-        SCInput::getPtr(point.peek(), &content);
++        void* content = (void*)NativeEndian::swapFromLittleEndian(point.peek());
          point.next();
          if (!point.canPeek())
              return;