diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 17:59:46 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 17:59:46 -0500 |
commit | 8bd930832417e307620e4bd19f00ae0846fb8600 (patch) | |
tree | ae4acecd351fc98219fdf2a173f82669a08046b4 /libre/iceweasel-libre/PKGBUILD | |
parent | 4a94f843b2402300b15872bc467e511dce86a1af (diff) |
libre/iceweasel-libre: pull in patch from Arch's firefox
Diffstat (limited to 'libre/iceweasel-libre/PKGBUILD')
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index d557073d5..4dc30c9ad 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -106,7 +106,8 @@ source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc) $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2) $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done) replace-urls.txt libre.patch mozconfig.pgo - mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch) + mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch + bug677092.patch) # use dpkg-source to extract everything noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done @@ -137,6 +138,10 @@ prepare() { patch -Np1 -i ../iceweasel-install-dir.patch patch -Np1 -i ../shared-libs.patch + # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092 + # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468 + patch -Rp1 -i ../bug677092.patch + # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do if [[ -n $moz_url ]]; then @@ -397,4 +402,5 @@ md5sums=('263569a577f72314694a711cc6a0d96f' '39d8b9249c5effe5fe24d2e9f80a9a94' '2baf8cffccd50c568ad153a709cb3136' 'e9b4ec9a34bdab1854255aaa05e7cedd' - '52e52f840a49eb1d14be1c0065b03a93') + '52e52f840a49eb1d14be1c0065b03a93' + '23520aca140fb0dd3e1b6f21b21f591f') |