diff options
author | Figue | 2017-03-07 00:55:10 +0100 |
---|---|---|
committer | Figue | 2017-03-07 00:55:10 +0100 |
commit | f051e7b45d60775079c25d83c8e73ab1b68edb51 (patch) | |
tree | 5fc3ff462b7e1c07e24268beb895fac672010356 | |
parent | 527c3b44854590b4172128842cb6a662d842fcbe (diff) | |
download | aur-f051e7b45d60775079c25d83c8e73ab1b68edb51.tar.gz |
Update to 52.0esr
-rw-r--r-- | .SRCINFO | 25 | ||||
-rw-r--r-- | PKGBUILD | 157 | ||||
-rw-r--r-- | firefox-symbolic.svg | 30 | ||||
-rw-r--r-- | fix-wifi-scanner.diff | 16 | ||||
-rw-r--r-- | harfbuzz-1.1.3-fixed.patch.gz | bin | 41786 -> 0 bytes | |||
-rw-r--r-- | mozconfig | 32 | ||||
-rw-r--r-- | mozilla-1245076-1.patch | 49 | ||||
-rw-r--r-- | no-libnotify.patch | 51 | ||||
-rw-r--r-- | rust-i686.patch | 16 | ||||
-rw-r--r-- | vendor.js | 9 |
10 files changed, 183 insertions, 202 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-esr pkgdesc = Standalone web browser from mozilla.org, Extended Support Release - pkgver = 45.7.0 + pkgver = 52.0 pkgrel = 1 url = https://www.mozilla.org/en-US/firefox/organizations/ arch = i686 @@ -20,6 +20,7 @@ pkgbase = firefox-esr makedepends = inetutils makedepends = xorg-server-xvfb makedepends = autoconf2.13 + makedepends = cargo depends = gtk3 depends = gtk2 depends = mozilla-common @@ -37,28 +38,26 @@ pkgbase = firefox-esr depends = ttf-font depends = icu optdepends = networkmanager: Location detection via available WiFi networks + optdepends = libnotify: Notification integration optdepends = upower: Battery API + optdepends = speech-dispatcher: Text-to-Speech provides = firefox conflicts = firefox options = !emptydirs options = !makeflags - source = https://ftp.mozilla.org/pub/firefox/releases/45.7.0esr/source/firefox-45.7.0esr.source.tar.xz - source = mozconfig + source = https://ftp.mozilla.org/pub/firefox/releases/52.0esr/source/firefox-52.0esr.source.tar.xz source = firefox.desktop + source = firefox-symbolic.svg source = firefox-install-dir.patch - source = vendor.js - source = mozilla-1245076-1.patch - source = no-libnotify.patch - source = harfbuzz-1.1.3-fixed.patch.gz + source = rust-i686.patch + source = fix-wifi-scanner.diff validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A - sha256sums = 4b5610691d32b77dd0dec25902f0d19e530c184cedc11babb530621cbdd33143 - sha256sums = 21ef71942681206c650862215543f35fd0ceaed362d93d6f9c30f7a24fb204b4 + sha256sums = 40748a6d73ecea29257c1b4bdbb8d218c35bf98bef380173c780e922132506de sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826 + sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9 sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd - sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4 - sha256sums = 6e7cba25c52b246da183b8309e7b56208bd991d1a7adb40063c5702a6f3722ea - sha256sums = e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7 - sha256sums = 899c19ee98b0eab3d98383d70220ab26c912eeec8b04c8dd37f05d0ab389e574 + sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269 + sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8 pkgname = firefox-esr @@ -1,39 +1,36 @@ -# $Id: PKGBUILD 239402 2015-05-15 12:36:25Z foutrelis $ +# $Id$ # Maintainer : Figue <ffigue@gmail.com> # Contributor : Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox-esr -pkgver=45.7.0 +pkgver=52.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release" -arch=('i686' 'x86_64') -license=('MPL' 'GPL' 'LGPL') +arch=(i686 x86_64) +license=(MPL GPL LGPL) url="https://www.mozilla.org/en-US/firefox/organizations/" -depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' - 'dbus-glib' 'alsa-lib' 'ffmpeg' 'libvpx' 'libevent' 'nss' 'hunspell' - 'sqlite' 'ttf-font' 'icu') -makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' - 'libpulse' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13') +depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg + libvpx libevent nss hunspell sqlite ttf-font icu) +makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb + autoconf2.13 cargo) optdepends=('networkmanager: Location detection via available WiFi networks' - 'upower: Battery API') + 'libnotify: Notification integration' + 'upower: Battery API' + 'speech-dispatcher: Text-to-Speech') provides=(firefox) conflicts=(firefox) options=('!emptydirs' '!makeflags') source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz - mozconfig firefox.desktop firefox-install-dir.patch vendor.js - mozilla-1245076-1.patch - no-libnotify.patch - harfbuzz-1.1.3-fixed.patch.gz) -sha256sums=('4b5610691d32b77dd0dec25902f0d19e530c184cedc11babb530621cbdd33143' - '21ef71942681206c650862215543f35fd0ceaed362d93d6f9c30f7a24fb204b4' + firefox.desktop firefox-symbolic.svg + firefox-install-dir.patch rust-i686.patch fix-wifi-scanner.diff) +sha256sums=('40748a6d73ecea29257c1b4bdbb8d218c35bf98bef380173c780e922132506de' 'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826' + 'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' - '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' - '6e7cba25c52b246da183b8309e7b56208bd991d1a7adb40063c5702a6f3722ea' - 'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7' - '899c19ee98b0eab3d98383d70220ab26c912eeec8b04c8dd37f05d0ab389e574') + 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269' + '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -42,35 +39,75 @@ validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') # more information. _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM +# Mozilla API keys (see https://location.services.mozilla.com/api) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact heftig@archlinux.org for +# more information. +_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff + + prepare() { + mkdir path + ln -s /usr/bin/python2 path/python + cd firefox-${pkgver}esr - cp ../mozconfig .mozconfig patch -Np1 -i ../firefox-install-dir.patch - # GCC 6 - patch -Np1 -i ../mozilla-1245076-1.patch - - # Notifications with libnotify are broken - # https://bugzilla.mozilla.org/show_bug.cgi?id=1236150 - patch -Np1 -i ../no-libnotify.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 + patch -Np1 -i ../fix-wifi-scanner.diff - # Harfbuzz patch to v1.1.3 - patch -Np1 -i ../harfbuzz-1.1.3-fixed.patch + # Build with the rust targets we actually ship + patch -Np1 -i ../rust-i686.patch echo -n "$_google_api_key" >google-api-key - echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig - - mkdir "$srcdir/path" - ln -s /usr/bin/python2 "$srcdir/path/python" - + echo -n "$_mozilla_api_key" >mozilla-api-key + + cat >.mozconfig <<END +ac_add_options --enable-application=browser + +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 + +# Branding +ac_add_options --enable-official-branding +ac_add_options --enable-update-channel=release +export MOZ_ADDON_SIGNING=1 +export MOZ_REQUIRE_SIGNING=1 + +# Keys +ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key +ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +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 +ac_add_options --enable-system-ffi +ac_add_options --enable-system-pixman + +# Features +ac_add_options --enable-startup-notification +ac_add_options --disable-crashreporter +ac_add_options --disable-updater + +STRIP_FLAGS="--strip-debug" +END } build() { cd firefox-${pkgver}esr - export PATH="$srcdir/path:$PATH" - # _FORTIFY_SOURCE causes configure failures CPPFLAGS+=" -O2" @@ -78,12 +115,13 @@ build() { LDFLAGS+=" -Wl,-z,now" # GCC 6 - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-schedule-insns2" + + export PATH="$srcdir/path:$PATH" # Do PGO -# xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \ -# make -f client.mk build MOZ_PGO=1 + #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ + # make -f client.mk build MOZ_PGO=1 make -f client.mk build } @@ -91,11 +129,25 @@ package() { cd firefox-${pkgver}esr make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox-esr/browser/defaults/preferences/vendor.js" + _vendorjs="$pkgdir/usr/lib/firefox/browser/defaults/preferences/vendor.js" + install -Dm644 /dev/stdin "$_vendorjs" <<END +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); + +// Opt all of us into e10s, instead of just 50% +pref("browser.tabs.remote.autostart", true); +END for i in 16 22 24 32 48 256; do - install -Dm644 browser/branding/official/default$i.png \ - "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png" + install -Dm644 browser/branding/official/default$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png" done install -Dm644 browser/branding/official/content/icon64.png \ "$pkgdir/usr/share/icons/hicolor/64x64/apps/firefox.png" @@ -105,16 +157,25 @@ package() { "$pkgdir/usr/share/icons/hicolor/192x192/apps/firefox.png" install -Dm644 browser/branding/official/content/about-logo@2x.png \ "$pkgdir/usr/share/icons/hicolor/384x384/apps/firefox.png" + install -Dm644 ../firefox-symbolic.svg \ + "$pkgdir/usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg" install -Dm644 ../firefox.desktop \ "$pkgdir/usr/share/applications/firefox.desktop" # Use system-provided dictionaries - rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation" + rm -r "$pkgdir"/usr/lib/firefox/dictionaries + ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries" + ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation" + + # Install a wrapper to avoid confusion about binary path + install -Dm755 /dev/stdin "$pkgdir/usr/bin/firefox" <<END +#!/bin/sh +exec /usr/lib/firefox/firefox "\$@" +END - # Replace duplicate binary with symlink + # Replace duplicate binary with wrapper # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" + ln -srf "$pkgdir/usr/bin/firefox" \ + "$pkgdir/usr/lib/firefox/firefox-bin" } diff --git a/firefox-symbolic.svg b/firefox-symbolic.svg new file mode 100644 index 000000000000..7a2c73e455d4 --- /dev/null +++ b/firefox-symbolic.svg @@ -0,0 +1,30 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='firefox-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16' xmlns='http://www.w3.org/2000/svg'> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-10.975734' inkscape:cy='233.73843' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1403' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='2560' inkscape:window-y='0' inkscape:zoom='1'> + <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-222.00001' originy='-381.99852' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> + <defs id='defs7386'> + <linearGradient id='linearGradient7212' osb:paint='solid'> + <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/> + </linearGradient> + </defs> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-463.00021,164.99852)'> + + <path inkscape:connector-curvature='0' d='M 469.05437,-154.9679 Z' id='path17747' style='fill:none;stroke:#000000;stroke-width:0.99851286px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1'/> + <path inkscape:connector-curvature='0' d='M 469.08553,-154.9054 Z' id='path17749' style='fill:none;stroke:#000000;stroke-width:0.99851286px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1'/> + <path inkscape:connector-curvature='0' d='m 473.0627,-162.9375 c -0.41568,-0.0182 -0.62813,0.0274 -0.625,0.0312 0.006,0.008 1.72988,0.32697 2.03125,0.75 0,0 -0.71915,0.007 -1.4375,0.21875 -0.0325,0.01 2.64053,0.33122 3.1875,3.0625 0,0 -0.29354,-0.64386 -0.65625,-0.75 0.23852,0.74134 0.16466,2.17583 -0.0625,2.875 -0.0292,0.0899 -0.0525,-0.38762 -0.5,-0.59375 0.14332,1.04923 -0.006,2.6978 -0.71875,3.15625 -0.0555,0.0357 0.43942,-1.64894 0.0937,-1 -2.06368,3.2325 -4.50486,1.31102 -5.5,0.625 0.79871,0.19996 1.80035,0.0704 2.125,-0.15625 0.49572,-0.34615 0.79916,-0.59107 1.0625,-0.53125 0.26322,0.0601 0.42318,-0.22934 0.21875,-0.46875 -0.20466,-0.23989 -0.70268,-0.55471 -1.375,-0.375 -0.47415,0.12687 -1.04057,0.54268 -1.9375,0 -0.7652,-0.46319 -0.67076,-0.69942 -0.67076,-0.93907 0,-0.23977 0.21387,-0.59107 0.59375,-0.53125 0.0851,0.0134 0.15074,0.009 0.1875,0 0.18483,0.0422 0.35743,0.0964 0.53125,0.1875 0.008,-0.2241 -0.0292,-0.87345 -0.15625,-1.23012 0.0106,0.004 0.0289,0.011 0.0312,0 0.0384,-0.17687 1.05477,-0.18386 1.37388,-0.59643 0.20404,-0.26362 0.14073,-0.79683 0.14073,-0.79683 l -1,0 c -0.52354,0.002 -0.97244,-0.75086 -1.01451,-0.85669 0.11444,-0.62597 0.48612,-0.83952 1.01451,-1.14331 -0.39748,-0.003 -0.18871,0 -1,0 -0.52875,0 -0.84718,0.36158 -1.01451,0.54956 -0.70058,-0.16587 -1.38144,-0.25227 -1.86049,-0.0609 -0.22125,-0.22941 -0.39604,-0.80055 -0.42188,-1.48863 0,0 -1.20486,0.73864 -1.07812,2.55113 -0.002,0.14904 -0.0499,0.21348 -0.0625,0.3125 -0.13061,0.22845 -0.1553,0.40492 -0.125,0.375 -0.0656,0.13627 -0.15391,0.28402 -0.21875,0.46875 -0.0149,0.0362 -0.0495,0.0463 -0.0625,0.0937 -0.009,0.0322 0.002,0.0638 0,0.0937 -0.11512,0.36099 -0.21516,0.98244 -0.3125,1.54262 0,0 0.12424,-0.51425 0.3125,-0.88637 -0.15639,0.54353 -0.26211,1.54974 -0.1875,2.73012 0,0 0.015,-0.20429 0.0625,-0.5 0.0465,0.80102 0.25925,1.72737 0.84375,2.75 1.46152,2.5575 3.89248,3.68885 6.4375,3.46875 0.44516,-0.0296 0.89639,-0.10834 1.34375,-0.21875 5.92923,-1.46449 5.28125,-8.78118 5.28125,-8.78118 l -0.15625,1.09375 c 0,0 -0.24147,-1.99977 -0.53125,-2.75 -0.44412,-1.14957 -0.62372,-1.15791 -0.625,-1.15625 0.29743,0.77226 0.21875,1.1875 0.21875,1.1875 0,0 -0.51279,-1.43939 -1.90625,-1.90625 -0.82515,-0.27632 -1.45932,-0.38807 -1.875,-0.40625 z' id='path159-6' sodipodi:nodetypes='sccccccccccsccccscccccscccccccccccccccccccccccccccs' style='fill:#bebebe;fill-opacity:1;stroke:none'/> + <path inkscape:connector-curvature='0' d='m 470.87695,-164.01953 c -0.83043,0.0139 -1.67042,0.17659 -2.48047,0.5 l -0.46289,0.18359 c 0.66083,0.79767 1.84339,0.43951 1.84339,0.43951 2.50802,-0.52344 5.12427,0.6034 6.44177,2.89252 1.49591,2.59908 0.85463,5.89258 -1.50586,7.74219 -2.36049,1.84961 -5.71108,1.68349 -7.87695,-0.39062 -2.16588,-2.07412 -2.47623,-5.41522 -0.73047,-7.85352 l 0.29101,-0.40625 -0.81445,-0.58203 -0.29101,0.40625 c -2.03104,2.83673 -1.66628,6.74516 0.85351,9.1582 2.5198,2.41305 6.43934,2.60693 9.18555,0.45508 2.74621,-2.15185 3.49621,-6.00355 1.75586,-9.02734 -1.30527,-2.26785 -3.7177,-3.55935 -6.20899,-3.51758 z' id='path22109' sodipodi:nodetypes='ccccsssccccsssc' style='color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/> + </g> +</svg> diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff new file mode 100644 index 000000000000..f8fdd6c42142 --- /dev/null +++ b/fix-wifi-scanner.diff @@ -0,0 +1,16 @@ + netwerk/wifi/nsWifiScannerDBus.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp +index 182553e18fa6e104..6fa0a0b023d3e45f 100644 +--- c/netwerk/wifi/nsWifiScannerDBus.cpp ++++ i/netwerk/wifi/nsWifiScannerDBus.cpp +@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface, + return NS_ERROR_FAILURE; + } + } else if (!strcmp(aFuncCall, "GetAll")) { +- const char* param = ""; ++ const char* param = "org.freedesktop.NetworkManager.AccessPoint"; + if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, ¶m)) { + return NS_ERROR_FAILURE; + } diff --git a/harfbuzz-1.1.3-fixed.patch.gz b/harfbuzz-1.1.3-fixed.patch.gz Binary files differdeleted file mode 100644 index 7b77351caa9d..000000000000 --- a/harfbuzz-1.1.3-fixed.patch.gz +++ /dev/null diff --git a/mozconfig b/mozconfig deleted file mode 100644 index 9329c542afda..000000000000 --- a/mozconfig +++ /dev/null @@ -1,32 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --enable-release -ac_add_options --enable-gold -ac_add_options --enable-pie - -ac_add_options --enable-official-branding - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -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 -ac_add_options --enable-system-ffi -ac_add_options --enable-system-pixman - -# Features -ac_add_options --enable-startup-notification -ac_add_options --enable-gstreamer=1.0 -ac_add_options --disable-updater -ac_add_options --disable-crashreporter - -STRIP_FLAGS="--strip-debug" - -# vim:set ft=sh: diff --git a/mozilla-1245076-1.patch b/mozilla-1245076-1.patch deleted file mode 100644 index dfc52c2cf7c4..000000000000 --- a/mozilla-1245076-1.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h ---- a/config/gcc-stl-wrapper.template.h -+++ b/config/gcc-stl-wrapper.template.h -@@ -12,33 +12,39 @@ - // compiling ObjC. - #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS) - # error "STL code can only be used with -fno-exceptions" - #endif - - // Silence "warning: #include_next is a GCC extension" - #pragma GCC system_header - -+#ifndef moz_dont_include_mozalloc_for_cstdlib -+# define moz_dont_include_mozalloc_for_cstdlib -+#endif -+#ifndef moz_dont_include_mozalloc_for_${HEADER} - // mozalloc.h wants <new>; break the cycle by always explicitly - // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: - // - // `#include_next' does not distinguish between <file> and "file" - // inclusion, nor does it check that the file you specify has the - // same name as the current file. It simply looks for the file - // named, starting with the directory in the search path after the - // one where the current file was found. --#include_next <new> -+# include_next <new> - - // See if we're in code that can use mozalloc. NB: this duplicates - // code in nscore.h because nscore.h pulls in prtypes.h, and chromium - // can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+ - #endif - - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) - // Enable checked iterators and other goodies - // - // FIXME/bug 551254: gcc's debug STL implementation requires -frtti. - // Figure out how to resolve this with -fno-rtti. Maybe build with - // -frtti in DEBUG builds? - diff --git a/no-libnotify.patch b/no-libnotify.patch deleted file mode 100644 index 8d584574364d..000000000000 --- a/no-libnotify.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git i/toolkit/system/gnome/moz.build w/toolkit/system/gnome/moz.build -index 0ecde07..206d6eb 100644 ---- i/toolkit/system/gnome/moz.build -+++ w/toolkit/system/gnome/moz.build -@@ -5,9 +5,7 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -- 'nsAlertsIconListener.cpp', - 'nsGnomeModule.cpp', -- 'nsSystemAlertsService.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: -diff --git i/toolkit/system/gnome/nsGnomeModule.cpp w/toolkit/system/gnome/nsGnomeModule.cpp -index 6ecebcc..2f193a3 100644 ---- i/toolkit/system/gnome/nsGnomeModule.cpp -+++ w/toolkit/system/gnome/nsGnomeModule.cpp -@@ -20,8 +20,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPackageKitService, Init) - #endif --#include "nsSystemAlertsService.h" --NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); -@@ -31,7 +29,6 @@ NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_PACKAGEKITSERVICE_CID); - #endif --NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF -@@ -42,7 +39,6 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - { &kNS_PACKAGEKITSERVICE_CID, false, nullptr, nsPackageKitServiceConstructor }, - #endif -- { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, - { nullptr } - }; - -@@ -55,7 +51,6 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - { NS_PACKAGEKITSERVICE_CONTRACTID, &kNS_PACKAGEKITSERVICE_CID }, - #endif -- { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - diff --git a/rust-i686.patch b/rust-i686.patch new file mode 100644 index 000000000000..85512e1436b8 --- /dev/null +++ b/rust-i686.patch @@ -0,0 +1,16 @@ + build/moz.configure/rust.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure +index cd86b24153debb1b..44911715e25d95e3 100644 +--- c/build/moz.configure/rust.configure ++++ i/build/moz.configure/rust.configure +@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling): + # OpenBSD + ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd', + # Linux +- ('x86', 'Linux'): 'i586-unknown-linux-gnu', ++ ('x86', 'Linux'): 'i686-unknown-linux-gnu', + # Linux + ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu', + # OS X and iOS diff --git a/vendor.js b/vendor.js deleted file mode 100644 index d8d606bc15d7..000000000000 --- a/vendor.js +++ /dev/null @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); |