CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   martin
Date:           Tue Sep 12 07:39:08 UTC 2017

Modified Files:
        pkgsrc/www/firefox: distinfo
Added Files:
        pkgsrc/www/firefox/patches: patch-dom_base_nsWrapperCache.h
            patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h

Log Message:
Make it buildable on sparc64.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-dom_base_nsWrapperCache.h \
    pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h

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

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.294 pkgsrc/www/firefox/distinfo:1.295
--- pkgsrc/www/firefox/distinfo:1.294   Sat Sep  2 03:47:46 2017
+++ pkgsrc/www/firefox/distinfo Tue Sep 12 07:39:08 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.294 2017/09/02 03:47:46 ryoon Exp $
+$NetBSD: distinfo,v 1.295 2017/09/12 07:39:08 martin Exp $
 
 SHA1 (firefox-55.0.3.source.tar.xz) = 8d9b0861ad71845d4b0e668f1981ec99e617ff36
 RMD160 (firefox-55.0.3.source.tar.xz) = aa14f156f2d346bdf787222977ad0642dff084de
@@ -31,6 +31,7 @@ SHA1 (patch-config_stl__wrappers_ostream
 SHA1 (patch-config_system-headers) = 96bc5e296d1ec9db9d764edadc36605a8f3aebe9
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
+SHA1 (patch-dom_base_nsWrapperCache.h) = 7442735fde38d6933ffabbb14dde3a756f3e72dc
 SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
 SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6
@@ -102,6 +103,7 @@ SHA1 (patch-toolkit_components_protobuf_
 SHA1 (patch-toolkit_components_resistfingerprinting_nsRFPService.cpp) = 14d71a5197b09730b7065f95ee6c4ba3572d8241
 SHA1 (patch-toolkit_components_telemetry_Histograms.json) = 5232d568a68b3396b8deff04820a913f7e85cf99
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
+SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 614ea9b9ca2cb41c075cf69e6c732a714afaf3e3
 SHA1 (patch-toolkit_library_gtest_moz.build) = a8ac2a2930ac00f891a695639acfadef2679a599
 SHA1 (patch-toolkit_library_moz.build) = f77301bd81d37e7a599dbff57fba47428e4a00e2
 SHA1 (patch-toolkit_moz.configure) = 2647f5b2c278d5d710a0faade7b48ccc2fbfc11f

Added files:

Index: pkgsrc/www/firefox/patches/patch-dom_base_nsWrapperCache.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-dom_base_nsWrapperCache.h:1.1
--- /dev/null   Tue Sep 12 07:39:08 2017
+++ pkgsrc/www/firefox/patches/patch-dom_base_nsWrapperCache.h  Tue Sep 12 07:39:08 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-dom_base_nsWrapperCache.h,v 1.1 2017/09/12 07:39:08 martin Exp $
+
+See https://bugzilla.mozilla.org/show_bug.cgi?id=1398677
+Allow building on other 64bit architectures.
+
+--- dom/base/nsWrapperCache.h.orig     2017-07-31 18:20:52.000000000 +0200
++++ dom/base/nsWrapperCache.h  2017-09-11 08:32:36.713346387 +0200
+@@ -41,7 +41,7 @@ class nsWindowRoot;
+ // This may waste space for some other nsWrapperCache-derived objects that have
+ // a 32-bit field as their first member, but those objects are unlikely to be as
+ // numerous or performance-critical as DOM nodes.
+-#if defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__)
++#if defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(__LP64__)
+ static_assert(sizeof(void*) == 8, "These architectures should be 64-bit");
+ #define BOOL_FLAGS_ON_WRAPPER_CACHE
+ #else
Index: pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h:1.1
--- /dev/null   Tue Sep 12 07:39:08 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h     Tue Sep 12 07:39:08 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h,v 1.1 2017/09/12 07:39:08 martin Exp $
+
+See https://bugzilla.mozilla.org/show_bug.cgi?id=1399027
+Allow non-whitelisted 64bit platforms to build.
+
+--- toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h.orig        2017-06-15 22:52:33.000000000 +0200
++++ toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h     2017-09-12 09:11:23.076831216 +0200
+@@ -155,7 +155,8 @@
+ 
+ /* The size of `long', as computed by sizeof. */
+ #if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) ||      \
+-    defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABI64)
++    defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABI64) ||   \
++    defined(__LP64__)
+ #define CURL_SIZEOF_LONG 8
+ #else
+ #define CURL_SIZEOF_LONG 4