diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /extra/xulrunner | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/xulrunner')
| -rw-r--r-- | extra/xulrunner/PKGBUILD | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 783b9f3e3..f1aa98ef9 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131156 2011-07-11 11:19:22Z ibiru $ +# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=5.0 -_ffoxver=5.0 +pkgver=6.0 +_ffoxver=6.0 pkgrel=1 pkgver=2.0 pkgrel=2 # hold ver @@ -31,7 +31,6 @@ build() { patch -Np0 -i "${srcdir}/mips.patch" } - export CXXFLAGS="-fpermissive" export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -43,13 +42,13 @@ package() { #Remove included dictionaries, add symlink to system myspell path. #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" + rm -rf "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" # add xulrunner library path to ld.so.conf install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf } -md5sums=('9f64a01e86a5d424e12a8e3305c5debe' +md5sums=('1840185865a1a8975df4a3db59080ddc' '2358a2ddd35bcdd62ff42442dfe548d9' '639ea80e823543dd415b90c0ee804186') |