From 00ad9fdfb724293ab388ad4bac0b7ea77e258f92 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 Apr 2011 22:23:39 +0200 Subject: [PATCH] firefox: update to 4.0. --- .../firefox/patches/browser-defaulturls.patch | 19 ------------------- srcpkgs/firefox/patches/firefox-version.patch | 13 +++++++------ .../patches/mozilla-firefox-1.0-lang.patch | 4 ++-- srcpkgs/firefox/template | 12 ++++++++---- 4 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/firefox/patches/browser-defaulturls.patch diff --git a/srcpkgs/firefox/patches/browser-defaulturls.patch b/srcpkgs/firefox/patches/browser-defaulturls.patch deleted file mode 100644 index 291223f039b..00000000000 --- a/srcpkgs/firefox/patches/browser-defaulturls.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- browser/branding/unofficial/pref/firefox-branding.js~ 2009-06-13 16:57:53.000000000 +0200 -+++ browser/branding/unofficial/pref/firefox-branding.js 2009-06-13 16:59:17.000000000 +0200 -@@ -1,5 +1,5 @@ --pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); --pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); -+pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/whatsnew/"); -+pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/"); - // The time interval between checks for a new version (in seconds) - // nightly=8 hours, official=24 hours - pref("app.update.interval", 28800); -@@ -11,7 +11,7 @@ - pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); - - // Release notes URL --pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); -+pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/"); - - // Search codes belong only in builds with official branding - pref("browser.search.param.yahoo-fr", ""); diff --git a/srcpkgs/firefox/patches/firefox-version.patch b/srcpkgs/firefox/patches/firefox-version.patch index 054b7405593..85a8fb18d05 100644 --- a/srcpkgs/firefox/patches/firefox-version.patch +++ b/srcpkgs/firefox/patches/firefox-version.patch @@ -1,11 +1,12 @@ ---- browser/installer/Makefile.in.ver 2009-07-18 13:32:35.000000000 +0200 -+++ browser/installer/Makefile.in 2009-07-18 13:33:12.000000000 +0200 +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="3.6" ++MOZ_APP_VERSION="4.0" + - NO_PKG_FILES = \ - $(MOZ_APP_NAME)-config \ - $(MOZ_APP_NAME)-bin.elf \ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch b/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch index 2ab48aa75c0..f0f7325a547 100644 --- a/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch +++ b/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch @@ -1,5 +1,5 @@ ---- browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 -+++ browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 +--- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 ++++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 @@ -253,6 +253,9 @@ pref("font.language.group", "chrome://global/locale/intl.properties"); pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 7e42aecf6e4..35fa60d4c09 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,22 +1,26 @@ # Template build file for 'firefox'. pkgname=firefox -version=3.6.15 -_libxul_sdkver=1.9.2 +version=4.0 +_libxul_sdkver=2.0 wrksrc=mozilla-${_libxul_sdkver} +patch_args="-Np1" distfiles="${MOZILLA_SITE}/${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 --disable-notify +--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}" short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " -checksum=405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f +checksum=78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f 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