diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
| commit | 7b35632e80f168d8c5f2220bf610ee7e24b81270 (patch) | |
| tree | 8facf3fa565911f056a08e38f6a5eed0f756f9c6 /abs/extra-testing/community/firefox/PKGBUILD | |
| parent | 7e10f51870aa10be3b35d7912a7b54e30f608bb8 (diff) | |
| parent | 7accc0f042acdfdca9f067b1d4011d6ac01b1a74 (diff) | |
| download | linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.zip linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.gz linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/extra-testing/community/firefox/PKGBUILD')
| -rw-r--r-- | abs/extra-testing/community/firefox/PKGBUILD | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/abs/extra-testing/community/firefox/PKGBUILD b/abs/extra-testing/community/firefox/PKGBUILD index 922a092..babf777 100644 --- a/abs/extra-testing/community/firefox/PKGBUILD +++ b/abs/extra-testing/community/firefox/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 36426 2009-04-22 11:55:02Z pierre $ +# $Id: PKGBUILD 46468 2009-07-18 13:24:45Z jgc $ # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox -pkgver=3.0.9 -pkgrel=1 +pkgver=3.5.1 +pkgrel=2 +_xulver=1.9.1.1 pkgdesc="Standalone web browser from mozilla.org" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') -depends=('xulrunner=1.9.0.9' 'desktop-file-utils') -makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'xorg-server') +depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8") +makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python') replaces=('firefox3') install=firefox.install url="http://www.mozilla.org/projects/firefox" @@ -17,47 +18,42 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/s firefox.desktop firefox-safe.desktop mozilla-firefox-1.0-lang.patch - mozbug421977.patch - firefox-appversion.patch) -md5sums=('f80b085699db8201e5db6b30fc63c60d' - '8b6e5f7d0a9e3f64747a024cf8f12069' + browser-defaulturls.patch + firefox-version.patch + browser-app-makefile.patch) +md5sums=('18169e189785d680827d4fce94524449' + '3c928b11918d22377eba01de34debc19' '68cf02788491c6e846729b2f2913bf79' '5e68cabfcf3c021806b326f664ac505e' 'bd5db57c23c72a02a489592644f18995' - '7976e3ff52e01af3388dfc3a479c4955' - 'c6f27fca2e6bd2a570b271ec3ce35782') + '346d74ec560e7bbf453c02ff21f4b868' + '1dd9a10df0b9e4cf332eadc326d78e07' + '165c43a5b03a0bf7ad2e7210b0d8c82c') build() { - cd ${srcdir}/mozilla - - patch -Np1 -i ${srcdir}/mozilla-firefox-1.0-lang.patch || return 1 - - # FS#10836: fixes backgroundcolor parsing with gnome - patch -Np0 -i ${srcdir}/mozbug421977.patch || return 1 - - patch -Np1 -i ${srcdir}/firefox-appversion.patch || return 1 - - cp ${srcdir}/mozconfig .mozconfig + cd "${srcdir}/mozilla-1.9.1" + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" || return 1 + patch -Np0 -i "${srcdir}/browser-defaulturls.patch" || return 1 + patch -Np1 -i "${srcdir}/firefox-version.patch" || return 1 + cp "${srcdir}/mozconfig" .mozconfig unset CFLAGS unset CXXFLAGS - export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.0" - - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 & - XPID=$! - export DISPLAY=:99 - - LD_PRELOAD="" make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 - kill $XPID + export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.5" - make -j1 DESTDIR=${pkgdir} -C ff-opt-obj install || return 1 + make -j1 -f client.mk configure MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 + cd browser/app + patch -p2 < "${srcdir}/browser-app-makefile.patch" || return 1 + cd ../.. + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 + make -j1 DESTDIR="${pkgdir}" install || return 1 - rm -f ${pkgdir}/usr/lib/firefox-3.0/libjemalloc.so + rm -f ${pkgdir}/usr/lib/firefox-3.5/libjemalloc.so install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/mozilla/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 + install -m644 ${srcdir}/mozilla-1.9.1/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/ || return 1 install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/ || return 1 } |