# HG changeset patch # User Christophe Lincoln # Date 1306680853 -7200 # Node ID c0d439992277771cd4de5b0f2597a7cf1f44590b # Parent 8df8311113acf95a58000315e6be47ef09540d2c firefox: keep mesa-dev in bdeps but disable webgl, fix bookmarks and wrong option in mozconfig diff -r 8df8311113ac -r c0d439992277 firefox/receipt --- a/firefox/receipt Sun May 29 14:51:18 2011 +0200 +++ b/firefox/receipt Sun May 29 16:54:13 2011 +0200 @@ -5,15 +5,17 @@ CATEGORY="network" SHORT_DESC="User friendly, secure and fast web browser." MAINTAINER="pankso@slitaz.org" -DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage alsa-lib xorg-libXt libfirefox libnotify" -BUILD_DEPENDS="zip libIDL coreutils findutils libnotify-dev wireless_tools-dev perl \ -python yasm mesa-dev alsa-lib alsa-lib-dev" TARBALL="$PACKAGE-$VERSION.source.tar.bz2" WEB_SITE="http://www.mozilla.org/" WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL" CONFIG_FILES="/etc/firefox" TAGS="browser" +DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \ +alsa-lib xorg-libXt libfirefox libnotify" +BUILD_DEPENDS="zip libIDL coreutils findutils libnotify-dev wireless_tools-dev \ +perl python yasm alsa-lib-dev mesa-dev" + # Rules to configure and make the package. # # A long compile time... dont forget to build libidl before and check the @@ -26,14 +28,15 @@ sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk ./configure $CONFIGURE_ARGS && make -j 4 && - make DESTDIR=$PWD/_pkg install && - cp -a xpcom/typelib $PWD/_pkg + make DESTDIR=$DESTDIR install && + cp -a xpcom/typelib $DESTDIR } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome $fs/usr/share $fs/etc + mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome \ + $fs/usr/share $fs/etc cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib @@ -65,12 +68,6 @@ sed -i s:'pref("browser.EULA.3.accepted", false);':'pref("browser.EULA.3.accepted", true);': \ $fs/etc/firefox/pref/firefox.js - # Locale fr -# tar xjf stuff/langpack-fr@firefox.mozilla.org.tar.bz2 \ -# -C $fs/usr/lib/$PACKAGE-$VERSION/extensions - #sed -i "s/maxVersion>3.0../maxVersion>$VERSION/" \ - # $fs/usr/lib/$PACKAGE-$VERSION/extensions/langpack*/install.rdf - # Search Plugin (by: oddball) cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/ chown -R root.root $fs @@ -83,7 +80,6 @@ #retain big firefox libs cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \ $fs/usr/lib/$PACKAGE-$VERSION - } # Pre - Post install command to set default locale. @@ -114,4 +110,3 @@ done rm -rf /tmp/firefox-plugins-$$ } - diff -r 8df8311113ac -r c0d439992277 firefox/stuff/README --- a/firefox/stuff/README Sun May 29 14:51:18 2011 +0200 +++ b/firefox/stuff/README Sun May 29 16:54:13 2011 +0200 @@ -1,6 +1,6 @@ -Tazwok build Firefox from the official Mozila source code, we use a .mozconfig +We build Firefox from the official Mozila source code, we use a .mozconfig file to set all configure options. SliTaz firefox.mozconfig is copied in the mozilla source code with the command 'tazwok cook'. So if you want to make some changes, edit firefox.mozconfig. @@ -11,5 +11,7 @@ browserconfig.properties is used to set www.slitaz.org for the default home page, this file goes in /usr/lib/firefox-$VERSION with the bookmarks file. +We dont use --enable-official-branding since we dont have any authorization +to use trademarks per http://www.mozilla.org/foundation/trademarks/ - Pankso diff -r 8df8311113ac -r c0d439992277 firefox/stuff/bookmarks.html --- a/firefox/stuff/bookmarks.html Sun May 29 14:51:18 2011 +0200 +++ b/firefox/stuff/bookmarks.html Sun May 29 16:54:13 2011 +0200 @@ -58,9 +58,9 @@


SliTaz Packages -
SliTaz Laboratories +
SliTaz Bugs
Community Forum -
Community Platform +
Community Platform
SliTaz on Twitter
SliTaz on DistroWatch diff -r 8df8311113ac -r c0d439992277 firefox/stuff/firefox.mozconfig --- a/firefox/stuff/firefox.mozconfig Sun May 29 14:51:18 2011 +0200 +++ b/firefox/stuff/firefox.mozconfig Sun May 29 16:54:13 2011 +0200 @@ -17,12 +17,13 @@ ac_add_options --enable-strip ac_add_options --enable-optimize ac_add_options --enable-system-cairo -ac_add_options --enable-jsd -ac-add_options --enable-shared-js +#ac_add_options --enable-jsd +ac_add_options --enable-shared-js #ac_add_options --enable-svg #ac_add_options --enable-svg-renderer=cairo #ac_add_options --enable-postscript -ac_add_options --enable-official-branding +#ac_add_options --enable-official-branding +ac_add_options --enable-splashscreen ac_add_options --disable-toolkit-qt ac_add_options --disable-xinerama @@ -39,9 +40,12 @@ ac_add_options --disable-installer ac_add_options --disable-updater ac_add_options --disable-gconf +ac_add_options --disable-jsd +ac_add_options --disable-webm +ac_add_options --disable-angle +ac_add_options --disable-smil #ac_add_options --disable-printing #ac_add_options --disable-xprint -#ac_add_options --disable-jsd #ac_add_options --disable-extensions #ac_add_options --disable-xpfe-components #ac_add_options --disable-view-source diff -r 8df8311113ac -r c0d439992277 libfirefox/receipt --- a/libfirefox/receipt Sun May 29 14:51:18 2011 +0200 +++ b/libfirefox/receipt Sun May 29 16:54:13 2011 +0200 @@ -5,14 +5,15 @@ CATEGORY="network" SHORT_DESC="firefox lib files" MAINTAINER="jozee@slitaz.org" -DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage alsa-lib xorg-libXt" WANTED="firefox" WEB_SITE="http://www.mozilla.org/" +DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \ +alsa-lib xorg-libXt" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/$WANTED-$VERSION cp -a $_pkg/usr/lib/$WANTED-$VERSION/*.so $fs/usr/lib/$WANTED-$VERSION @@ -21,8 +22,6 @@ # Remove unnecessary files (copied from firefox receipt) rm -rf $fs/usr/lib/firefox-$VERSION/libsqlite3.so - - } post_install()