diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-11-22 13:03:18 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-11-22 13:03:18 -0300 |
commit | ba0b8906199404b7b00cfeac91bff3036b8692e8 (patch) | |
tree | 77d6dbaf822d1a66046f76c6698ec9d0f61a9bcd /libre/iceweasel-libre | |
parent | adc549e8519824da803230cee62bfd7d808df989 (diff) | |
parent | f97ff910471fb3ae2c8ea69befecaae8cbf6dbea (diff) | |
download | abslibre-ba0b8906199404b7b00cfeac91bff3036b8692e8.tar.gz abslibre-ba0b8906199404b7b00cfeac91bff3036b8692e8.tar.bz2 abslibre-ba0b8906199404b7b00cfeac91bff3036b8692e8.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/iceweasel-libre')
-rwxr-xr-x | libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 4 | ||||
-rwxr-xr-x | libre/iceweasel-libre/PKGBUILD | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index a5fe02165..69fe5c072 100755 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 60348b5..c240c4f 100644
+index 68a52e6..02bb30e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 7532436d7..185f1c039 100755 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=16.0.2 +_debver=17.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('4a4f19048e34f7f0a2d28adc351df1ed' - 'ee38477dd7ede1c32e559ee74139b5c9' +md5sums=('3e555026478026987753b4859ec91d3b' + '9b07815d94b8190c780fac10009025b9' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' @@ -61,7 +61,7 @@ md5sums=('4a4f19048e34f7f0a2d28adc351df1ed' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - '0a31239f1008038df5057982fe745dec') + '65f68090d2a69b467bd2707d0c4ea3bd') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") |