From 5ab968ac25be4550384e9f342a214589a8af872f Mon Sep 17 00:00:00 2001
From: Jan Alexander Steffens <heftig@archlinux.org>
Date: Sun, 19 Jun 2011 07:27:04 +0000
Subject: [PATCH] Update to 5.0
---
PKGBUILD | 80 ++++++++++++++++++++++++++++---------------
firefox-version.patch | 12 -------
mozconfig | 14 +++++---
3 files changed, 61 insertions(+), 45 deletions(-)
delete mode 100644 firefox-version.patch
diff --git a/PKGBUILD b/PKGBUILD
index eec5038..db56c17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,74 @@
# Contributor: Jakub Schmidtke <sjakub@gmail.com>
pkgname=firefox
-pkgver=4.0.1
+pkgver=5.0
pkgrel=1
-_xulver=2.0.1
pkgdesc="Standalone web browser from mozilla.org"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
-depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
-install=firefox.install
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss>=3.12.10' 'libxt'
+ 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib'
+ 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils'
+ 'libvpx' 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools'
+ 'yasm' 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
url="http://www.mozilla.org/projects/firefox"
+install=firefox.install
source=(http://releases.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=('9abda7d23151e97913c8555a64c13f34'
- 'd9292af4bb513d0bb811984f077cb77c'
+ mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch)
+md5sums=('9f64a01e86a5d424e12a8e3305c5debe'
+ '5eb9abbd2591ee337981024008d93988'
'bdeb0380c7fae30dd0ead6d2d3bc5873'
- 'bd5db57c23c72a02a489592644f18995'
- 'cea73894617d0e12362db294864fb87f')
+ 'bd5db57c23c72a02a489592644f18995')
build() {
- cd "${srcdir}/mozilla-2.0"
- patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
- patch -Np1 -i "${srcdir}/firefox-version.patch"
+ cd "$srcdir/mozilla-release"
+
+ cp "$srcdir/mozconfig" .mozconfig
+ patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
+
+ # Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it
+ # gets set to \177 for an unknown reason
+ sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
+ browser/base/content/browser.xul
+
+ ## Don't generate startup cache. Unbreaks make install
+ sed -i 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' \
+ toolkit/mozapps/installer/packager.mk
- cp "${srcdir}/mozconfig" .mozconfig
- unset CFLAGS
- unset CXXFLAGS
+ export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+ export PYTHON="/usr/bin/python2"
- export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-4.0"
+ # PGO
+ sed -i '/^NO_PROFILE_GUIDED_OPTIMIZE = 1$/d' \
+ memory/jemalloc/Makefile.in
+ echo 'LDFLAGS += -lX11 -lXrender' \
+ >> layout/build/Makefile.in
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
+ LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ kill $! || true
}
package() {
- cd "${srcdir}/mozilla-2.0"
- make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
- install -m755 -d ${pkgdir}/usr/share/applications
+ cd "$srcdir/mozilla-release"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
- cp other-licenses/branding/firefox/default${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
+ install -Dm644 other-licenses/branding/firefox/default${i/x*/}.png \
+ "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
done
- install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/
+
+ install -Dm644 "$srcdir/firefox.desktop" \
+ "$pkgdir/usr/share/applications/firefox.desktop"
+
+ # Remove included dictionaries, add symlink to system myspell path
+ # Note: this will cause file conflicts when users have installed dictionaries in the old location
+ rm -rf "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+ ln -sf /usr/share/myspell/dicts \
+ "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+
+ # We don't want the development stuff
+ rm -r "$pkgdir"/usr/{include,lib/firefox-devel-$pkgver,share/idl}
}
diff --git a/firefox-version.patch b/firefox-version.patch
deleted file mode 100644
index 85a8fb1..0000000
--- a/firefox-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/installer/Makefile.in
---- mozilla-2.0.orig//browser/installer/Makefile.in 2011-03-03 14:11:20.000000000 -0800
-+++ mozilla-2.0/browser/installer/Makefile.in 2011-03-13 10:08:45.896702838 -0700
-@@ -43,6 +43,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+MOZ_APP_VERSION="4.0"
-+
- include $(topsrcdir)/config/rules.mk
-
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
diff --git a/mozconfig b/mozconfig
index c78b5fe..4afb722 100644
--- a/mozconfig
+++ b/mozconfig
@@ -9,9 +9,11 @@ ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
ac_add_options --with-system-png
ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-cairo
+ac_add_options --enable-system-lcms
ac_add_options --with-pthreads
ac_add_options --enable-default-toolkit=cairo-gtk2
@@ -24,7 +26,6 @@ ac_add_options --enable-canvas
ac_add_options --enable-smil
ac_add_options --enable-canvas3d
ac_add_options --enable-places
-ac_add_options --enable-shared-js
ac_add_options --enable-url-classifier
ac_add_options --enable-optimize
@@ -34,20 +35,17 @@ 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-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0
-#ac_add_options --with-branding=browser/branding/unofficial
ac_add_options --enable-official-branding
ac_add_options --disable-javaxpcom
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-xprint
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
@@ -58,3 +56,9 @@ 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'
--
GitLab