diff options
Diffstat (limited to 'libre/xulrunner-libre')
| -rw-r--r--[-rwxr-xr-x] | libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 0 | ||||
| -rwxr-xr-x | libre/xulrunner-libre/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/xulrunner-libre/shared-libs.patch | 12 |
3 files changed, 21 insertions, 8 deletions
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 69fe5c072..69fe5c072 100755..100644 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index e9cd2a447..1d485e6d5 100755 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $ +# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0 +_debver=17.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -25,15 +25,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig mozilla-pkgconfig.patch + shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('3e555026478026987753b4859ec91d3b' - '9b07815d94b8190c780fac10009025b9' +md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' + '1bbf435ff33f9824de23c0b13fbfb452' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') build() { @@ -63,6 +65,7 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/shared-libs.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" export PYTHON="/usr/bin/python2" @@ -83,8 +86,6 @@ package() { echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/header.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/typelib.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpidl.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py } diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/libre/xulrunner-libre/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ |