firefox: updated to 3.0.
This commit is contained in:
Predrag Ivanovic
Tilman Sauerbeck
parent
9d9dd08b23
commit
9c10466aae
4351
firefox/.footprint
4351
firefox/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,3 @@
|
|||||||
25f355113cdee6800380c6e1a4cd38f0 firefox-2.0-add-ldflags.patch
|
4210ae0801df2eb498408533010d97c1 firefox-3.0-source.tar.bz2
|
||||||
9e9c13ba7b81f93f2fa10c6f256ee31e firefox-2.0.0.14-source.tar.bz2
|
ac9b330dd69207a3c44e0431ddcfe8eb mozconfig
|
||||||
0eceebd5fbc394248c8c94d66fc95d66 firefox.desktop
|
62530844efda8b387e518162b7922f2f xulrunner.patch
|
||||||
19ec3915f76e7eb820ad2c59730ee2be firefox.png
|
|
||||||
43f319dd0abdb2ebf0aa9dec95eaf6c8 mozconfig
|
|
||||||
|
|||||||
@ -1,64 +1,36 @@
|
|||||||
# Description: Mozilla Web Browser Component
|
# Description: Mozilla Web Browser Component
|
||||||
# URL: http://www.mozilla.com/firefox/
|
# URL: http://www.mozilla.com/firefox/
|
||||||
# Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org.
|
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
|
||||||
# Depends on: libidl, gtk, libpng, libjpeg, zlib, nss
|
# Depends on: xulrunner
|
||||||
|
|
||||||
name=firefox
|
name=firefox
|
||||||
version=2.0.0.14
|
version=3.0
|
||||||
release=1
|
release=1
|
||||||
source=(ftp://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \
|
source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2
|
||||||
http://crux.nu/files/$name/$name.desktop \
|
mozconfig xulrunner.patch)
|
||||||
http://crux.nu/files/$name/$name.png \
|
|
||||||
firefox-2.0-add-ldflags.patch \
|
|
||||||
mozconfig)
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
export MOZ_CO_PROJECT=browser
|
export MOZ_CO_PROJECT=browser
|
||||||
export MOZILLA_FIVE_HOME=/usr/lib/firefox
|
export BUILD_OFFICIAL=1
|
||||||
|
export MOZILLA_OFFICIAL=1
|
||||||
|
export MOZILLA_FIVE_HOME=/usr/lib/firefox
|
||||||
|
|
||||||
cd mozilla
|
cd mozilla
|
||||||
patch -p0 -i $SRC/firefox-2.0-add-ldflags.patch
|
patch -p1 -i $SRC/xulrunner.patch
|
||||||
sed -e "s/#CFLAGS#/$CFLAGS/" -e "s/#MAKEFLAGS#/$MAKEFLAGS/g" $SRC/mozconfig > .mozconfig
|
sed -e "s/#CFLAGS#/$CFLAGS/" $SRC/mozconfig > .mozconfig
|
||||||
./configure
|
./configure
|
||||||
make
|
make
|
||||||
|
|
||||||
install -d $PKG$MOZILLA_FIVE_HOME
|
install -d \
|
||||||
cp -rL dist/bin/* $PKG$MOZILLA_FIVE_HOME
|
$PKG$MOZILLA_FIVE_HOME \
|
||||||
install -d $PKG/usr/bin
|
$PKG/usr/bin \
|
||||||
ln -s /usr/lib/$name/$name $PKG/usr/bin/$name
|
$PKG/usr/share/idl/firefox \
|
||||||
|
$PKG/usr/include/firefox
|
||||||
|
|
||||||
# devel stuff
|
cp -rL dist/bin/* $PKG$MOZILLA_FIVE_HOME
|
||||||
mkdir -p $PKG/usr/share/idl/$name $PKG/usr/include/$name
|
ln -s /usr/lib/firefox/firefox $PKG/usr/bin/firefox
|
||||||
cp -frL dist/idl/* $PKG/usr/share/idl/$name/
|
|
||||||
cp -frL dist/include/* $PKG/usr/include/$name/
|
|
||||||
|
|
||||||
# pkgconfig
|
# devel stuff
|
||||||
mkdir -p $PKG/usr/lib/pkgconfig
|
cp -frL dist/idl/* $PKG/usr/share/idl/firefox/
|
||||||
install build/unix/*.pc $PKG/usr/lib/pkgconfig
|
cp -frL dist/include/* $PKG/usr/include/firefox/
|
||||||
sed -i -e "s|/usr/local|/usr|g" $PKG/usr/lib/pkgconfig/*.pc
|
|
||||||
sed -i -e "s|$name-$version|$name|g" $PKG/usr/lib/pkgconfig/*.pc
|
|
||||||
# disgusting hack
|
|
||||||
sed -i -e 's|\(Cflags:.*\)|\1 -I${includedir}/dom -I${includedir}/necko|' \
|
|
||||||
$PKG/usr/lib/pkgconfig/*.pc
|
|
||||||
|
|
||||||
chmod 644 $PKG/usr/lib/pkgconfig/$name-*.pc
|
|
||||||
|
|
||||||
# cleanup junk
|
|
||||||
rm -rfv $PKG/usr/lib/$name/README.txt $PKG/usr/lib/$name/init.d/
|
|
||||||
rm -rf $PKG/usr/lib/$name/{LICENSE,TestGtkEmbed,bloaturls.txt,dependentlibs.list}
|
|
||||||
rm -rf $PKG/usr/lib/$name/res/samples $PKG/usr/lib/$name/res/throbber
|
|
||||||
rm -rf $PKG/usr/include/$name/system_wrappers
|
|
||||||
|
|
||||||
# desktop entry/icon
|
|
||||||
install -D -m 0644 $SRC/$name.desktop \
|
|
||||||
$PKG/usr/share/applications/$name.desktop
|
|
||||||
install -D -m 0644 $SRC/$name.png $PKG/usr/share/pixmaps/$name.png
|
|
||||||
|
|
||||||
# fix file permissions since version 2.0.0.8
|
|
||||||
find $PKG/usr/include/firefox -type f -exec chmod g+r,a+r {} \;
|
|
||||||
find $PKG/usr/include/firefox -type f -perm -u=x -exec chmod g+x,a+x {} \; # no code in headerfiles!
|
|
||||||
find $PKG/usr/share/idl -type f -name '*.idl' -exec chmod g+r,a+r {} \;
|
|
||||||
find $PKG/usr/share/idl -type f -name '*.idl' -perm -u=x -exec chmod g+x,a+x {} \;
|
|
||||||
find $PKG/usr/lib/firefox -type f -exec chmod g+r,a+r {} \;
|
|
||||||
chmod 755 $PKG/usr/lib/firefox/run-mozilla.sh
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +0,0 @@
|
|||||||
--- layout/build/Makefile.in.orig 2006-10-25 21:02:08.000000000 +0000
|
|
||||||
+++ layout/build/Makefile.in 2006-10-25 21:02:44.000000000 +0000
|
|
||||||
@@ -226,6 +226,7 @@
|
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_GTK2
|
|
||||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
|
|
||||||
+ -lX11 -lXrender \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
@ -1,33 +1,45 @@
|
|||||||
|
# use an OBJDIR
|
||||||
|
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
|
||||||
|
|
||||||
|
# parallel build
|
||||||
|
mk_add_options MOZ_MAKE_FLAGS=-j2
|
||||||
|
|
||||||
|
# grab the defaults from the firefox tarball
|
||||||
. $topsrcdir/browser/config/mozconfig
|
. $topsrcdir/browser/config/mozconfig
|
||||||
|
|
||||||
mk_add_options MOZ_MAKE_FLAGS="#MAKEFLAGS#"
|
# crux options
|
||||||
|
|
||||||
ac_add_options --prefix=/usr
|
ac_add_options --prefix=/usr
|
||||||
ac_add_options --with-system-nss
|
ac_add_options --with-system-nss
|
||||||
ac_add_options --with-system-nspr
|
ac_add_options --with-system-nspr
|
||||||
ac_add_options --with-system-jpeg
|
ac_add_options --with-system-jpeg
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --with-system-zlib
|
||||||
ac_add_options --with-system-png
|
|
||||||
ac_add_options --with-system-mng
|
ac_add_options --with-system-mng
|
||||||
ac_add_options --with-pthreads
|
ac_add_options --with-pthreads
|
||||||
|
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9
|
||||||
|
ac_add_options --enable-system-cairo
|
||||||
|
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 --disable-static
|
||||||
ac_add_options --disable-tests
|
ac_add_options --disable-tests
|
||||||
|
ac_add_options --disable-mochitest
|
||||||
ac_add_options --disable-debug
|
ac_add_options --disable-debug
|
||||||
ac_add_options --disable-installer
|
ac_add_options --disable-installer
|
||||||
ac_add_options --disable-updater
|
ac_add_options --disable-updater
|
||||||
ac_add_options --disable-xprint
|
ac_add_options --disable-xprint
|
||||||
ac_add_options --disable-profilesharing
|
ac_add_options --disable-profilesharing
|
||||||
ac_add_options --disable-gnomevfs
|
ac_add_options --disable-gnomevfs
|
||||||
ac_add_options --disable-shared
|
ac_add_options --disable-gnomeui
|
||||||
ac_add_options --disable-xpctools
|
ac_add_options --disable-mailnews
|
||||||
ac_add_options --enable-optimize="#CFLAGS#"
|
ac_add_options --disable-crashreporter
|
||||||
ac_add_options --enable-official-branding
|
|
||||||
ac_add_options --enable-default-toolkit=gtk2
|
|
||||||
ac_add_options --enable-extensions=default,-gnomevfs
|
|
||||||
ac_add_options --enable-xft
|
|
||||||
ac_add_options --enable-pango
|
|
||||||
ac_add_options --enable-system-cairo
|
|
||||||
ac_add_options --enable-svg
|
ac_add_options --enable-svg
|
||||||
ac_add_options --enable-canvas
|
ac_add_options --enable-canvas
|
||||||
ac_add_options --enable-crypto
|
ac_add_options --enable-crypto
|
||||||
ac_add_options --enable-single-profile
|
ac_add_options --enable-single-profile
|
||||||
ac_add_options --enable-static
|
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
|
||||||
|
|||||||
30
firefox/xulrunner.patch
Normal file
30
firefox/xulrunner.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
config/rules.mk | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
Index: mozilla/config/rules.mk
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/config/rules.mk
|
||||||
|
+++ mozilla/config/rules.mk
|
||||||
|
@@ -57,16 +57,21 @@
|
||||||
|
REPORT_BUILD = @echo $(notdir $<)
|
||||||
|
|
||||||
|
ifeq ($(OS_ARCH),OS2)
|
||||||
|
EXEC =
|
||||||
|
else
|
||||||
|
EXEC = exec
|
||||||
|
endif
|
||||||
|
|
||||||
|
+# Don't copy xulrunner files at install time, when using system xulrunner
|
||||||
|
+ifdef LIBXUL_SDK
|
||||||
|
+ SKIP_COPY_XULRUNNER=1
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
# ELOG prints out failed command when building silently (gmake -s).
|
||||||
|
ifneq (,$(findstring -s,$(MAKEFLAGS)))
|
||||||
|
ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
|
||||||
|
else
|
||||||
|
ELOG :=
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||||
Loading…
Reference in New Issue
Block a user