summaryrefslogtreecommitdiff
path: root/mozilla-testing/icecat
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-02-15 18:52:39 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-02-15 18:52:39 -0300
commitfe0d2be6d21b9605b4ca6393406a33fa50e0cddf (patch)
treef0f247f86ab5b4ffbcb19e0f33bdfcf183e9de66 /mozilla-testing/icecat
parente242de1ee4425576eaa3c582b24844f8ba8cde79 (diff)
parent78d410bee5264bc4a1c9621a25df943baeb4b753 (diff)
downloadabslibre-fe0d2be6d21b9605b4ca6393406a33fa50e0cddf.tar.gz
abslibre-fe0d2be6d21b9605b4ca6393406a33fa50e0cddf.tar.bz2
abslibre-fe0d2be6d21b9605b4ca6393406a33fa50e0cddf.zip
Merge branch 'master' of ssh://gparabola/abslibre
Diffstat (limited to 'mozilla-testing/icecat')
-rw-r--r--mozilla-testing/icecat/PKGBUILD15
-rw-r--r--mozilla-testing/icecat/libre.patch2
-rw-r--r--mozilla-testing/icecat/libvpx.patch12
3 files changed, 22 insertions, 7 deletions
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
index 4379ee60c..5946af42f 100644
--- a/mozilla-testing/icecat/PKGBUILD
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -14,8 +14,8 @@
_pgo=false
_pkgname=icecat
-pkgver=9.0.1
-pkgrel=2
+pkgver=10.0
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -69,7 +69,8 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
icecat-safe.desktop
libre.patch
firefox-install-dir.patch
- vendor.js)
+ vendor.js
+ libvpx.patch)
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname")
@@ -83,6 +84,7 @@ build() {
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
+ patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
if $_pgo; then
cat "$srcdir/mozconfig.pgo" >> .mozconfig
@@ -136,11 +138,12 @@ package() {
ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
}
-md5sums=('a135581da2fd2845f268d7ca91054c06'
+md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
'6f3a8fd65c416216a1b56b0c2d2d81aa'
'ac29b01c189f20abae2f3eef1618ffc0'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
'd93fe402b87cd000a869e1fd6badc6c9'
- '07e65752416e615fe04ce586bc58f86b'
+ '145f453ef82f643711c10d97ec57a805'
'1e4bcac59e93d21fffa6a1d1ad235247'
- 'c382e35315047e4ca368d09383b39b8d')
+ 'c382e35315047e4ca368d09383b39b8d'
+ '5d418ecdbdb9f40597df6b978b0b5ee5')
diff --git a/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch
index c5f59d858..3dca93ee7 100644
--- a/mozilla-testing/icecat/libre.patch
+++ b/mozilla-testing/icecat/libre.patch
@@ -5,7 +5,7 @@
// Dictionary download preference
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/9.0.1/");
++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/");
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
diff --git a/mozilla-testing/icecat/libvpx.patch b/mozilla-testing/icecat/libvpx.patch
new file mode 100644
index 000000000..f883b8e08
--- /dev/null
+++ b/mozilla-testing/icecat/libvpx.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
+--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000
++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000
+@@ -5629,7 +5629,7 @@
+ dnl v0.9.6 one to check for.
+ AC_TRY_COMPILE([
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+ ],