Page MenuHomeFreeBSD
Files F177241803

D16356.1793989155.diff
No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

D16356.1793989155.diff
View Options

Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk
+++ Mk/bsd.gecko.mk
@@ -381,7 +381,7 @@
.endif
.if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
-BUILD_DEPENDS+= ${RUST_PORT:T}>=1.24:${RUST_PORT}
+BUILD_DEPENDS+= ${RUST_PORT:T}>=1.27:${RUST_PORT}
RUST_PORT?= lang/rust
. if ${MOZILLA_VER:R:R} < 54
MOZ_OPTIONS+= --enable-rust
Index: www/firefox/Makefile
===================================================================
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 62.0b11
+DISTVERSION= 63.0a1.427995
PORTEPOCH= 1
CATEGORIES= www ipv6
-MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
-DISTNAME= ${PORTNAME}-${PORTVERSION:R}
-DISTFILES= ${DISTNAME}${PORTVERSION:E}.source${EXTRACT_SUFX}
+MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/
+DIST_SUBDIR= ${PORTNAME}
+DISTNAME= 54f69f217483467dbd22e02ab4a98d8d8bc0ded8
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@@ -17,7 +16,7 @@
nss>=3.38:security/nss \
icu>=59.1,1:devel/icu \
libevent>=2.1.8:devel/libevent \
- harfbuzz>=1.7.6:print/harfbuzz \
+ harfbuzz>=1.8.4:print/harfbuzz \
graphite2>=1.3.11:graphics/graphite2 \
png>=1.6.34:graphics/png \
libvorbis>=1.3.6,3:audio/libvorbis \
@@ -34,9 +33,10 @@
CONFLICTS_INSTALL= firefox-esr
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -cairo -hunspell -soundtouch
+WRKSRC= ${WRKDIR}/${MASTER_SITES:M*hg*:S,/archive/,,:T}-${DISTNAME}
USE_GL= gl
-USES= tar:xz
+USES= tar:bzip2
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
@@ -49,6 +49,8 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
post-patch:
+ @${REINPLACE_CMD} -e '/AM_PATH_NSS/s/3\.39/3.38/' \
+ ${WRKSRC}/old-configure.in
@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
${FIREFOX_DESKTOP}
Index: www/firefox/distinfo
===================================================================
--- www/firefox/distinfo
+++ www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532372490
-SHA256 (firefox-62.0b11.source.tar.xz) = 8b2bddbef16415ae791332fb6c50a36b17dfd966f7ab3b6c5d072a2b018f84cf
-SIZE (firefox-62.0b11.source.tar.xz) = 259222232
+TIMESTAMP = 1532127112
+SHA256 (firefox/54f69f217483467dbd22e02ab4a98d8d8bc0ded8.tar.bz2) = 340ca87adb788a1a7b34f34819ce860866828824c8a66dd2e6b8eaef28bf5915
+SIZE (firefox/54f69f217483467dbd22e02ab4a98d8d8bc0ded8.tar.bz2) = 322221021
Index: www/firefox/files/patch-bug1288587
===================================================================
--- www/firefox/files/patch-bug1288587
+++ www/firefox/files/patch-bug1288587
@@ -43,13 +43,13 @@
topobjdir = topobjdir[:-7]
with LineIO(lambda l: log.info(l)) as out:
-@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig
log.info('Creating Python environment')
manager.build(python)
python = normsep(manager.python_path)
- if python != normsep(sys.executable):
+ if not normsep(sys.executable).startswith(normsep(virtualenvs_root)):
log.info('Reexecuting in the virtualenv')
if env_python:
- del os.environ['PYTHON']
Index: www/firefox/files/patch-bug1448770
===================================================================
--- www/firefox/files/patch-bug1448770
+++ www/firefox/files/patch-bug1448770
@@ -1,10 +1,10 @@
Disable GL_EXT_debug_marker due to crashes on x86 with Mesa drivers.
-diff --git gfx/webrender/src/query.rs gfx/webrender/src/query.rs
+diff --git gfx/webrender/src/device/query_gl.rs gfx/webrender/src/device/query_gl.rs
index 999abc749115..68850ef025e4 100644
---- gfx/webrender/src/query.rs
-+++ gfx/webrender/src/query.rs
-@@ -274,17 +274,20 @@ pub struct GpuMarker {
+--- gfx/webrender/src/device/query_gl.rs
++++ gfx/webrender/src/device/query_gl.rs
+@@ -278,17 +278,20 @@ pub struct GpuMarker {
impl GpuMarker {
fn new(gl: &Rc<gl::Gl>, message: &str) -> Self {
Index: www/firefox/files/patch-bug1473732
===================================================================
--- /dev/null
+++ www/firefox/files/patch-bug1473732
@@ -0,0 +1,39 @@
+Base default number of OMTP workers on the number of logical CPU cores.
+
+system-info is a stub on Tier3 platforms while physical vs. logical
+difference only matters for hyper-threading. As hyper-threading
+is usually available on CPUs with more than 2 physical cores this
+change has no impact there as the default is clamped to [1, 4].
+However, on Intel i3-* CPUs with 2 physical and 4 logical cores this
+bumps the default from 1 to 3.
+
+diff --git gfx/layers/PaintThread.cpp gfx/layers/PaintThread.cpp
+index ef268f47651b6..f8929d11ae156 100644
+--- gfx/layers/PaintThread.cpp
++++ gfx/layers/PaintThread.cpp
+@@ -22,7 +22,7 @@
+ #include "mozilla/SyncRunnable.h"
+ #include "nsIPropertyBag2.h"
+ #include "nsServiceManagerUtils.h"
+-#include "nsSystemInfo.h"
++#include "prsystem.h"
+
+ // Uncomment the following line to dispatch sync runnables when
+ // painting so that rasterization happens synchronously from
+@@ -156,15 +156,7 @@ PaintThread::AddRef()
+ /* static */ int32_t
+ PaintThread::CalculatePaintWorkerCount()
+ {
+- int32_t cpuCores = 1;
+- nsCOMPtr<nsIPropertyBag2> systemInfo = do_GetService(NS_SYSTEMINFO_CONTRACTID);
+- if (systemInfo) {
+- nsresult rv = systemInfo->GetPropertyAsInt32(NS_LITERAL_STRING("cpucores"), &cpuCores);
+- if (NS_FAILED(rv)) {
+- cpuCores = 1;
+- }
+- }
+-
++ int32_t cpuCores = PR_GetNumberOfProcessors();
+ int32_t workerCount = gfxPrefs::LayersOMTPPaintWorkers();
+
+ // If not manually specified, default to (cpuCores * 3) / 4, and clamp
Index: www/firefox/files/patch-bug847568
===================================================================
--- www/firefox/files/patch-bug847568
+++ www/firefox/files/patch-bug847568
@@ -249,7 +249,7 @@
+option('--with-system-harfbuzz',
+ help="Use system harfbuzz (located with pkgconfig)")
+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.8.4',
+ when='--with-system-harfbuzz')
+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 6, 6:19 PM (13 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41528533
Default Alt Text
D16356.1793989155.diff (6 KB)

Event Timeline