Received: by mail.netbsd.org (Postfix, from userid 605) id 0628B84DE1; Mon, 12 Nov 2018 12:50:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EDA4F84DA8 for ; Mon, 12 Nov 2018 12:50:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Mwxu1fN0dTW4 for ; Mon, 12 Nov 2018 12:50:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D879184CD5 for ; Mon, 12 Nov 2018 12:50:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D231FFB1F; Mon, 12 Nov 2018 12:50:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1542027052206010" MIME-Version: 1.0 Date: Mon, 12 Nov 2018 12:50:52 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20181112125052.D231FFB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1542027052206010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Nov 12 12:50:52 UTC 2018 Modified Files: pkgsrc/www/firefox: Makefile distinfo pkgsrc/www/firefox/patches: patch-aa Added Files: pkgsrc/www/firefox/patches: patch-python_mozbuild_mozbuild_action_check__binary.py patch-xpcom_components_nsComponentManager.cpp Log Message: firefox: SunOS build fixes. To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 pkgsrc/www/firefox/Makefile cvs rdiff -u -r1.330 -r1.331 pkgsrc/www/firefox/distinfo cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/firefox/patches/patch-aa cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_action_check__binary.py \ 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. --_----------=_1542027052206010 Content-Disposition: inline Content-Length: 6361 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/Makefile diff -u pkgsrc/www/firefox/Makefile:1.346 pkgsrc/www/firefox/Makefile:1.347 --- pkgsrc/www/firefox/Makefile:1.346 Mon Nov 12 03:53:03 2018 +++ pkgsrc/www/firefox/Makefile Mon Nov 12 12:50:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.346 2018/11/12 03:53:03 ryoon Exp $ +# $NetBSD: Makefile,v 1.347 2018/11/12 12:50:52 jperkin Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 63.0 @@ -27,6 +27,8 @@ CFLAGS+= -I${PREFIX}/include/nspr # for lang/gcc6 CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS +CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS + # workround for link of libxul.so etc. LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib LDFLAGS.SunOS+= -lm Index: pkgsrc/www/firefox/distinfo diff -u pkgsrc/www/firefox/distinfo:1.330 pkgsrc/www/firefox/distinfo:1.331 --- pkgsrc/www/firefox/distinfo:1.330 Wed Nov 7 12:55:11 2018 +++ pkgsrc/www/firefox/distinfo Mon Nov 12 12:50:52 2018 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.330 2018/11/07 12:55:11 martin Exp $ +$NetBSD: distinfo,v 1.331 2018/11/12 12:50:52 jperkin Exp $ SHA1 (firefox-63.0.1.source.tar.xz) = d62a85ce78904171e9f863154fb8cd031cdbe4ee RMD160 (firefox-63.0.1.source.tar.xz) = 28f6431150deb10b967e4181ebfb5c332deedbd2 SHA512 (firefox-63.0.1.source.tar.xz) = 29acad70259d71a924cbaf4c2f01fb034cf8090759b3a2d74a5eabc2823f83b6508434e619d8501d3930702e2bbad373581a70e2ce57aead9af77fc42766fbe2 Size (firefox-63.0.1.source.tar.xz) = 265358784 bytes -SHA1 (patch-aa) = 2df509e4c7478eb2a9d894b661ff62bca0e4c785 +SHA1 (patch-aa) = 649bafc86814ed9819a51f8347c5058123bd2d51 SHA1 (patch-browser_app_profile_firefox.js) = 3ff1487607da5c7dc917fe9f793c6d281119974a SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99 SHA1 (patch-dom_base_nsAttrName.h) = 89389af93bda7de9fd9a4b0fc6fa6505da390134 @@ -30,6 +30,7 @@ SHA1 (patch-media_libcubeb_src_moz.build SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038 +SHA1 (patch-python_mozbuild_mozbuild_action_check__binary.py) = 8103ca9f95fe98a4461c97abcd4cafd5ae5294f0 SHA1 (patch-servo_components_style_build__gecko.rs) = 1045b4e336c329d2673d096aeead83b6bc58ed13 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 082aa7830b33cb91c2606fb06059d544c70a7e62 SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278 @@ -38,5 +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_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-aa diff -u pkgsrc/www/firefox/patches/patch-aa:1.59 pkgsrc/www/firefox/patches/patch-aa:1.60 --- pkgsrc/www/firefox/patches/patch-aa:1.59 Sun Nov 4 00:38:44 2018 +++ pkgsrc/www/firefox/patches/patch-aa Mon Nov 12 12:50:52 2018 @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.59 2018/11/04 00:38:44 ryoon Exp $ +$NetBSD: patch-aa,v 1.60 2018/11/12 12:50:52 jperkin Exp $ * Add OSS audio support +* Disable libav-fft on SunOS (relocation errors) ---- old-configure.in.orig 2018-10-18 20:06:09.000000000 +0000 +--- old-configure.in.orig 2018-10-31 00:08:10.000000000 +0000 +++ old-configure.in @@ -2543,6 +2543,67 @@ MOZ_WEBM_ENCODER=1 AC_DEFINE(MOZ_WEBM_ENCODER) @@ -72,3 +73,11 @@ $NetBSD: patch-aa,v 1.59 2018/11/04 00:3 dnl ======================================================== dnl NegotiateAuth dnl ======================================================== +@@ -2860,6 +2921,7 @@ case "$OS_ARCH:$CPU_ARCH" in + WINNT:x86) + MOZ_LIBAV_FFT=1 + ;; ++ SunOS:*) : ;; + *:x86_64) + MOZ_LIBAV_FFT=1 + ;; Added files: Index: pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_action_check__binary.py diff -u /dev/null pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_action_check__binary.py:1.1 --- /dev/null Mon Nov 12 12:50:52 2018 +++ pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_action_check__binary.py Mon Nov 12 12:50:52 2018 @@ -0,0 +1,16 @@ +$NetBSD: patch-python_mozbuild_mozbuild_action_check__binary.py,v 1.1 2018/11/12 12:50:52 jperkin Exp $ + +Skip linker order tests on SunOS. + +--- python/mozbuild/mozbuild/action/check_binary.py.orig 2018-10-31 00:08:11.000000000 +0000 ++++ python/mozbuild/mozbuild/action/check_binary.py +@@ -228,6 +228,9 @@ def check_nsmodules(target, binary): + else: + sym_cmp = lambda guessed, actual: guessed == actual + ++ if sys.platform.startswith('sunos'): ++ return ++ + for addr, size, sym in symbols: + if next_addr is not None and not sym_cmp(next_addr, addr): + print_symbols(symbols) Index: pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp diff -u /dev/null pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp:1.1 --- /dev/null Mon Nov 12 12:50:52 2018 +++ pkgsrc/www/firefox/patches/patch-xpcom_components_nsComponentManager.cpp Mon Nov 12 12:50:52 2018 @@ -0,0 +1,17 @@ +$NetBSD: patch-xpcom_components_nsComponentManager.cpp,v 1.1 2018/11/12 12:50:52 jperkin 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 + + # if defined(__ELF__) || (defined(_WIN32) && defined(__GNUC__)) + +-extern "C" mozilla::Module const* const __start_kPStaticModules; +-extern "C" mozilla::Module const* const __stop_kPStaticModules; ++extern "C" mozilla::Module const* const __start_kPStaticModules = nullptr; ++extern "C" mozilla::Module const* const __stop_kPStaticModules = nullptr; + + # elif defined(__MACH__) + --_----------=_1542027052206010--