# HG changeset patch # User Christopher Rogers # Date 1301093776 0 # Node ID 62e25e8680004a1b1ab57b963311d2713c64156e # Parent fb0590550cbf19495a351a7307358e7bc2bfa307 Up: firefox to 4.0. diff -r fb0590550cbf -r 62e25e868000 firefox-dev/receipt --- a/firefox-dev/receipt Fri Mar 25 22:16:27 2011 +0000 +++ b/firefox-dev/receipt Fri Mar 25 22:56:16 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="firefox-dev" -VERSION="3.6.15" +VERSION="4.0" CATEGORY="development" SHORT_DESC="firefox devel files" MAINTAINER="jozee@slitaz.org" diff -r fb0590550cbf -r 62e25e868000 firefox/receipt --- a/firefox/receipt Fri Mar 25 22:16:27 2011 +0000 +++ b/firefox/receipt Fri Mar 25 22:56:16 2011 +0000 @@ -1,14 +1,14 @@ # SliTaz package receipt. PACKAGE="firefox" -VERSION="3.6.15" +VERSION="4.0" 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="xorg-dev gtk+-dev zip libIDL coreutils findutils xorg-libXft-dev \ +DEPENDS="gtk+ sqlite dbus mesa libglu-mesa dbus-glib glib jpeg xorg-libX11 xorg-libXdamage alsa-lib xorg-libXt libfirefox libnotify" +BUILD_DEPENDS="gtk+-dev zip libIDL coreutils findutils xorg-libXft-dev \ dbus-dev dbus-glib-dev alsa-lib alsa-lib-dev libnotify-dev wireless_tools-dev perl \ -python" +python yasm" 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" @@ -22,10 +22,7 @@ # compile_rules() { - # Move the mozilla source tree to $PACKAGE-$VERSION to keep variables - # and to have a nice clean. - mv mozilla-* $PACKAGE-$VERSION 2>/dev/null - cp -a stuff/firefox.mozconfig $src/.mozconfig + cp -a $stuff/firefox.mozconfig $src/.mozconfig cd $src sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk ./configure $CONFIGURE_ARGS && @@ -37,26 +34,29 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/$PACKAGE-$VERSION $fs/usr/share $fs/etc + i=$src + 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 # Home page, bookmarks file and branding. - cp -a stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION - cp -a stuff/bookmarks.html \ + cp -a $stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION + cp -a $stuff/bookmarks.html \ $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile - cp -a stuff/firefox-branding.js \ - $fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/ + cp -a $stuff/firefox-branding.js \ + $fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/firefox.js # User preference. - cp -a stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile - cp -a stuff/userChrome.css \ + cp -a $stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile + cp -a $stuff/userChrome.css \ $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome # Move default config to /etc/firefox (/usr maybe read-only) for i in defaults browserconfig.properties ; do mv -f $fs/usr/lib/$PACKAGE-$VERSION/$i $fs/etc/$PACKAGE done + + ln -s /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION ln -s /etc/$PACKAGE $fs/usr/lib/$PACKAGE-$VERSION/defaults @@ -71,7 +71,7 @@ # $fs/usr/lib/$PACKAGE-$VERSION/extensions/langpack*/install.rdf # Search Plugin (by: oddball) - cp -a stuff/searchplugins $fs/usr/lib/firefox-$VERSION/ + cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/ chown -R root.root $fs # Remove unnecessary files. @@ -80,8 +80,7 @@ # split firefox libs rm -rf $fs/usr/lib/$PACKAGE-$VERSION/*.so #retain big firefox libs - cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \ - $_pkg/usr/lib/$PACKAGE-$VERSION/libmozjs.so \ + cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \ $fs/usr/lib/$PACKAGE-$VERSION } diff -r fb0590550cbf -r 62e25e868000 firefox/stuff/firefox.mozconfig --- a/firefox/stuff/firefox.mozconfig Fri Mar 25 22:16:27 2011 +0000 +++ b/firefox/stuff/firefox.mozconfig Fri Mar 25 22:56:16 2011 +0000 @@ -18,9 +18,11 @@ 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-svg #ac_add_options --enable-svg-renderer=cairo #ac_add_options --enable-postscript +ac_add_options --enable-official-branding ac_add_options --disable-toolkit-qt ac_add_options --disable-xinerama @@ -36,6 +38,7 @@ ac_add_options --disable-accessibility ac_add_options --disable-installer ac_add_options --disable-updater +ac_add_options --disable-gconf #ac_add_options --disable-printing #ac_add_options --disable-xprint #ac_add_options --disable-jsd diff -r fb0590550cbf -r 62e25e868000 libfirefox/receipt --- a/libfirefox/receipt Fri Mar 25 22:16:27 2011 +0000 +++ b/libfirefox/receipt Fri Mar 25 22:56:16 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libfirefox" -VERSION="3.6.15" +VERSION="4.0" CATEGORY="network" SHORT_DESC="firefox lib files" MAINTAINER="jozee@slitaz.org" @@ -18,7 +18,6 @@ # remove some firefox libs (in firefox receipts) rm -rf $fs/usr/lib/firefox-$VERSION/libxul.so - rm -rf $fs/usr/lib/firefox-$VERSION/libmozjs.so # Remove unnecessary files (copied from firefox receipt) rm -rf $fs/usr/lib/firefox-$VERSION/libsqlite3.so