jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

firefox: update to 29.0.

Browse source
This commit is contained in:
Juan RP 2014-04-28 23:31:21 +02:00
parent cf97b1a2b4
commit 129bd2702c
2 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
srcpkgs/firefox/patches/firefox-install-dir.patch
View file

@ -1,8 +1,9 @@
diff --git i/config/baseconfig.mk w/config/baseconfig.mk
index 50f4cd4..1e7c1f2 100644
--- config/baseconfig.mk
+++ config/baseconfig.mk
@@ -1,7 +1,7 @@
--- config/baseconfig.mk.orig 2014-04-28 23:05:04.491525412 +0200
+++ config/baseconfig.mk 2014-04-28 23:05:39.922751247 +0200
@@ -2,10 +2,10 @@
# directly in python/mozbuild/mozbuild/base.py for gmake validation.
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
# whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@ -11,18 +12,6 @@ index 50f4cd4..1e7c1f2 100644
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
DIST = $(DEPTH)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
diff --git i/js/src/config/baseconfig.mk w/js/src/config/baseconfig.mk
index 1ff076c..5386569 100644
--- js/src/config/baseconfig.mk
+++ js/src/config/baseconfig.mk
@@ -1,5 +1,5 @@
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
ifneq (,$(filter /%,$(TOP_DIST)))
DIST = $(TOP_DIST)
ifndef TOP_DIST
TOP_DIST = dist
endif

15
srcpkgs/firefox/template
View file

@ -1,25 +1,25 @@
# Template build file for 'firefox'.
pkgname=firefox
version=28.0
revision=2
version=29.0
revision=1
wrksrc=mozilla-release
short_desc="Lightweight gecko-based web browser"
maintainer="Juan RP <xtraeme@gmail.com>"
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=2ffd0484e7eab52166b851681878a86d54223a6764c756721430fae8e1599628
checksum=64402a1f1359f3ea30767a94977ae823ac25b39c6d54f9fe6db444ed127db892
lib32disabled=yes
hostmakedepends="unzip zip pkg-config perl python yasm"
makedepends="nss-devel>=3.15.4 libjpeg-turbo-devel libpng-devel>=1.6
makedepends="nss-devel>=3.16 libjpeg-turbo-devel libpng-devel>=1.6
pixman-devel sqlite-devel gst-plugins-base-devel gtk+-devel
libevent-devel libnotify-devel libvpx-devel>1.3.0 libXrender-devel
startup-notification-devel dbus-glib-devel alsa-lib-devel
hunspell-devel>=1.3.2 libSM-devel libXScrnSaver-devel libXt-devel
pulseaudio-devel alsa-plugins-pulseaudio"
depends="nss>=3.15.4 desktop-file-utils hicolor-icon-theme alsa-plugins-pulseaudio"
depends="nss>=3.16 desktop-file-utils hicolor-icon-theme alsa-plugins-pulseaudio"
pre_build() {
# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
@ -29,14 +29,11 @@ pre_build() {
echo -n "$_google_api_key" >google-api-key
cp -f ${FILESDIR}/mozconfig .mozconfig
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
}
do_build() {
export LDFLAGS+=" -Wl,-R/usr/lib/firefox"
SHELL=/bin/bash make -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
SHELL=/bin/bash HOME=/tmp make -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
}
do_install() {