From da311e7da30f863d63ee34d8f1e77506d4f81956 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 18 Sep 2013 09:33:51 +0200 Subject: [PATCH] firefox: update to 24.0. --- srcpkgs/firefox/files/mozconfig | 2 +- srcpkgs/firefox/patches/shared-libs.patch | 11 ----------- srcpkgs/firefox/template | 14 +++++++++++--- 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/firefox/patches/shared-libs.patch diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 6ae6844b2f3..b379c4f1af9 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -9,7 +9,7 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -# disable libpng for now, 1.6.2 apng patch produces some artifacts. +# Use bundled libpng, our does not have the apng patch. ac_add_options --without-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx diff --git a/srcpkgs/firefox/patches/shared-libs.patch b/srcpkgs/firefox/patches/shared-libs.patch deleted file mode 100644 index 5b82b031c5e..00000000000 --- a/srcpkgs/firefox/patches/shared-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 2d31c7b321d..ac80aa051f5 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,6 +1,6 @@ # Template build file for 'firefox'. pkgname=firefox -version=23.0.1 +version=24.0 revision=1 wrksrc=mozilla-release short_desc="Lightweight gecko-based web browser" @@ -8,16 +8,24 @@ maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-1.1, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" -checksum=bb2c2e99a03859ebd8c02b8bc4c57b39ccc97c55872c2737c433212c0ebe01cf +checksum=86a6efa501e1b106b597a8506757f3a2db9d3a5cfcc61ea29a9ad0c834bea83b +only_for_archs="i686 x86_64" hostmakedepends="unzip zip pkg-config perl python yasm" -makedepends="libjpeg-turbo-devel libpng-devel>=1.6 +makedepends="libjpeg-turbo-devel libpng-devel>=1.6 gst-plugins-base-devel pixman-devel libIDL-devel nss-devel>=3.15.1 sqlite-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel libXScrnSaver-devel libXt-devel" +# Google API key (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: This is for Void Linux use ONLY. +_google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" + do_build() { + echo -n "$_google_api_key" >google-api-key + echo "ac_add_options --with-google-api-keyfile=\"${wrksrc}/google-api-key\"" >>.mozconfig + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in cp -f ${FILESDIR}/mozconfig .mozconfig