[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5cd1caca331425cfee84b7d005c4a0821938aa5e)

Ladislav Hagara scm at sourcemage.org
Mon Aug 15 09:50:28 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 http/firefox/DETAILS    |    4 ++--
 http/firefox/HISTORY    |    4 ++++
 http/firefox/mozconfig5 |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5cd1caca331425cfee84b7d005c4a0821938aa5e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    firefox 6.0
    
    switched to system nspr and nss
    fails with internal nss, linux 3 problem, fixed in new nss:
    
    make[6]: Entering directory
    `/usr/src/firefox-6.0/mozilla-release/security/dbm'
    ../coreconf/config.mk:71: ../coreconf/Linux3.0.mk: No such file or
    directory
    /usr/bin/make -j1: *** No rule to make target ../coreconf/Linux3.0.mk.
    Stop.
    make[6]: *** [../coreconf/Linux3.0.mk] Error 1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c933eea..a9ac203 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=5.0.1
+         VERSION=6.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=5.0.1
+         VERSION=6.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 53c87c2..a1e4dc4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2011-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 6.0
+	* mozconfig5: --with-system-nspr and --with-system-nss added
+
 2011-08-06 George Sherwood <gsherwood at sourcemage.org>
 	* CONFIGURE: Added option for safe browsing
 	* DEPENDS: Added optional depends yasm removed depends yasm
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
index 25aef0c..9e9d2f0 100644
--- a/http/firefox/mozconfig5
+++ b/http/firefox/mozconfig5
@@ -18,6 +18,8 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-freetype2
 ac_add_options --enable-pango
 ac_add_options --enable-svg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
 ac_add_options --disable-dbus
 ac_add_options --disable-installer
 ac_add_options --disable-updater


More information about the SM-Commit mailing list