Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

1 files changed, 20 insertions, 18 deletions

diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 4de240384..812a7b163 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,6 @@
 # Thanks to the folks at the Mozilla Foundation for permission to
 # distribute this, and for all the great work!  :-)
 
-# This is a source build script. Unfortunately, there is no official
-# binary tarball available for x86_64
-
 VERSION=$(basename $(ls firefox-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,9 +33,10 @@ if [ -z "$ARCH" ]; then
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
-MOZVERS=${MOZVERS:-1.9.2}
+MOZVERS=${MOZVERS:-2.0}
+RELEASEVER=$(echo $VERSION | cut -f 1 -d r)
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -103,26 +101,28 @@ export CXXFLAGS="$SLKCFLAGS" &&
   --enable-official-branding \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION \
+  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER \
   --with-system-zlib \
   --enable-application=browser \
   --enable-default-toolkit=cairo-gtk2 \
+  --enable-system-cairo \
+  --enable-startup-notification \
   --enable-crypto \
   --enable-svg \
   --enable-canvas \
+  --enable-logging \
   --enable-xft \
+  --enable-webm \
   --enable-xinerama \
   --enable-optimize \
   --enable-reorder \
   --enable-strip \
-  --enable-system-cairo \
   --enable-cpp-rtti \
   --enable-single-profile \
   --disable-ldap \
   --disable-accessibility \
   --disable-debug \
   --disable-tests \
-  --disable-logging \
   --disable-pedantic \
   --disable-installer \
   --disable-mailnews \
@@ -136,14 +136,16 @@ make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # We don't need these (just symlinks anyway):
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$VERSION
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER
 
 # Nor these:
 rm -rf $PKG/usr/include
 
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   #mv defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig || exit 1
-  zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
+  if [ -d defaults/profile ]; then
+    zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
+  fi
   zcat $CWD/firefox.moz_plugin_path.diff.gz \
     | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
     | patch -p1 --verbose --backup --suffix=.orig || exit 1
@@ -160,7 +162,7 @@ cat $CWD/firefox.png > $PKG/usr/share/pixmaps/firefox.png
 # These files/directories are usually created if Firefox is run as root,
 # which on many systems might (and possibly should) be never.  Therefore, if we
 # don't see them we'll put stubs in place to prevent startup errors.
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   if [ -d extensions/talkback\@mozilla.org ]; then
     if [ ! -r extensions/talkback\@mozilla.org/chrome.manifest ]; then
       echo > extensions/talkback\@mozilla.org/chrome.manifest
@@ -172,17 +174,17 @@ cat $CWD/firefox.png > $PKG/usr/share/pixmaps/firefox.png
 )
 
 # Need some default icons in the right place:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/chrome/icons/default
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/chrome/icons/default
 install -m 644 other-licenses/branding/firefox/default16.png \
-  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/icons/
+  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/icons/
 install -m 644 other-licenses/branding/firefox/default16.png \
-  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/chrome/icons/default/ 
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION
+  $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/chrome/icons/default/ 
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER
   install -m 644 icons/{default,mozicon50}.xpm chrome/icons/default/
 )
 
 # Copy over the LICENSE
-install -p -c -m 644 LICENSE $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$VERSION/
+install -p -c -m 644 LICENSE $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER/
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc