diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-13 21:55:19 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-13 21:55:19 -0500 |
commit | fe6594d5a8354c8662a730102eaf7b5ba29bfcfd (patch) | |
tree | 628a2f3835ae7c47f787a3fbf1694f28f37326c4 /libre/iceweasel-libre/PKGBUILD | |
parent | c865c99debc0473cb5a801fd9c151fa9e0a99401 (diff) | |
parent | a00610bbb81d635636889efbd5d7eceb374469d1 (diff) |
Merge remote-tracking branch 'remotes/pgl/master' into HEAD
Diffstat (limited to 'libre/iceweasel-libre/PKGBUILD')
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 0ed8d24ee..9285849c3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,10 +12,10 @@ _pgo=true -# We're getting this from Debian Sid +# We're getting this from Debian Experimental _debname=iceweasel -_debver=24.0 -_debrel=deb2 +_debver=25.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -42,7 +42,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gstreamer0.10-good-plugins: webm and mp4 demuxing' 'gstreamer0.10-ugly-plugins: h.264 decoding' 'libpulse: PulseAudio audio driver') -url="http://packages.debian.org/sid/${_pkgname}" +url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') conflicts=('firefox') @@ -55,20 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - replace-urls.txt iceweasel-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('8f24807d67599516850a4bdca2b2fbd6' - '1f4f1347e05b15f5af137787d614ecdf' +md5sums=('dd1462b582747210cc6c2ac1d01c4c17' + '4f4cde44b6e83cf78ff5d6e757d1913c' '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '5e01a51ec4f3dd72ff2525edfe6cd371' + '8c11b80574b11e96c2ef44fa16f4b844' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - '121fefaa040936c3b96298da0c49f450' - 'a8fc4658d45b6bf9350023e5c3f34e56' + '816013881cfc9a1f4f0ede72b014f8b3' '6e335a517c68488941340ee1c23f97b0' - 'f1594fa3567e5b70202c3432d7c00202') + 'ee3279c706c3a69e6f8eda415c4d35b0') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -97,15 +95,12 @@ prepare() { sed -i "\|abouthome/snippet|d" browser/base/jar.mn # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do - if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" - grep -Erl "${moz_url}" \ - --exclude='*.'{patch,orig,rej} \ - --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" - fi - done + sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g; + \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g; + \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g; + \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g; + \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g; + ' browser/app/profile/firefox.js cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch |