From 39422b3d8eb363591cba97b20b1e0bf833c0b7ee Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Thu, 15 Jun 2017 21:53:35 +0200 Subject: libre/iceweasel: updated to 54.0 --- libre/iceweasel/PKGBUILD | 29 +++++++++++--------- libre/iceweasel/libre.patch | 53 ++++++++++++++----------------------- libre/iceweasel/mozconfig | 3 +-- libre/iceweasel/no-crmf.patch | 16 +++++++++++ libre/iceweasel/rusty-cheddar.patch | 10 ------- 5 files changed, 53 insertions(+), 58 deletions(-) create mode 100644 libre/iceweasel/no-crmf.patch delete mode 100644 libre/iceweasel/rusty-cheddar.patch (limited to 'libre/iceweasel') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index c7a1da755..823ccb40f 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -19,10 +19,10 @@ _oldname=firefox pkgname=iceweasel epoch=1 -pkgver=53.0.3 +pkgver=54.0 pkgrel=1 -_brandingver=53.0 -_brandingrel=2 +_brandingver=54.0 +_brandingrel=1 _parabolarepo=https://repo.parabola.nu/other/iceweasel arch=(i686 x86_64 armv7h) @@ -30,7 +30,7 @@ pkgdesc="Iceweasel, the standalone web browser based on Mozilla Firefox." url="https://wiki.parabola.nu/$pkgname" license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell 'icu=59.1' libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) +depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell 'icu=59.1' libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) makedepends_i686=(cargo) makedepends_x86_64=("${makedepends_i686[@]}") @@ -58,13 +58,13 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname fix-wifi-scanner.diff enable-object-directory-paths.patch mozilla-1253216.patch - mozilla-build-arm.patch - rusty-cheddar.patch) -sha256sums=('78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348' - '8a276bc0e99760752a78ffe7eb019a30486d73ed4940ea0860e5459f2143087f' + no-crmf.patch + mozilla-build-arm.patch) +sha256sums=('08a9ff6870d904a2af1d03c17c6c44f67413608efb66bb280894d7b92c336a77' + '03191fa14ab599695b26361f2de6e93fbb518f24142689496480d78976cc52cb' 'SKIP' - '3f7a7ae586c8eefcdb143bbe6e6394c9ea3e143b9557b18d5e77d04a6d0eaeb0' - '3a4181d6ea8043a9fcf892ce6b68e9e707338f05a909176ab577c1c8a6b93506' + 'baaa0665f81f7722a32c23f92c18aaf3203f0346acbe6c5bab45e01e69691bd8' + '3f79da57b9eff4eba4226013e8548871b6f20fcadc236420c2e32b2236fa5b1f' '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' @@ -75,8 +75,8 @@ sha256sums=('78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484' 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' - '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a' - 'b0977e49c473a9821c60921a2db2f6792489519c26da854458de3bde74844223') + '2f8064a67c025d306f14fdd83c0ecae8d256231ec76a98150acd89162d40c3e1' + '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a') validpgpkeys=( 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin ) @@ -124,7 +124,7 @@ prepare() { ' browser/base/content/browser-plugins.js # fix rust build - patch -Np1 -i "$srcdir/rusty-cheddar.patch" + #patch -Np1 -i "$srcdir/rusty-cheddar.patch" # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig @@ -132,6 +132,9 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 patch -Np1 -i "$srcdir/fix-wifi-scanner.diff" + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i "$srcdir/no-crmf.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 ab98eb68c..b2c063299 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -11,25 +11,25 @@ index c0b02e257..dc726d41a 100644 display: block; - position: relative; /* pin wordmark to edge of document, not of viewport */ -moz-box-ordinal-group: 0; - opacity: .5; + opacity: .2; transition: opacity 150ms; } -#aboutMozilla:hover { +#aboutGNU:hover { - opacity: 1; + opacity: .6; } -#aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla.png"); +- content: url("chrome://browser/content/abouthome/mozilla.svg"); +#aboutGNU::before { + content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); display: block; position: absolute; top: 12px; right: 12px; -- width: 69px; -- height: 19px; +- width: 70px; +- height: 20px; + width: 200px; + height: 110px; +} @@ -56,16 +56,6 @@ index c0b02e257..dc726d41a 100644 } /* [HiDPI] -@@ -446,9 +466,5 @@ body[narrow] #restorePreviousSession::before { - transform: scale(-0.5, 0.5) translateX(24px); - transform-origin: top center; - } -- -- #aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla@2x.png"); -- } - } - diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js index 50f3e01cd..5df008555 100644 --- a/browser/base/content/abouthome/aboutHome.js @@ -123,20 +113,12 @@ index 4dcd47c95..219019b20 100644 content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) -- content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) +- content/browser/abouthome/mozilla.svg (content/abouthome/mozilla.svg) + content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) + content/browser/abouthome/drm-free.png (content/abouthome/drm-free.png) content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -@@ -42,7 +43,6 @@ browser.jar: - content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) - content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) - content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) -- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) - - content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) - diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd index 7e3b57a79..6edc89d58 100644 --- a/browser/locales/en-US/chrome/browser/aboutHome.dtd @@ -280,10 +262,11 @@ 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 -@@ -98,7 +98,6 @@ +@@ -93,8 +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/wikipedia.ico (searchplugins/images/wikipedia.ico) - locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) @@ -292,7 +275,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,742 +1,722 @@ +@@ -1,205 +1,190 @@ { "default": { "visibleDefaultEngines": [ @@ -398,6 +381,14 @@ index 544740a43..4961e5437 100644 "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" ++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" + ] + } + }, + "be": { + "default": { + "visibleDefaultEngines": [ +- "yandex-by", "google", "ddg", "wikipedia-be", "wikipedia-be-tarask" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -510,15 +501,11 @@ 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": [ diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index 3c77096b4..89ccc6200 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -4,7 +4,7 @@ ac_add_options --prefix=/usr ac_add_options --enable-release ac_add_options --enable-gold ac_add_options --enable-pie -ac_add_options --enable-rust +ac_add_options --enable-optimize="-O2" # Iceweasel ac_add_options --disable-official-branding @@ -17,7 +17,6 @@ ac_add_options --with-system-icu ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite diff --git a/libre/iceweasel/no-crmf.patch b/libre/iceweasel/no-crmf.patch new file mode 100644 index 000000000..83525f6a9 --- /dev/null +++ b/libre/iceweasel/no-crmf.patch @@ -0,0 +1,16 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP + diff --git a/libre/iceweasel/rusty-cheddar.patch b/libre/iceweasel/rusty-cheddar.patch deleted file mode 100644 index 90d4d8947..000000000 --- a/libre/iceweasel/rusty-cheddar.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- firefox-52.0.2/media/libstagefright/binding/mp4parse_capi/Cargo.toml.old 2017-04-30 08:13:46.914577002 +0200 -+++ firefox-52.0.2/media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-04-30 08:11:26.937908128 +0200 -@@ -6,6 +6,7 @@ authors = [ - "Matthew Gregan ", - "Alfredo Yang ", - ] -+build = false - - description = "Parser for ISO base media file format (mp4)" - documentation = "https://mp4parse-docs.surge.sh/mp4parse/" -- cgit v1.2.3