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

[Jan de Groot]

    Date: Friday, July 3, 2009 @ 13:53:41
  Author: jgc
Revision: 44683

Disable profiled build, it does not work with makechrootpkg, and it does not make sense anyways, since all optimization should take place in xulrunner

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig

-----------+
 PKGBUILD  |   14 ++++----------
 mozconfig |    2 --
 2 files changed, 4 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-03 17:52:34 UTC (rev 44682)
+++ PKGBUILD	2009-07-03 17:53:41 UTC (rev 44683)
@@ -9,7 +9,7 @@
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
 depends=("xulrunner>=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'xorg-server')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python')
 replaces=('firefox3')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
@@ -20,7 +20,7 @@
         mozilla-firefox-1.0-lang.patch
         browser-defaulturls.patch)
 md5sums=('6dd59399db08963ef022a1d0e5010053'
-         '9ef5d73fdcda6b9f99f17ed9993693aa'
+         'd672df11a6e16a5dec68428b00bfb810'
          '68cf02788491c6e846729b2f2913bf79'
          '5e68cabfcf3c021806b326f664ac505e'
          'bd5db57c23c72a02a489592644f18995'
@@ -37,15 +37,9 @@
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.5"
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
-  XPID=$!
-  export DISPLAY=:99
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
+  make -j1 DESTDIR="${pkgdir}" install || 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/lib/firefox-3.5/libjemalloc.so
 
   install -m755 -d ${pkgdir}/usr/share/applications

Modified: mozconfig
===================================================================
--- mozconfig	2009-07-03 17:52:34 UTC (rev 44682)
+++ mozconfig	2009-07-03 17:53:41 UTC (rev 44683)
@@ -26,8 +26,6 @@
 ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.1
 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