firefox: update to 7.0.1 FINALLY!

This commit is contained in:
Juan RP 2011-11-05 12:33:37 +01:00
parent d21fc0ae41
commit 11bef9d27c
5 changed files with 141 additions and 59 deletions

View file

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Exec=firefox -safe-mode %u
Icon=firefox
Type=Application
Terminal=false
MultipleArgs=false
Name=Firefox - Safe Mode
GenericName=Web Browser - Safe Mode
StartupNotify=false
Categories=Application;Network;

View file

@ -0,0 +1,56 @@
. $topsrcdir/browser/config/mozconfig
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
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 --with-pthreads
ac_add_options --enable-default-toolkit=cairo-gtk2
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-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-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
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1

View file

@ -1,12 +1,12 @@
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
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="4.0"
+MOZ_APP_VERSION=7.0
+
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in

View file

@ -1,28 +1,16 @@
# Template build file for 'firefox'.
pkgname=firefox
version=4.0.1
revision=1
_libxul_sdkver=2.0
wrksrc=mozilla-${_libxul_sdkver}
_majorver=7.0
_minorver=1
version=${_majorver}.${_minorver}
wrksrc=mozilla-release
patch_args="-Np1"
#distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
distfiles="http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
build_style=gnu-configure
configure_args="--enable-application=browser --enable-default-toolkit=cairo-gtk2
--disable-crashreporter --disable-tests --disable-debug --enable-notify
--enable-optimize --disable-embedding-tests --disable-installer
--disable-javaxpcom --disable-necko-wifi --disable-oji --disable-updater
--disable-gnomevfs --disable-gnomeui --disable-gconf --disable-dbm
--with-system-zlib --with-system-bz2 --enable-system-cairo --with-pthreads
--with-system-png --with-system-jpeg --enable-jemalloc --enable-safe-browsing
--with-system-sqlite --with-system-nspr --with-system-nss --enable-libxul
--with-system-libevent --enable-system-hunspell --enable-extensions=default
--enable-pango --enable-svg --enable-canvas --enable-smil --enable-canvas3d
--enable-places --enable-shared-js --enable-url-classifier --enable-gio
--with-libxul-sdk=/usr/lib/xulrunner-devel-${_libxul_sdkver}"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
short_desc="Lightweight gecko-based web browser"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
homepage="http://www.mozilla.org/projects/firefox"
license="MPL-1.1, GPL-2, LGPL-2.1"
checksum=81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
long_desc="
Mozilla Firefox is a free, open-source and cross-platform web browser
for Windows, Linux, MacOS X and many other operating systems. It is
@ -34,33 +22,79 @@ long_desc="
can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available."
Add_dependency run glibc
Add_dependency run libgcc
Add_dependency run libstdc++
Add_dependency run glib
Add_dependency run nspr
Add_dependency run gdk-pixbuf
Add_dependency run gtk+
Add_dependency run xulrunner
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
Add_dependency run sqlite
Add_dependency run libpng
Add_dependency run nss
Add_dependency run cairo
Add_dependency run pixman
Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libXrender
Add_dependency run libX11
Add_dependency run zlib
Add_dependency run hunspell
Add_dependency run libevent
Add_dependency run libvpx
Add_dependency run alsa-lib
Add_dependency run nspr
Add_dependency run dbus-libs
Add_dependency run libXext
Add_dependency run pango
Add_dependency run glib
Add_dependency run gtk+
Add_dependency run atk
Add_dependency run gdk-pixbuf
Add_dependency run libXt
Add_dependency run startup-notification
Add_dependency run libstdc++
Add_dependency run libgcc
Add_dependency run dbus-glib
Add_dependency run libnotify
Add_dependency run desktop-file-utils
Add_dependency run hicolor-icon-theme
Add_dependency build unzip
Add_dependency build zip
Add_dependency build perl ">=0"
Add_dependency build python ">=0"
Add_dependency build python ">=2.7.2_3" # linux2 sys.platform fix
Add_dependency build yasm
Add_dependency build glibc-devel
Add_dependency build libstdc++-devel
Add_dependency build xulrunner-devel
Add_dependency build nspr-devel
Add_dependency build libIDL-devel
Add_dependency build nss-devel
Add_dependency build gtk+-devel
Add_dependency build libevent-devel
Add_dependency build libnotify-devel
Add_dependency build libvpx-devel
Add_dependency build libXrender-devel
Add_dependency build libXScrnSaver-devel
Add_dependency build startup-notification-devel
Add_dependency build dbus-glib-devel
Add_dependency build alsa-lib-devel
Add_dependency build hunspell-devel
Add_dependency build wireless_tools-devel
post_install()
{
install -d ${DESTDIR}/usr/share/applications
install -d ${DESTDIR}/usr/share/pixmaps
install -m644 ${FILESDIR}/*.desktop \
${DESTDIR}/usr/share/applications
install -m644 ${wrksrc}/browser/branding/unofficial/default48.png \
${DESTDIR}/usr/share/pixmaps/firefox.png
do_build() {
cp -f ${FILESDIR}/mozconfig .mozconfig
export LDFLAGS="$XBPS_LDFLAGS -Wl,-R/usr/lib/firefox-${_majorver}"
make -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
}
do_install() {
make -f client.mk DESTDIR=${DESTDIR} install
vinstall ${FILESDIR}/firefox.desktop 644 usr/share/applications
for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
vinstall browser/branding/official/default${i%x*}.png 644 \
usr/share/icons/hicolor/${i}/apps firefox.png
done
# We don't want the development stuff
rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel-${_majorver},share/idl}
# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf /usr/lib/firefox-${_majorver}/firefox-bin \
${DESTDIR}/usr/lib/firefox-${_majorver}/firefox
}

View file

@ -329,6 +329,9 @@ libfreebl3.so nss nss-devel
libnssdbm3.so nss nss-devel
libnssckbi.so nss nss-devel
libnss3.so nss nss-devel
libxul.so firefox
libxpcom.so firefox
libmozalloc.so firefox
libxul.so xulrunner xulrunner-devel
libmozjs.so xulrunner xulrunner-devel
libdbusservice.so xulrunner xulrunner-devel