Merge pull request #671 from mariux64/update-firefox-and-rustc

Update to Firefox 59 and rustc 1.24.1

firefox.be0

@@ -2,23 +2,31 @@
 
 #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80'
 
-# BEE_VERSION firefox-57.0.4-0
+# BEE_VERSION firefox-59.0-0
 
-SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz"
+SRCURL[0]="https://hg.mozilla.org/releases/mozilla-release/archive/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.gz"
 
 BEE_BUILDTYPE=autotools
 
 mee_configure() {
-    "${S}"/configure \
-        --prefix=/usr \
-        --enable-application=browser \
-        --disable-necko-wifi \
-        --enable-official-branding \
-        --without-system-icu \
-        --without-system-nspr \
-        --disable-dbus \
-        --disable-tests \
-        --enable-optimize
+    start_cmd cat > ${S}/mozconfig << EOF
+        ac_add_options --prefix=/usr
+        ac_add_options --enable-application=browser
+        ac_add_options --disable-necko-wifi
+        ac_add_options --enable-official-branding
+        ac_add_options --without-system-icu
+        ac_add_options --without-system-nspr
+        ac_add_options --disable-dbus
+        ac_add_options --disable-tests
+        ac_add_options --enable-optimize
+        mk_add_options MOZ_MAKE_FLAGS="${BEE_MAKEFLAGS}"
+        mk_add_options MOZ_OBJDIR=$B
+EOF
+}
+
+mee_build() {
+  cd $S
+  make
 }
 
 mee_build_post() {
@@ -42,9 +50,20 @@ mee_build_post() {
 	EOF
 }
 
+mee_install() {
+  cd $B
+  start_cmd make install DESTDIR=$D
+}
+
 mee_install_post() {
     start_cmd install -d ${D}${LIBDIR}/mariux64
-    start_cmd mv ${D}${BINDIR}/${PKGNAME} ${D}${LIBDIR}/mariux64/${PKGNAME}
+    start_cmd rm ${D}${BINDIR}/${PKGNAME}
+
+    cat >${D}${LIBDIR}/mariux64/firefox<<EOF
+NSS_SDB_USE_CACHE=1 exec "${LIBDIR}/firefox/firefox" "\$@"
+EOF
+
+chmod 755 ${D}${LIBDIR}/mariux64/firefox
 
     # install official icon in all sizes
 
@@ -61,13 +80,13 @@ mee_install_post() {
     start_cmd mkdir -p ${D}${DATADIR}/applications
     start_cmd desktop-file-install --dir ${D}${DATADIR}/applications ${B}/firefox.desktop
 
-  cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/defaults/pref/autoconfig.js
+  cat <<-EOF >${D}${LIBDIR}/firefox/defaults/pref/autoconfig.js
   // Any comment. You must start the file with a comment!
 pref("general.config.filename", "default_config_mariux.cfg");
 pref("general.config.obscure_value", 0);
 EOF
 
-  cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/default_config_mariux.cfg
+  cat <<-EOF >${D}${LIBDIR}/firefox/default_config_mariux.cfg
 // Any comment. You must start the file with a comment!
 pref("storage.nfs_filesystem", true);
 pref("network.captive-portal-service.enabled",false);
@@ -189,6 +208,9 @@ defaultPref("dom.popup_allowed_events", "click dblclick");
 //enable Firefox's built-in PDF reader
 defaultPref("pdfjs.disabled", false);
 
+//session restore save time
+defaultPref("browser.sessionstore.interval",150000);
+
 //enable legacy extensions
 defaultPref("extensions.legacy.enabled",true);
 EOF

rustc.be0

@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION rustc-1.21.0-3
+# BEE_VERSION rustc-1.24.1-0
 
 SRCURL[0]="https://static.rust-lang.org/dist/rustc-${PKGVERSION}-src.tar.gz"