CVS commit: pkgsrc/www/firefox

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 14 18:51:40 UTC 2018

Modified Files:
        pkgsrc/www/firefox: distinfo
        pkgsrc/www/firefox/patches:
            patch-xpcom_components_nsComponentManager.cpp

Log Message:
firefox: fix build on NetBSD

Tip from jperkin, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.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/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.331 pkgsrc/www/firefox/distinfo:1.332
--- pkgsrc/www/firefox/distinfo:1.331   Mon Nov 12 12:50:52 2018
+++ pkgsrc/www/firefox/distinfo Wed Nov 14 18:51:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.331 2018/11/12 12:50:52 jperkin Exp $
+$NetBSD: distinfo,v 1.332 2018/11/14 18:51:40 wiz Exp $
 
 SHA1 (firefox-63.0.1.source.tar.xz) = d62a85ce78904171e9f863154fb8cd031cdbe4ee
 RMD160 (firefox-63.0.1.source.tar.xz) = 28f6431150deb10b967e4181ebfb5c332deedbd2
@@ -39,6 +39,6 @@ SHA1 (patch-toolkit_mozapps_installer_pa
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
 SHA1 (patch-xpcom_build_BinaryPath.h) = 9ec4b740388a4a887401efbb89810e96336576f7
-SHA1 (patch-xpcom_components_nsComponentManager.cpp) = 70546c05971ca4fef138b70e77ff341a61393c24
+SHA1 (patch-xpcom_components_nsComponentManager.cpp) = 514b7c50cdeed9e7d2fbd8d8c951a4ea9b64685f
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 412da80be2aa43852e08ad35e6523ae0842167ab
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp) = 569f10c29da6e8d30ee6b8568c85a629557a3943

Index: pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp
diff -u pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp:1.1 pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp:1.1        Mon Nov 12 12:50:52 2018
+++ pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp    Wed Nov 14 18:51:40 2018
@@ -1,17 +1,20 @@
-$NetBSD: patch-xpcom_components_nsComponentManager.cpp,v 1.1 2018/11/12 12:50:52 jperkin Exp $
+$NetBSD: patch-xpcom_components_nsComponentManager.cpp,v 1.2 2018/11/14 18:51:40 wiz Exp $
 
 Ensure symbols aren't pruned from being unused.
 
 --- xpcom/components/nsComponentManager.cpp.orig       2018-10-31 00:08:15.000000000 +0000
 +++ xpcom/components/nsComponentManager.cpp
-@@ -298,8 +298,8 @@ extern mozilla::Module const* const __st
+@@ -298,8 +298,13 @@ extern mozilla::Module const* const __st
  
  #  if defined(__ELF__) || (defined(_WIN32) && defined(__GNUC__))
  
--extern "C" mozilla::Module const* const __start_kPStaticModules;
--extern "C" mozilla::Module const* const __stop_kPStaticModules;
++#ifdef __sun
 +extern "C" mozilla::Module const* const __start_kPStaticModules = nullptr;
 +extern "C" mozilla::Module const* const __stop_kPStaticModules = nullptr;
++#else
+ extern "C" mozilla::Module const* const __start_kPStaticModules;
+ extern "C" mozilla::Module const* const __stop_kPStaticModules;
++#endif
  
  #  elif defined(__MACH__)