ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

firefox: updated to 4.0. firefox now includes xulrunner.

Browse Source
This commit is contained in:
Fredrik Rinnestam 2011-03-22 01:19:59 +01:00
parent 765241f5fc
commit dda91a859c
10 changed files with 4904 additions and 3666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5082
firefox/.footprint
View File

File diff suppressed because it is too large Load Diff

4
firefox/.md5sum
View File

@ -1,2 +1,2 @@
fcf8042948d91f1f3d9c33599b79cf35 firefox-3.6.15.source.tar.bz2
c62f93a9b8e2a4935254b87f88c49cee mozconfig
3468a2c463b4fc2788ba621e4b511c30 firefox-4.0.source.tar.bz2
d218fdd462f37d05f8195224cacda96f mozconfig

BIN
firefox/.mozconfig.swp Normal file
View File

Binary file not shown.

16
firefox/Pkgfile
View File

@ -1,12 +1,12 @@
# Description: Mozilla Web Browser Component
# Description: The Mozilla Firefox browser
# URL: http://www.mozilla.com/firefox/
# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: xulrunner
# Depends on: libidl, nss, gtk, perl, python, alsa-lib, yasm
name=firefox
version=3.6.15
version=4.0
release=1
source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2
source=(ftp://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2
mozconfig)
build() {
@ -15,7 +15,7 @@ build() {
export MOZILLA_OFFICIAL=1
export MOZILLA_FIVE_HOME=/usr/lib/firefox
cd mozilla-1.9.2
cd mozilla-2.0
sed -e "s/#CFLAGS#/$CFLAGS/" $SRC/mozconfig > .mozconfig
./configure
make
@ -32,4 +32,10 @@ build() {
# devel stuff
cp -frL dist/idl/* $PKG/usr/share/idl/firefox/
cp -frL dist/include/* $PKG/usr/include/firefox/
install -d $PKG/etc/ld.so.conf.d
echo "/usr/lib/$name" > $PKG/etc/ld.so.conf.d/$name.conf
# cleanup
rm $PKG/usr/lib/firefox/README.txt
}

27
firefox/mozconfig
View File

@ -10,21 +10,30 @@ mk_add_options MOZ_MAKE_FLAGS="#MAKEFLAGS#"
# crux options
ac_add_options --prefix=/usr
ac_add_options --with-system-nss
ac_add_options --with-system-nspr
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-mng
ac_add_options --with-pthreads
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.15
ac_add_options --with-system-nss
ac_add_options --with-system-nspr
ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
ac_add_options --enable-optimize="#CFLAGS#"
ac_add_options --enable-official-branding
ac_add_options --enable-extensions=default,-gnomevfs
ac_add_options --enable-shared
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-crypto
ac_add_options --enable-single-profile
ac_add_options --enable-places
ac_add_options --enable-storage
ac_add_options --enable-places_bookmarks
ac_add_options --enable-image-encoder=all
ac_add_options --enable-xft
ac_add_options --disable-static
ac_add_options --disable-tests
ac_add_options --disable-mochitest
ac_add_options --disable-dbus
ac_add_options --disable-debug
ac_add_options --disable-installer
ac_add_options --disable-updater
@ -36,13 +45,3 @@ ac_add_options --disable-mailnews
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-libnotify
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-crypto
ac_add_options --enable-single-profile
ac_add_options --enable-places
ac_add_options --enable-storage
ac_add_options --enable-places_bookmarks
ac_add_options --enable-image-encoder=all
ac_add_options --enable-xft
ac_add_options --disable-dbus

3308
xulrunner/.footprint
View File

File diff suppressed because it is too large Load Diff

2
xulrunner/.md5sum
View File

@ -1,2 +0,0 @@
fcf8042948d91f1f3d9c33599b79cf35 firefox-3.6.15.source.tar.bz2
1f399f9d82fef8a4eb5ce194fd2494d1 mozconfig

31
xulrunner/Pkgfile
View File

@ -1,31 +0,0 @@
# Description: Mozilla Web Browser Component
# URL: http://www.mozilla.com/firefox/
# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: libidl, nss, gtk, perl, python, alsa-lib
name=xulrunner
version=1.9.2.15
release=1
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.15/source/firefox-3.6.15.source.tar.bz2
mozconfig)
build() {
export MOZ_CO_PROJECT="xulrunner"
export XCFLAGS="$CFLAGS"
cd mozilla-1.9.2
# make configure accept our version of sqlite
sed -i -e 's/^SQLITE_VERSION=3.5.9$/SQLITE_VERSION=3.5/' configure
sed -e "s/#CFLAGS#/$CFLAGS/g" \
-e "s/#MAKEFLAGS#/$MAKEFLAGS/g" \
$SRC/mozconfig > .mozconfig
./configure
make
make DESTDIR=$PKG install
install -d $PKG/etc/ld.so.conf.d
echo "/usr/lib/$name-$version" > $PKG/etc/ld.so.conf.d/$name.conf
}

33
xulrunner/mozconfig
View File

@ -1,33 +0,0 @@
. $topsrcdir/xulrunner/config/mozconfig
mk_add_options MOZ_MAKE_FLAGS="#MAKEFLAGS#"
mk_add_options MOZ_BUILD_PROJECTS=xulrunner
mk_add_options MOZ_CO_PROJECT=xulrunner
mk_add_options MOZ_OBJDIR=@topsrcdir@/obj-xulrunner
ac_add_options --prefix=/usr
ac_add_app_options --enable-application=xulrunner
ac_add_options --with-system-nss
ac_add_options --with-system-nspr
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-mng
ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-mochitest
ac_add_options --disable-debug
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-xprint
ac_add_options --disable-profilesharing
ac_add_options --disable-gnomevfs
ac_add_options --disable-gnomeui
ac_add_options --disable-mailnews
ac_add_options --disable-crashreporter
ac_add_options --disable-javaxpcom
ac_add_options --disable-necko-wifi
ac_add_options --disable-libnotify
ac_add_options --enable-optimize="#CFLAGS#"
ac_add_options --enable-shared
ac_add_options --disable-dbus

67
xulrunner/xulrunner.diff
View File

@ -1,67 +0,0 @@
diff -Naur mozilla-1.9.1/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.1.new/xulrunner/installer/libxul-embedding.pc.in
--- mozilla-1.9.1/xulrunner/installer/libxul-embedding.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/libxul-embedding.pc.in 2009-10-29 23:12:07.687729216 +0100
@@ -12,4 +12,4 @@
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS%
diff -Naur mozilla-1.9.1/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla-1.9.1.new/xulrunner/installer/libxul-embedding-unstable.pc.in
--- mozilla-1.9.1/xulrunner/installer/libxul-embedding-unstable.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/libxul-embedding-unstable.pc.in 2009-10-29 23:12:07.686727554 +0100
@@ -8,4 +8,4 @@
Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
Version: %MOZILLA_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS%
diff -Naur mozilla-1.9.1/xulrunner/installer/Makefile.in mozilla-1.9.1.new/xulrunner/installer/Makefile.in
--- mozilla-1.9.1/xulrunner/installer/Makefile.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/Makefile.in 2009-10-29 23:12:07.685747405 +0100
@@ -96,19 +96,28 @@
ifdef MOZ_NATIVE_NSPR
NSPR_NAME=nspr
NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags)
+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs)
else
-pkg_config_files += mozilla-nspr.pc
NSPR_NAME=mozilla-nspr
FULL_NSPR_CFLAGS=-I\$${includedir}/stable
FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
endif
+pkg_config_files += mozilla-nspr.pc
$(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
-ifndef MOZ_NATIVE_NSS
-pkg_config_files += mozilla-nss.pc
+ifdef MOZ_NATIVE_NSS
+NSPR_VERSION=$(shell $(NSS_CONFIG) --version)
+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
+else
+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version)
+FULL_NSS_CFLAGS=-I\$${includedir}/stable
+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs))
endif
+pkg_config_files += mozilla-nss.pc
ifdef MOZ_OJI
OJIDEF=-DOJI
diff -Naur mozilla-1.9.1/xulrunner/installer/mozilla-nss.pc.in mozilla-1.9.1.new/xulrunner/installer/mozilla-nss.pc.in
--- mozilla-1.9.1/xulrunner/installer/mozilla-nss.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/mozilla-nss.pc.in 2009-10-29 23:21:10.524863538 +0100
@@ -4,7 +4,7 @@
Name: NSS
Description: Mozilla Network Security Services
-Version: %MOZILLA_VERSION%
+Version: %NSS_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-Cflags: -I${includedir}/stable
+Libs: %FULL_NSS_LIBS%
+Cflags: %FULL_NSS_CFLAGS%