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

Jan de Groot jgc at archlinux.org
Wed Jul 16 17:57:53 EDT 2008


    Date: Wednesday, July 16, 2008 @ 17:57:53
  Author: jgc
Revision: 5494

Update to firefox 3.0.1:
PKGBUILD:
  Use PGO to optimize firefox. Uses Xvfb to run the profiling build of firefox.

firefox.sh:
  Adjust path.

mozconfig:
  Use PGO.
  Switch to unofficial branding. This changes name from Minefield (trunk build) to Gran Paradiso, which is the codename for firefox 3.0.
  Define some extra variable to make PGO work

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

------------+
 PKGBUILD   |   28 +++++++++++++++++-----------
 firefox.sh |    2 +-
 mozconfig  |    5 +++++
 3 files changed, 23 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-16 21:54:27 UTC (rev 5493)
+++ PKGBUILD	2008-07-16 21:57:53 UTC (rev 5494)
@@ -3,13 +3,13 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=3.0
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('xulrunner>=1.9' 'startup-notification' 'desktop-file-utils')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.22.1')
+depends=('xulrunner>=1.9.0.1' 'startup-notification' 'desktop-file-utils')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.22.1' 'python' 'xorg-server')
 replaces=('firefox3')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
@@ -20,13 +20,13 @@
         mozilla-firefox-1.0-lang.patch
 	mozilla-firstrun.patch
 	firefox.sh)
-md5sums=('4210ae0801df2eb498408533010d97c1'
-         'b7cc507da321ccac96282e938f2fdf36'
+md5sums=('406d67174f8f74ab154a1b17d0881b27'
+         '8b6e5f7d0a9e3f64747a024cf8f12069'
          '68cf02788491c6e846729b2f2913bf79'
          '5e68cabfcf3c021806b326f664ac505e'
          'bd5db57c23c72a02a489592644f18995'
          '0f935d428ae3a94c00d06d92c4142498'
-	 'afc69657a5881cc264a8b2e7ded146e3')
+	 '91df7ac33d42e6a0db3c50dd5f88a419')
 
 build() {
   cd ${srcdir}/mozilla
@@ -38,15 +38,21 @@
   unset CFLAGS
   unset CXXFLAGS
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.0"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-${pkgver}"
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  make -j1 DESTDIR=${pkgdir} install || return 1
+  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -ac :99 &
+  XPID=$!
+  export DISPLAY=:99
 
+  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-3.0/libjemalloc.so
+  rm -f ${pkgdir}/usr/lib/firefox-${pkgver}/libjemalloc.so
 
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps

Modified: firefox.sh
===================================================================
--- firefox.sh	2008-07-16 21:54:27 UTC (rev 5493)
+++ firefox.sh	2008-07-16 21:57:53 UTC (rev 5494)
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/lib/firefox-3.0/firefox $*
+exec /usr/lib/firefox-3.0.1/firefox $*

Modified: mozconfig
===================================================================
--- mozconfig	2008-07-16 21:54:27 UTC (rev 5493)
+++ mozconfig	2008-07-16 21:57:53 UTC (rev 5494)
@@ -25,8 +25,13 @@
 ac_add_options --disable-crashreporter
 ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9
 ac_add_options --enable-safe-browsing
+ac_add_options --with-branding=browser/branding/unofficial
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-opt-obj
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+export USE_SHORT_LIBNAME=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options USE_SHORT_LIBNAME=1





More information about the arch-commits mailing list