[SM-Commit] GIT changes to stable-0.47 grimoire by George Sherwood (22242d3a44dde3640121b5874ee75ac75622f541)

George Sherwood scm at sourcemage.org
Sun Sep 12 14:48:42 EDT 2010


GIT changes to stable-0.47 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 http/xulrunner/BUILD   |    5 ++++-
 http/xulrunner/DEPENDS |    2 +-
 http/xulrunner/DETAILS |    6 +++---
 http/xulrunner/HISTORY |    7 +++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 22242d3a44dde3640121b5874ee75ac75622f541
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xulrunner 1.9.2.9, FFVERSION=3.6.9, SECURITY_PATCH=17
    (cherry picked from commit 6cfcca802e32f96a5a0a317e139a8c4688b6f757)

commit 0427e57c4ca318c94606d2f377499ea7c65495cf
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: George Sherwood <gsherwood at sourcemage.org>

    http/xulrunner: forced optimizations to -O2 to prevent segfault
    (cherry picked from commit d24af6375f032065fc857dc1748ad8e3ef8dc99b)

diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index 7caf211..bf87044 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -13,6 +13,8 @@ fi  &&
 #
 # No fast optimization for Mozilla, bit us so many times...
 #
+CFLAGS="${CFLAGS//-Os/-O2}"      &&
+CXXFLAGS="${CXXFLAGS//-Os/-O2}"  &&
 CFLAGS="${CFLAGS//-O3/-O2}"      &&
 CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 
@@ -22,9 +24,10 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 CFLAGS="${CFLAGS//-ffast-math/}"      &&
 CXXFLAGS="${CXXFLAGS//-ffast-math/}"  &&
 
+OPTS="${OPTS} --enable-optimize=-O2" &&
+
 ./configure --prefix=$INSTALL_ROOT/usr                       \
             --mandir=$INSTALL_ROOT/usr/share/man             \
-            --enable-optimize="$CFLAGS"                      \
             $OPTS                                            &&
 make_single  &&
 # workaround for configure not handling --disable-necko-wifi correctly
diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index e36db69..8116ac1 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -4,7 +4,7 @@ depends  jpeg                                    &&
 depends  libidl                                  &&
 depends  libxft                                  &&
 depends  -sub APNG libpng                        &&
-depends  sqlite                                  &&
+depends  -sub SECURE_DELETE sqlite               &&
 depends  nspr                                    &&
 depends  -sub "3.12.x" nss                       &&
 depends  perl                                    &&
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index c5e06af..4cf1f3b 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xulrunner
-         VERSION=1.9.2.8
-       FFVERSION=3.6.8
+         VERSION=1.9.2.9
+       FFVERSION=3.6.9
           SOURCE=firefox-$FFVERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc     
         WEB_SITE=http://www.mozilla.org/
-  SECURITY_PATCH=16
+  SECURITY_PATCH=17
          ENTERED=20060829
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index f15b84d..887d61d 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,10 @@
+2010-09-08 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.9.2.9, FFVERSION=3.6.9, SECURITY_PATCH=17
+	* DEPENDS: added -sub SECURE_DELETE to sqlite
+
+2010-08-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: forced optimizations to -O2 to prevent segfault
+
 2010-07-25 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: SECURITY_PATCH++.  Now it is listed as fixing a
 	  vulnerability.



More information about the SM-Commit mailing list