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

[Jan Steffens]

    Date: Thursday, June 7, 2012 @ 21:21:32
  Author: heftig
Revision: 161078

Cleanup, rebuild with gcc4.6 to fix FS#29976

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

-----------------+
 PKGBUILD        |   50 ++++++++++++++++++++++++++++++++------------------
 firefox.install |    2 +-
 mozconfig       |   13 +++----------
 3 files changed, 36 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-08 01:03:39 UTC (rev 161077)
+++ PKGBUILD	2012-06-08 01:21:32 UTC (rev 161078)
@@ -4,60 +4,74 @@
 
 pkgname=firefox
 pkgver=13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.3' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake')
+depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib'
+         'libnotify' 'desktop-file-utils' 'hicolor-icon-theme'
+         'libvpx' 'libevent' 'nss>=3.13.3' 'hunspell' 'sqlite')
+makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa'
+             'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake' 'gcc4.6')
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 url="http://www.mozilla.org/projects/firefox"
 install=firefox.install
 options=(!emptydirs)
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js)
 md5sums=('f50ca7656eec47030b396f39075fa980'
-         'db6d2bd4671831859566f403a086fdf2'
+         '5644c7b42f51013e2023787938fa955e'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          '594523c536a9be951b52c90dd85aff18'
          '0d053487907de4376d67d8f499c5502b')
 
 build() {
-  cd "mozilla-release"
+  cd mozilla-release
 
-  cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/firefox-install-dir.patch"
+  cp ../mozconfig .mozconfig
+  patch -Np1 -i ../firefox-install-dir.patch
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
+  export CC=gcc-4.6
+  export CXX=g++-4.6
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
   export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  # Enable PGO
+  export MOZ_PGO=1
+  export DISPLAY=:99
+  Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+  make -f client.mk build
+
   kill $! || true
 }
 
 package() {
-  cd "mozilla-release"
+  cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
+  install -m644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
 
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 browser/branding/official/default${i/x*/}.png \
-        "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
+  for i in 16 22 24 32 48 256; do
+      install -Dm644 browser/branding/official/default$i.png \
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
   done
 
-  install -Dm644 "$srcdir/firefox.desktop" \
+  install -Dm644 ../firefox.desktop \
     "$pkgdir/usr/share/applications/firefox.desktop"
 
+  # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
 
-
   # We don't want the development stuff
   rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
 

Modified: firefox.install
===================================================================
--- firefox.install	2012-06-08 01:03:39 UTC (rev 161077)
+++ firefox.install	2012-06-08 01:21:32 UTC (rev 161078)
@@ -1,6 +1,6 @@
 post_install() {
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {

Modified: mozconfig
===================================================================
--- mozconfig	2012-06-08 01:03:39 UTC (rev 161077)
+++ mozconfig	2012-06-08 01:21:32 UTC (rev 161078)
@@ -21,25 +21,18 @@
 
 # Features
 ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 
-# Optimization
-ac_add_options --enable-optimize
-
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
 
+# Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1