summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-29 17:31:58 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-10-04 17:34:00 +0200
commit16ba976f97f5690b6bbe904b33d77f513f6ad606 (patch)
tree2151d0adcbce52c25c437f933546e1acc0372c1b
parent00db7fe5c3abc9fcb2976cdfd26920b154b50306 (diff)
downloaddesktop-16ba976f97f5690b6bbe904b33d77f513f6ad606.tar.gz
desktop-16ba976f97f5690b6bbe904b33d77f513f6ad606.tar.xz
firefox: Version bump to 56.0
Disable stylo (new CSS style system originating from servo) for now because it fails to build despite the included patch (firefox-workaround-1341234.patch) which fixes one issue, but there are more: "error: failed to run custom build command for `style v0.0.1 (file:///var/tmp/paludis/build/net-www-firefox-56.0/work/firefox-56.0/servo/components/style)`" We almost certainly want to enable it in the future though. The NO_PGO workaround can go because we apply bug1332788.patch. It builds fine and I see no garbled or broken font rendering here. Change-Id: If21446590c6d57ee985b15625ec7471536c049d8
-rw-r--r--metadata/repository_mask.conf9
-rw-r--r--packages/net-www/firefox/files/firefox-55-Make-webrtc-gtest-build-work-with-system-jpeg.patch45
-rw-r--r--packages/net-www/firefox/files/firefox-workaround-1341234.patch13
-rw-r--r--packages/net-www/firefox/files/rev-e4f5cc3fbd93.patch87
-rw-r--r--packages/net-www/firefox/firefox-56.0.exheres-0 (renamed from packages/net-www/firefox/firefox-55.0.3.exheres-0)3
-rw-r--r--packages/net-www/firefox/firefox.exlib18
6 files changed, 23 insertions, 152 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 5469da2..57f14b5 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -108,13 +108,12 @@ net-apps/NetworkManager[<1.0.12] [[
description = [ CVE-2016-0764 ]
]]
-net-www/firefox[<55.0] [[
+net-www/firefox[<56.0] [[
author = [ Heiko Becker <heirecka@exherbo.org> ]
- date = [ 11 Aug 2017 ]
+ date = [ 29 Sep 2017 ]
token = security
- description = [ CVE-2017-{7753,7779,7780,7781,7782,7783,7784,7785,7786,
- 7787,7788,7789,7790,7791,7792,7794,7796,7797,7798,
- 7799,7800,7801,7802,7803,7804,7806,7807,7808,7809,} ]
+ description = [ CVE-2017-{7793,7805,7810,7811,7812,7813,7814,7815,7816,
+ 7817,7818,7819,7820,7821,7822,7823,7824,7825} ]
]]
app-admin/keepassx[<2.0] [[
diff --git a/packages/net-www/firefox/files/firefox-55-Make-webrtc-gtest-build-work-with-system-jpeg.patch b/packages/net-www/firefox/files/firefox-55-Make-webrtc-gtest-build-work-with-system-jpeg.patch
deleted file mode 100644
index 4526674..0000000
--- a/packages/net-www/firefox/files/firefox-55-Make-webrtc-gtest-build-work-with-system-jpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream: yes
-Source: backported from https://hg.mozilla.org/integration/mozilla-inbound/rev/4bc36447fcf4
- should land in Firefox 56 (https://bugzil.la/1373988)
-Reason: Fix build with system jpeg and libvpx
-
-# HG changeset patch
-# User Dan Minor <dminor@mozilla.com>
-# Date 1497876979 14400
-# Node ID 4bc36447fcf42277b0e13b42f9ec710536c3f051
-# Parent 44532a19e524df52ccf35fd0e342996027d86342
-Bug 1373988 - Make webrtc-gtest build work with system jpeg and libvpx; r=glandium
-
-MozReview-Commit-ID: 1x8v7G2fvlK
-
-diff --git a/media/webrtc/trunk/gtest/moz.build b/media/webrtc/trunk/gtest/moz.build
---- a/media/webrtc/trunk/gtest/moz.build
-+++ b/media/webrtc/trunk/gtest/moz.build
-@@ -26,9 +26,7 @@
- USE_LIBS += [
- '/media/webrtc/trunk/third_party/gflags/gflags_gflags/gflags',
- '/testing/gtest/gtest',
-- 'media_libjpeg',
- 'media_libopus',
-- 'media_libvpx',
- 'mozglue',
- 'speex',
- 'webrtc',
-@@ -41,6 +39,17 @@
- 'yuv',
- ]
-
-+if CONFIG['MOZ_SYSTEM_JPEG']:
-+ OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-+else:
-+ USE_LIBS += ['media_libjpeg']
-+
-+if CONFIG['MOZ_SYSTEM_LIBVPX']:
-+ OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
-+else:
-+ USE_LIBS += ['media_libvpx']
-+
-+
- if CONFIG['OS_TARGET'] in ['Darwin', 'Linux', 'WINNT']:
- if CONFIG['OS_TARGET'] == 'Linux':
- DEFINES['WEBRTC_LINUX'] = True
diff --git a/packages/net-www/firefox/files/firefox-workaround-1341234.patch b/packages/net-www/firefox/files/firefox-workaround-1341234.patch
new file mode 100644
index 0000000..9b17a74
--- /dev/null
+++ b/packages/net-www/firefox/files/firefox-workaround-1341234.patch
@@ -0,0 +1,13 @@
+Upstream: no, workaround until https://bugzil.la/1341234 gets fixed properly
+Source: suggested above
+Reason: Fix build with --system-nspr
+
+diff -up firefox-56.0/layout/style/bindgen.toml.in.old firefox-56.0/layout/style/bindgen.toml.in
+--- firefox-56.0/layout/style/bindgen.toml.in.old 2017-09-27 16:30:14.518213900 +0200
++++ firefox-56.0/layout/style/bindgen.toml.in 2017-09-27 16:30:38.089179153 +0200
+@@ -1,4 +1,5 @@
+ [build]
+ args = [
++ "/usr/include",
+ @BINDGEN_CFLAGS@
+ ]
diff --git a/packages/net-www/firefox/files/rev-e4f5cc3fbd93.patch b/packages/net-www/firefox/files/rev-e4f5cc3fbd93.patch
deleted file mode 100644
index fcdc9cd..0000000
--- a/packages/net-www/firefox/files/rev-e4f5cc3fbd93.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: upstream, can be removed in ff 56
-
-# HG changeset patch
-# User Paul Adenot <paul@paul.cx>
-# Date 1502179237 -7200
-# Node ID e4f5cc3fbd9360150c9abd0698ae79a3e3758fcd
-# Parent e09c51325c7bf8c1aa69fa843f4843556bbfa74b
-Bug 1384655 - Remove obsolete latency measuring macros in downstream code we don't use anymore. r=jesup, a=lizzard
-
-MozReview-Commit-ID: ARAWGe7yFM4
-
-diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
---- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
-@@ -12,24 +12,16 @@
-
- #include "webrtc/base/logging.h"
- #include "webrtc/modules/audio_device/audio_device_config.h"
- #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h"
-
- #include "webrtc/system_wrappers/include/event_wrapper.h"
- #include "webrtc/system_wrappers/include/sleep.h"
- #include "webrtc/system_wrappers/include/trace.h"
--
--#include "Latency.h"
--
--#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
-- reinterpret_cast<uint64_t>(x), 0)
--#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
-- reinterpret_cast<uint64_t>(x), frames)
--
-
- webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
-
- // Accesses ALSA functions through our late-binding symbol table instead of
- // directly. This way we don't have to link to libasound, which means our binary
- // will work on systems that don't have it.
- #define LATE(sym) \
- LATESYM_GET(webrtc_adm_linux_alsa::AlsaSymbolTable, &AlsaSymbolTable, sym)
-@@ -2138,20 +2130,18 @@ bool AudioDeviceLinuxALSA::RecThreadProc
- buffer, size);
- _recordingFramesLeft -= frames;
-
- if (!_recordingFramesLeft)
- { // buf is full
- _recordingFramesLeft = _recordingFramesIn10MS;
-
- if (_firstRecord) {
-- LOG_FIRST_CAPTURE(this);
- _firstRecord = false;
- }
-- LOG_CAPTURE_FRAMES(this, _recordingFramesIn10MS);
- // store the recorded buffer (no action will be taken if the
- // #recorded samples is not a full buffer)
- _ptrAudioBuffer->SetRecordedBuffer(_recordingBuffer,
- _recordingFramesIn10MS);
-
- uint32_t currentMicLevel = 0;
- uint32_t newMicLevel = 0;
-
-diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc b/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
---- a/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
-+++ b/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
-@@ -13,22 +13,16 @@
-
- #include "webrtc/modules/audio_device/audio_device_config.h"
- #include "webrtc/modules/audio_device/sndio/audio_device_sndio.h"
-
- #include "webrtc/system_wrappers/include/event_wrapper.h"
- #include "webrtc/system_wrappers/include/sleep.h"
- #include "webrtc/system_wrappers/include/trace.h"
-
--#include "Latency.h"
--
--#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
-- reinterpret_cast<uint64_t>(x), 0)
--#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
-- reinterpret_cast<uint64_t>(x), frames)
- extern "C"
- {
- static void playOnmove(void *arg, int delta)
- {
- static_cast<webrtc::AudioDeviceSndio *>(arg)->_playDelay -= delta;
- }
-
- static void recOnmove(void *arg, int delta)
-
diff --git a/packages/net-www/firefox/firefox-55.0.3.exheres-0 b/packages/net-www/firefox/firefox-56.0.exheres-0
index 06afabb..c8f95bc 100644
--- a/packages/net-www/firefox/firefox-55.0.3.exheres-0
+++ b/packages/net-www/firefox/firefox-56.0.exheres-0
@@ -15,7 +15,6 @@ DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/xulrunner-29.0-install-dir.patch
--fuzz=2
"${FILES}"/bug1332788.patch
- "${FILES}"/${PN}-55-Make-webrtc-gtest-build-work-with-system-jpeg.patch
- "${FILES}"/rev-e4f5cc3fbd93.patch
+ "${FILES}"/${PN}-workaround-1341234.patch
)
diff --git a/packages/net-www/firefox/firefox.exlib b/packages/net-www/firefox/firefox.exlib
index b7fccdb..7686467 100644
--- a/packages/net-www/firefox/firefox.exlib
+++ b/packages/net-www/firefox/firefox.exlib
@@ -71,12 +71,12 @@ DEPENDENCIES="
dev-lang/rust:*[>=1.17]
dev-libs/atk
dev-libs/glib:2[>=2.26]
- dev-libs/icu:=[>=58.1]
+ dev-libs/icu:=[>=59.1]
dev-libs/libIDL:2[>=0.8.0]
dev-libs/libevent:=
dev-libs/libffi[>=3.0.10]
- dev-libs/nspr[>=4.15]
- dev-libs/nss[>=3.30.2]
+ dev-libs/nspr[>=4.16]
+ dev-libs/nss[>=3.32.1]
media-libs/fontconfig[>=2.7.0]
media-libs/freetype:2[>=2.1.0]
media-libs/libvpx[>=1.5.0]
@@ -139,6 +139,8 @@ MOZILLA_SRC_CONFIGURE_PARAMS=(
--enable-chrome-format=omni
--enable-default-toolkit=cairo-gtk3
--enable-sandbox
+ # Fails to build at the moment
+ --disable-stylo
--enable-system-ffi
--enable-system-hunspell
--enable-system-pixman
@@ -195,16 +197,6 @@ old-eautoreconf() {
firefox_src_prepare() {
mozilla-pgo_src_prepare
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1332788
- # pgo leads to weird font rendering, the following works around it.
- # pretty wide, but just 'graphite2+harfbuzz', 'skia', 'thebes' doesnt work.
- # ive rebuild it enough im fed up, for now just un-pgo the entire gfx system.
- local mozbuild
- for mozbuild in $(find gfx -name moz.build); do
- echo "echo 'NO_PGO = True' >> $mozbuild" 1>&2
- echo 'NO_PGO = True' >> $mozbuild || die "Failed to append NO_PGO"
- done
-
# Upstream comment out the parts of Cargo.toml that make it work
# but recent cargo autodetect and try to use this file
edo rm media/libstagefright/binding/mp4parse_capi/build.rs