diff options
author | nia <nia@pkgsrc.org> | 2020-06-17 17:54:26 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-06-17 17:54:26 +0000 |
commit | 388072d36108c8a5b342a9c3135266b80c9c664b (patch) | |
tree | e9136351ee7e3c6976f7e7caed51fd233f760d0b /www | |
parent | 020855fdc3daa9209bca0d56b9c0857b36da8fd7 (diff) | |
download | pkgsrc-388072d36108c8a5b342a9c3135266b80c9c664b.tar.gz |
firefox: Remove patches for NetBSD 7, rust dropped support for NetBSD 7
Diffstat (limited to 'www')
-rw-r--r-- | www/firefox/Makefile | 4 | ||||
-rw-r--r-- | www/firefox/distinfo | 4 | ||||
-rw-r--r-- | www/firefox/mozilla-common.mk | 8 | ||||
-rw-r--r-- | www/firefox/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc | 15 | ||||
-rw-r--r-- | www/firefox/patches/patch-xpcom_build_BinaryPath.h | 40 |
5 files changed, 4 insertions, 67 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c054e6328c6..79743bcebfb 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.432 2020/06/15 08:27:02 nia Exp $ +# $NetBSD: Makefile,v 1.433 2020/06/17 17:54:26 nia Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 77.0 MOZ_BRANCH_MINOR= .1 -PKGREVISION= 1 +PKGREVISION= 2 DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} diff --git a/www/firefox/distinfo b/www/firefox/distinfo index d838f574118..e4b5edd0642 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.398 2020/06/14 18:42:19 maya Exp $ +$NetBSD: distinfo,v 1.399 2020/06/17 17:54:26 nia Exp $ SHA1 (firefox-77.0.1.source.tar.xz) = 86735b221c17964f5e6a756a973b6d0696fbf1c5 RMD160 (firefox-77.0.1.source.tar.xz) = 59ef718e1bf9eef0a6b90c60ec20bbe4c7402ffe @@ -17,7 +17,6 @@ SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c488 SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924 -SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 @@ -37,5 +36,4 @@ SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e0 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec -SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index 62a41e820cd..f6372003c9c 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.170 2020/06/14 15:33:28 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.171 2020/06/17 17:54:26 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -124,12 +124,6 @@ SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= pre-configure -SUBST_MESSAGE.prefix= Setting PREFIX -SUBST_FILES.prefix+= ${MOZILLA_DIR}xpcom/build/BinaryPath.h -SUBST_VARS.prefix+= PREFIX - CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc deleted file mode 100644 index 991779dd561..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_lock__impl__posix.cc,v 1.2 2019/03/19 16:11:28 ryoon Exp $ - -- Fix build on NetBSD 7.1 (which doesn't have PTHREAD_PRIO_INHERIT) - ---- ipc/chromium/src/base/lock_impl_posix.cc.orig 2019-03-07 16:53:35.000000000 +0000 -+++ ipc/chromium/src/base/lock_impl_posix.cc -@@ -22,7 +22,7 @@ namespace internal { - // Lock::PriorityInheritanceAvailable still must be checked as the code may - // compile but the underlying platform still may not correctly support priority - // inheritance locks. --#if defined(OS_NACL) || defined(OS_ANDROID) -+#if defined(OS_NACL) || defined(OS_ANDROID) || (defined(__NetBSD__) && !defined(PTHREAD_PRIO_INHERIT)) - # define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0 - #else - # define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1 diff --git a/www/firefox/patches/patch-xpcom_build_BinaryPath.h b/www/firefox/patches/patch-xpcom_build_BinaryPath.h deleted file mode 100644 index 9d01fad06c9..00000000000 --- a/www/firefox/patches/patch-xpcom_build_BinaryPath.h +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.8 2019/03/19 16:11:28 ryoon Exp $ - -* Fix build under netbsd-7, PR pkg/52956 - ---- xpcom/build/BinaryPath.h.orig 2019-03-07 16:53:45.000000000 +0000 -+++ xpcom/build/BinaryPath.h -@@ -21,7 +21,8 @@ - defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) - # include <sys/sysctl.h> - #endif --#if defined(__OpenBSD__) -+#if defined(__OpenBSD__) || \ -+ (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME)) - # include <sys/stat.h> - #endif - #include "mozilla/UniquePtr.h" -@@ -164,7 +165,8 @@ class BinaryPath { - } - - #elif defined(__FreeBSD__) || defined(__DragonFly__) || \ -- defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+ defined(__FreeBSD_kernel__) || \ -+ (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) - static nsresult Get(char aResult[MAXPATHLEN]) { - int mib[4]; - mib[0] = CTL_KERN; -@@ -246,6 +248,13 @@ class BinaryPath { - return NS_ERROR_FAILURE; - } - -+#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME)) -+ static nsresult Get(char aResult[MAXPATHLEN]) -+ { -+ char path[] = "@PREFIX@/lib/firefox/firefox"; -+ sprintf(aResult, "%s", path); -+ return NS_OK; -+ } - #else - # error Oops, you need platform-specific code here - #endif |