diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-03 12:15:35 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-03 12:15:35 -0200 |
commit | 4708588870352f162407ed0ca13618ba15539997 (patch) | |
tree | 1de5a6cdbc1d1609df8f03e8447b9c00b4e256fd /libre | |
parent | a2331ffc48bf26353c640780355a27f4a6ef2917 (diff) | |
download | abslibre-4708588870352f162407ed0ca13618ba15539997.tar.gz abslibre-4708588870352f162407ed0ca13618ba15539997.tar.bz2 abslibre-4708588870352f162407ed0ca13618ba15539997.zip |
iceweasel: fix bug #590 -> https://labs.parabola.nu/issues/590
Diffstat (limited to 'libre')
-rw-r--r-- | libre/iceweasel/PKGBUILD | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 587d6db07..27f04a489 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -6,6 +6,8 @@ # Contributor: vando <facundo@esdebian.org> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Contributor: Figue <ffigue at gmail> +# Contributor: taro-k <taro-k@movasense_com> +# Contributor: Michał Masłowski <mtjm@mtjm.eu> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> @@ -17,7 +19,6 @@ _debname=iceweasel _debver=33.0 _debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ -_parabolarepo=https://repo.parabolagnulinux.org/other/$_debname-libre debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel @@ -42,8 +43,7 @@ url="http://packages.debian.org/experimental/${pkgname}" install=$pkgname.install replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") -mksource=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2") -source=("$_parabolarepo/$_debname-libre_$_debver.orig.tar.bz2" +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" mozconfig mozconfig.pgo @@ -55,8 +55,7 @@ source=("$_parabolarepo/$_debname-libre_$_debver.orig.tar.bz2" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -mkmd5sums=('5288af8026ff814fc4d769fed69865f7') -md5sums=('fb98f648a43df8b54bbfeec3602cf3aa' +md5sums=('5288af8026ff814fc4d769fed69865f7' 'b80c7833dc8aaba3ff394c13532895b8' '5eca2c1dbdd9c043b24de39cd05d6e8f' 'df08eaa1ac3bc6c2356be4fbf8ec8932' @@ -69,15 +68,6 @@ md5sums=('fb98f648a43df8b54bbfeec3602cf3aa' '16a112aaeee34ff3cae1fc1a521448a0' '6e335a517c68488941340ee1c23f97b0') -mksource() { - export DEBIAN_BUILD="mozilla-release" - - cd "$srcdir/$DEBIAN_BUILD" - - # Remove nonfree OpenH264 plugin provided by Cisco Systems - rm -v toolkit/mozapps/extensions/{test/{browser/browser_openH264.js,xpcshell/test_openh264.js},content/{OpenH264-license.txt,openH264Prefs.xul},internal/OpenH264Provider.jsm} -} - prepare() { export DEBIAN_BUILD="mozilla-release" @@ -98,6 +88,7 @@ prepare() { browser/base/content/abouthome # Remove nonfree OpenH264 references + rm -v toolkit/mozapps/extensions/{test/{browser/browser_openH264.js,xpcshell/test_openh264.js},content/{OpenH264-license.txt,openH264Prefs.xul},internal/OpenH264Provider.jsm} patch -Np1 -i "$srcdir/non-openh264.patch" # Install to /usr/lib/$pkgname |