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

Sun Nov 6 17:36:18 UTC 2011

Date: Sunday, November 6, 2011 @ 12:36:18
  Author: ibiru
Revision: 142227

update to 8.0 \n\n simplify mozconfig by dropping options that doesn't exist and that are default

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig
Deleted:
  firefox/trunk/firefox-version.patch

-----------------------+
 PKGBUILD              |   25 +++++++++++++------------
 firefox-version.patch |   12 ------------
 mozconfig             |   43 +++++++++++++------------------------------
 3 files changed, 26 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2011-11-06 17:01:40 UTC (rev 142226)
+++ PKGBUILD	2011-11-06 17:36:18 UTC (rev 142227)
@@ -2,7 +2,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=7.0.1
+pkgver=8.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -12,25 +12,25 @@
 url="http://www.mozilla.org/projects/firefox"
 install=firefox.install
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//${pkgver}/source/firefox-${pkgver}.source.tar.bz2
-        mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch firefox-version.patch)
-md5sums=('5b212db48630ba93bb30ec63cca17f4d'
-         'd88607e98806db2a7eb222b0c8635af0'
+        mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch firefox-install-dir.patch)
+md5sums=('9395a5be13da119bd8d53c3225e5d17c'
+         '4b925c654eb2484e26d08f743df118fa'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          'bd5db57c23c72a02a489592644f18995'
-         'ff4654144499faf630271cddc2261b7c')
+         '594523c536a9be951b52c90dd85aff18')
 
 build() {
   cd "$srcdir/mozilla-release"
 
   cp "$srcdir/mozconfig" .mozconfig
   patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "$srcdir/firefox-version.patch"
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch"
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox-7.0"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
   export PYTHON="/usr/bin/python2"
 
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
@@ -50,14 +50,15 @@
   install -Dm644 "$srcdir/firefox.desktop" \
     "$pkgdir/usr/share/applications/firefox.desktop"
 
-  rm -rf "$pkgdir"/usr/lib/firefox-7.0/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/firefox-7.0/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/firefox-7.0/hyphenation"
+  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"
 
+
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/firefox-devel-7.0,share/idl}
+  rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
 
   #workaround for now
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf /usr/lib/firefox-7.0/firefox-bin "$pkgdir/usr/lib/firefox-7.0/firefox"
+  ln -sf /usr/lib/firefox/firefox-bin "$pkgdir/usr/lib/firefox/firefox"
 }

Deleted: firefox-version.patch
===================================================================
--- firefox-version.patch	2011-11-06 17:01:40 UTC (rev 142226)
+++ firefox-version.patch	2011-11-06 17:36:18 UTC (rev 142227)
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2011-09-30 08:45:28.858668017 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2011-09-30 08:51:01.548314685 +0000
-@@ -43,6 +43,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="7.0"
-+
- include $(topsrcdir)/config/rules.mk
- 
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in

Modified: mozconfig
===================================================================
--- mozconfig	2011-11-06 17:01:40 UTC (rev 142226)
+++ mozconfig	2011-11-06 17:36:18 UTC (rev 142227)
@@ -2,6 +2,8 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -12,51 +14,32 @@
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Features
+ac_add_options --enable-official-branding
 ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
 ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-url-classifier
+ac_add_options --enable-gio
 
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-official-branding
-
-ac_add_options --disable-javaxpcom
+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-debug
 ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
 
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
 # 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'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1


