diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2017-09-04 19:12:38 +0200 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2017-09-04 19:33:48 +0200 |
commit | fd3f2dd8bda291dafb3c546d7f9e4f4fce16a47a (patch) | |
tree | 9ae71ec907b03a0fff2a20f7c9d027a1501caa55 | |
parent | 9285de9d87218c05dce0eaeeed9c92bf810a2b45 (diff) | |
download | abslibre-fd3f2dd8bda291dafb3c546d7f9e4f4fce16a47a.tar.gz abslibre-fd3f2dd8bda291dafb3c546d7f9e4f4fce16a47a.tar.bz2 abslibre-fd3f2dd8bda291dafb3c546d7f9e4f4fce16a47a.zip |
libre/iceweasel: updated to 55.0.3
-rw-r--r-- | libre/iceweasel/PKGBUILD | 18 | ||||
-rw-r--r-- | libre/iceweasel/libre.patch | 34 | ||||
-rw-r--r-- | libre/iceweasel/mozilla-1373988.patch | 43 | ||||
-rw-r--r-- | libre/iceweasel/mozilla-1384655.patch | 76 |
4 files changed, 156 insertions, 15 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 724dc7ea5..6664bf43f 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -19,14 +19,14 @@ _oldname=firefox pkgname=iceweasel epoch=1 -pkgver=54.0 +pkgver=55.0.3 pkgrel=3 _brandingver=54.0 _brandingrel=1 _parabolarepo=https://repo.parabola.nu/other/iceweasel arch=(i686 x86_64 armv7h) -pkgdesc="Iceweasel, the standalone web browser based on Mozilla Firefox." +pkgdesc="Iceweasel, the libre web browser based on Mozilla Firefox." url="https://wiki.parabola.nu/$pkgname" license=(MPL GPL LGPL) @@ -58,13 +58,15 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname fix-wifi-scanner.diff enable-object-directory-paths.patch mozilla-1253216.patch + mozilla-1373988.patch + mozilla-1384655.patch no-crmf.patch mozilla-build-arm.patch) -sha256sums=('08a9ff6870d904a2af1d03c17c6c44f67413608efb66bb280894d7b92c336a77' +sha256sums=('891836df85f8798c49f7b25661820f64d1311d59703c716eda471819b93ccda2' '03191fa14ab599695b26361f2de6e93fbb518f24142689496480d78976cc52cb' 'SKIP' 'baaa0665f81f7722a32c23f92c18aaf3203f0346acbe6c5bab45e01e69691bd8' - '3f79da57b9eff4eba4226013e8548871b6f20fcadc236420c2e32b2236fa5b1f' + 'edb33b378420836ab4990768c395a961aa71c3dad807480ae7e958574f5835a5' '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' @@ -75,6 +77,8 @@ sha256sums=('08a9ff6870d904a2af1d03c17c6c44f67413608efb66bb280894d7b92c336a77' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484' 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' + '644ec78361bc9fc64df706e9393a630e155c219202d0d557e424556820e30dcf' + 'ce24a6532179aa2b772a6ae7cf186e226a4aaffcc234f1b62e9aadbf4f668e0a' '2f8064a67c025d306f14fdd83c0ecae8d256231ec76a98150acd89162d40c3e1' '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a') validpgpkeys=( @@ -135,6 +139,12 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 patch -Np1 -i "$srcdir/no-crmf.patch" + # https://bugzilla.mozilla.org/show_bug.cgi?id=1373988 + patch -Np1 -i "$srcdir/mozilla-1373988.patch" + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1384655 + patch -Np1 -i "$srcdir/mozilla-1384655.patch" + mkdir "$srcdir/path" ln -s /usr/bin/python2 "$srcdir/path/python" diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index b2c063299..46a0c9e65 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -211,7 +211,7 @@ index 5b7bdad69..19871732e 100644 -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAACYklEQVQ4y3WSTYjNYRTGf+f9/+/NuDN3GKMxt1mYpKR8RT6zEk1iyUo2IysSNspCxEIZRSN07YiUJSWkaUIZizELMzIZlO9h3MzXvf/341jcmTGa69RZvKfnPOc5z3mhQlRd651Ry17tqQQl5uR9ONHC3EtdiPPxWKZ24bhJvQV0OlBHhiV7pTs3WpUdEmeLrnWJAhhOtJA5/3RjqZg8Lrnwy4bQT/DvTb73Qt3N9ymATNvTU15Mvx8vfvTWDrmgT0y+dzuAZM527lM0Xx6jFKvnEKIYvIIqVeMFRCfEiDBWMw9UQUBUT8fBWvmrU9HEUpUWDq2cT23a0P6kQEqEwTFLQCBJpm9mYrV+6lW0ngNr62jb0kw6KvMeXJohZYSLzz9xvOMDJG6aPUKMtZPDObq+iXPbmoG/ooJC0QVaVy2g5AI3Bkq8/jYCkQEBo9ah1hESS1N1Gu9DxXNFRji0oYm+/Stoaa4tK0kcRq1HE4fxHqOKEf4bk16ubphd9iKxGKxFrcOWLB1vvuOCzmg0Irig1MxKMfBznPbOd2DLCmJNHKgSIdzr/kjXhwKbFtVPNQ+NJiw7+YDh0YTFuVr6CwLpaNJDjCYOtR61DldyHL7975c9dqeH4ZESscC7r79BFBI7kY5YrZsCC8qL/kFyR+6yY0UjS3M1PHz5ich71IOIQGSn0cskwdTeryTyfV9+jGzOP3rTQAiIHUNQEBkCeUbkcqguB2JEMGqt4sJlg8lGIsv0+p5dON8YaVgn3veJ85/F61YNtn5uXf3OCF0TQVacP0PiXMVzpfbemlnbna+I/QPSFTsRLd+hHAAAAABJRU5ErkJggg== - --#define addon_icon data:image/vnd.microsoft.icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg== +-#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg== +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this @@ -262,12 +262,15 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index eff09189b..6d76d20f0 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -93,8 +93,6 @@ +@@ -93,11 +93,6 @@ locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) #endif +- locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico) - locale/browser/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico) +- locale/browser/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico) - locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) +- locale/browser/searchplugins/images/yandex-ru.ico (searchplugins/images/yandex-ru.ico) % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides @@ -275,7 +278,7 @@ diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json index 544740a43..4961e5437 100644 --- a/browser/locales/search/list.json +++ b/browser/locales/search/list.json -@@ -1,205 +1,190 @@ +@@ -1,753 +1,734 @@ { "default": { "visibleDefaultEngines": [ @@ -302,9 +305,6 @@ index 544740a43..4961e5437 100644 "TR": { - "google": "google-nocodes" }, - "UA": { -- "google": "google-nocodes" - }, "CN": { - "google": "google-nocodes" }, @@ -501,11 +501,15 @@ index 544740a43..4961e5437 100644 "default": { "visibleDefaultEngines": [ - "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia" +- ] +- }, +- "experimental-hidden": { +- "visibleDefaultEngines": [ +- "yandex-en" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] - }, - "experimental-hidden": { -@@ -211,539 +196,539 @@ + } + }, "en-ZA": { "default": { "visibleDefaultEngines": [ @@ -794,6 +798,14 @@ index 544740a43..4961e5437 100644 ] } }, + "lo": { + "default": { + "visibleDefaultEngines": [ +- "google", "yahoo", "bing", "ddg", "wikipedia-lo", "twitter" ++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" + ] + } + }, "lt": { "default": { "visibleDefaultEngines": [ @@ -973,7 +985,7 @@ index 544740a43..4961e5437 100644 "sk": { "default": { "visibleDefaultEngines": [ -- "google", "azet-sk", "atlas-sk", "ddg", "dunaj-sk", "slovnik-sk", "wikipedia-sk", "zoznam-sk" +- "google", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -1085,7 +1097,7 @@ index 544740a43..4961e5437 100644 "vi": { "default": { "visibleDefaultEngines": [ -- "google", "ddg", "wikipedia-vi", "zing-mp3" +- "google", "coccoc", "ddg", "wikipedia-vi", "zing-mp3" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } diff --git a/libre/iceweasel/mozilla-1373988.patch b/libre/iceweasel/mozilla-1373988.patch new file mode 100644 index 000000000..0a29024e2 --- /dev/null +++ b/libre/iceweasel/mozilla-1373988.patch @@ -0,0 +1,43 @@ +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 +@@ -25,30 +25,38 @@ LOCAL_INCLUDES += [ + '/media/libopus/include', + '/media/libopus/src', + ] + + USE_LIBS += [ + '/media/webrtc/trunk/third_party/gflags/gflags_gflags/gflags', + '/testing/gtest/gtest', +- 'media_libjpeg', + 'media_libopus', +- 'media_libvpx', + 'mozglue', + 'speex', + 'webrtc', + 'webrtc_common', + 'webrtc_i420', + 'webrtc_lib', + 'webrtc_utility', + 'webrtc_vp8', + 'webrtc_vp9', + '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 + DEFINES['WEBRTC_POSIX'] = True + + LOCAL_INCLUDES += [ + '../third_party/gflags/gen/posix/include', diff --git a/libre/iceweasel/mozilla-1384655.patch b/libre/iceweasel/mozilla-1384655.patch new file mode 100644 index 000000000..576ae15d9 --- /dev/null +++ b/libre/iceweasel/mozilla-1384655.patch @@ -0,0 +1,76 @@ +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) + |