[arch-commits] Commit in firefox/trunk (PKGBUILD firefox.sh)

[Jan de Groot]

    Date: Thursday, July 17, 2008 @ 17:16:02
  Author: jgc
Revision: 5516

Remove firefox.sh, the xulrunner stub is fixed for FS#10737 now. Build firefox without fakeroot so X doesn't need to skip access control checks.

Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/firefox.sh

------------+
 PKGBUILD   |   13 ++++---------
 firefox.sh |    2 --
 2 files changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-17 21:12:25 UTC (rev 5515)
+++ PKGBUILD	2008-07-17 21:16:02 UTC (rev 5516)
@@ -18,15 +18,13 @@
         firefox.desktop
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
-	mozilla-firstrun.patch
-	firefox.sh)
+	mozilla-firstrun.patch)
 md5sums=('406d67174f8f74ab154a1b17d0881b27'
          '8b6e5f7d0a9e3f64747a024cf8f12069'
          '68cf02788491c6e846729b2f2913bf79'
          '5e68cabfcf3c021806b326f664ac505e'
          'bd5db57c23c72a02a489592644f18995'
-         '0f935d428ae3a94c00d06d92c4142498'
-	 '91df7ac33d42e6a0db3c50dd5f88a419')
+         '0f935d428ae3a94c00d06d92c4142498')
 
 build() {
   cd ${srcdir}/mozilla
@@ -40,18 +38,15 @@
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-${pkgver}"
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -ac :99 &
+  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
   XPID=$!
   export DISPLAY=:99
 
-  make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
+  LD_PRELOAD="" make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
   kill $XPID
 
   make -j1 DESTDIR=${pkgdir} -C ff-opt-obj install || return 1
 
-  rm -f ${pkgdir}/usr/bin/firefox
-  install -m755 ${srcdir}/firefox.sh ${pkgdir}/usr/bin/firefox || return 1
-
   rm -f ${pkgdir}/usr/lib/firefox-${pkgver}/libjemalloc.so
 
   install -m755 -d ${pkgdir}/usr/share/applications

Deleted: firefox.sh
===================================================================
--- firefox.sh	2008-07-17 21:12:25 UTC (rev 5515)
+++ firefox.sh	2008-07-17 21:16:02 UTC (rev 5516)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/lib/firefox-3.0.1/firefox $*