[arch-commits] Commit in firefox/trunk (PKGBUILD firefox.sh)
Jan de Groot
jgc at archlinux.org
Sun Jun 29 21:15:48 UTC 2008
Date: Sunday, June 29, 2008 @ 17:15:48
Author: jgc
Revision: 3712
upgpkg: firefox 3.0-2
Use a launcher script instead of symlink. Fixes FS#10737. Use srcdir and pkgdir variables, add some || return 1 checks
Added:
firefox/trunk/firefox.sh
Modified:
firefox/trunk/PKGBUILD
------------+
PKGBUILD | 35 ++++++++++++++++++++---------------
firefox.sh | 2 ++
2 files changed, 22 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-06-29 21:12:43 UTC (rev 3711)
+++ PKGBUILD 2008-06-29 21:15:48 UTC (rev 3712)
@@ -4,7 +4,7 @@
pkgname=firefox
pkgver=3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Standalone web browser from mozilla.org"
arch=(i686 x86_64)
license=('MPL' 'GPL' 'LGPL')
@@ -18,34 +18,39 @@
firefox.desktop
firefox-safe.desktop
mozilla-firefox-1.0-lang.patch
- mozilla-firstrun.patch)
+ mozilla-firstrun.patch
+ firefox.sh)
md5sums=('4210ae0801df2eb498408533010d97c1'
'b7cc507da321ccac96282e938f2fdf36'
'68cf02788491c6e846729b2f2913bf79'
'5e68cabfcf3c021806b326f664ac505e'
'bd5db57c23c72a02a489592644f18995'
- '0f935d428ae3a94c00d06d92c4142498')
+ '0f935d428ae3a94c00d06d92c4142498'
+ 'afc69657a5881cc264a8b2e7ded146e3')
build() {
- cd ${startdir}/src/mozilla
+ cd ${srcdir}/mozilla
- patch -Np1 -i $startdir/src/mozilla-firefox-1.0-lang.patch || return 1
- patch -Np1 -i ${startdir}/src/mozilla-firstrun.patch || return 1
- cp ${startdir}/src/mozconfig .mozconfig
+ patch -Np1 -i ${srcdir}/mozilla-firefox-1.0-lang.patch || return 1
+ patch -Np1 -i ${srcdir}/mozilla-firstrun.patch || return 1
+ cp ${srcdir}/mozconfig .mozconfig
unset CFLAGS
unset CXXFLAGS
export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.0"
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
- make -j1 DESTDIR=${startdir}/pkg install || return 1
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
+ make -j1 DESTDIR=${pkgdir} install || return 1
- rm -f ${startdir}/pkg/usr/lib/firefox-3.0/libjemalloc.so
+ rm -f ${pkgdir}/usr/bin/firefox
+ install -m755 ${srcdir}/firefox.sh ${pkgdir}/usr/bin/firefox || return 1
- mkdir -p ${startdir}/pkg/usr/share/applications
- mkdir -p ${startdir}/pkg/usr/share/pixmaps
- install -m644 ${startdir}/src/mozilla/browser/app/default48.png ${startdir}/pkg/usr/share/pixmaps/firefox.png
- install -m644 ${startdir}/src/firefox.desktop ${startdir}/pkg/usr/share/applications/
- install -m644 ${startdir}/src/firefox-safe.desktop ${startdir}/pkg/usr/share/applications/
+ rm -f ${pkgdir}/usr/lib/firefox-3.0/libjemalloc.so
+
+ install -m755 -d ${pkgdir}/usr/share/applications
+ install -m755 -d ${pkgdir}/usr/share/pixmaps
+ install -m644 ${srcdir}/mozilla/browser/app/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
}
Added: firefox.sh
===================================================================
--- firefox.sh (rev 0)
+++ firefox.sh 2008-06-29 21:15:48 UTC (rev 3712)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/lib/firefox-3.0/firefox $*
More information about the arch-commits
mailing list