diff options
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/iceweasel-libre/xulrunner-copy-stub.patch | 11 |
2 files changed, 3 insertions, 17 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 56f1e4dfa..bda2184e1 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -15,14 +15,14 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel _debver=17.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=4 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -46,17 +46,15 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch iceweasel-install-dir.patch vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' + '062bbd20d1de7e01e8e11667c24de960' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' 'c8040002668fae7d1b950833bae51607' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' @@ -88,7 +86,6 @@ build() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch deleted file mode 100644 index e3b8e9376..000000000 --- a/libre/iceweasel-libre/xulrunner-copy-stub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 -+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 -@@ -257,7 +257,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) - endif - endif - |