Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49ff6c984feabbebfc62b6e7442d902f80e76bca
commit 49ff6c984feabbebfc62b6e7442d902f80e76bca
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Jun 23 14:27:19 2011 +0200
firefox-5.0-1-i686
* Bump version.
diff --git a/source/xapps/firefox/0583d58b20a3.patch
b/source/xapps/firefox/0583d58b20a3.patch
new file mode 100644
index 0000000..037422b
--- /dev/null
+++ b/source/xapps/firefox/0583d58b20a3.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozi...@glandium.org>
+# Date 1302680663 -7200
+# Node ID 0583d58b20a3a0789c46f19ed505cb6e96602ec9
+# Parent 0138798a072ad15edce15d614923a03256946218
+Bug 644692 - Fix bsdiff build failure with system bzip2. r=ted
+
+diff --git a/other-licenses/bsdiff/Makefile.in
b/other-licenses/bsdiff/Makefile.in
+--- a/other-licenses/bsdiff/Makefile.in
++++ b/other-licenses/bsdiff/Makefile.in
+@@ -43,17 +43,21 @@ VPATH = @srcdir@
+
+ include $(DEPTH)/config/autoconf.mk
+
+ # This program is output to dist/host/bin because it is only needed by the
+ # build system and is not intended to be included in Mozilla distributions.
+ HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
+ HOST_CSRCS = bsdiff.c
+
++ifdef MOZ_NATIVE_BZ2
++HOST_LIBS += $(BZ2_LIBS)
++else
+ HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
++endif
+
+ ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))
+ HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
+ endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
+
+ include $(topsrcdir)/config/rules.mk
+
diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index d37c632..b930c5f 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,9 +3,9 @@
# Contributor: VMiklos <vmik...@frugalware.org>
pkgname=firefox
-pkgver=4.0.1
+pkgver=5.0
pathver=${pkgver} # version used in path names
-pkgrel=2
+pkgrel=1
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/";
depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12.9'
'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.7' \
@@ -16,17 +16,18 @@ groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest/source | sed
's/.source//g' | Flasttarbz2"
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
\
+ 0583d58b20a3.patch \
ffremote \
$pkgname.desktop \
${pkgname}-safe-mode.desktop)
-signatures=("${source[0]}.asc" '' '' '')
+signatures=("${source[0]}.asc" '' '' '' '')
options=('scriptlet')
[ "$CARCH" == "ppc" ] && Fconfopts="${Fconfopts[@]} --disable-ipc"
build() {
#unset MAKEFLAGS
- Fcd mozilla-2.0
+ Fcd mozilla-release
# Autodetect language.
sed -i '/intl.locale.matchOS/s/false/true/' modules/libpref/src/init/all.js ||
Fdie
@@ -40,48 +41,48 @@ build() {
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
- Fsed '\-0' '\-9' config/make-jars.pl
+# Fsed '\-0' '\-9' config/make-jars.pl
Fbuild \
- --with-default-mozilla-five-home=/usr \
- --enable-optimize="-O2" \
- --with-system-nspr \
- --with-system-nss \
- --with-system-jpeg \
- --with-system-zlib \
- --with-system-bz2 \
- --with-pthreads \
- --with-distribution-id=Frugalware \
- --enable-crypto \
- --enable-official-branding \
- --enable-svg \
- --enable-mathml \
- --enable-strip \
- --enable-xft \
- --enable-toolkit-cairo-gtk2 \
- --enable-default-toolkit=cairo-gtk2 \
- --enable-nspr-autoconf \
- --enable-single-profile \
- --enable-application=browser \
- --enable-image-decoders=all \
- --enable-image-encoders=all \
- --enable-system-cairo \
- --enable-safe-browsing \
- --enable-system-lcms \
- --enable-system-sqlite \
- --enable-necko-protocols=all \
- --disable-debug \
- --disable-tests \
- --disable-mochitest \
- --disable-logging \
- --disable-installer \
- --disable-activex \
- --disable-activex-scripting \
- --disable-pedantic \
- --disable-mailnews \
- --disable-calendar \
- --disable-composer \
- --disable-profilesharing
+ --with-default-mozilla-five-home=/usr \
+ --enable-optimize="-O2" \
+ --with-system-nspr \
+ --with-system-nss \
+ --with-system-jpeg \
+ --with-system-zlib \
+ --with-system-bz2 \
+ --with-pthreads \
+ --with-distribution-id=Frugalware \
+ --enable-crypto \
+ --enable-official-branding \
+ --enable-svg \
+ --enable-mathml \
+ --enable-strip \
+ --enable-xft \
+ --enable-toolkit-cairo-gtk2 \
+ --enable-default-toolkit=cairo-gtk2 \
+ --enable-nspr-autoconf \
+ --enable-single-profile \
+ --enable-application=browser \
+ --enable-image-decoders=all \
+ --enable-image-encoders=all \
+ --enable-system-cairo \
+ --enable-safe-browsing \
+ --enable-system-lcms \
+ --enable-system-sqlite \
+ --enable-necko-protocols=all \
+ --disable-debug \
+ --disable-tests \
+ --disable-mochitest \
+ --disable-logging \
+ --disable-installer \
+ --disable-activex \
+ --disable-activex-scripting \
+ --disable-pedantic \
+ --disable-mailnews \
+ --disable-calendar \
+ --disable-composer \
+ --disable-profilesharing
# Get rid of versions in path names.
Fmv /usr/include/$pkgname-$pathver /usr/include/$pkgname
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
