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

Ladislav Hagara scm at sourcemage.org
Tue Jul 20 17:41:00 EDT 2010


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

 http/xulrunner/1000_fix_alignment.patch |   33 --------------------------------
 http/xulrunner/DETAILS                  |    8 +++----
 http/xulrunner/HISTORY                  |    4 +++
 http/xulrunner/PRE_BUILD                |    1 
 4 files changed, 8 insertions(+), 38 deletions(-)

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

    xulrunner 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15

diff --git a/http/xulrunner/1000_fix_alignment.patch b/http/xulrunner/1000_fix_alignment.patch
deleted file mode 100644
index 2ef47c3..0000000
--- a/http/xulrunner/1000_fix_alignment.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: David Mandelin <dmandelin at mozilla.com>
-
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
-@@ -5792,24 +5792,24 @@ __attribute__((noinline))
- #else
- inline
- #endif
- void *
- memalign(size_t alignment, size_t size)
- {
- 	void *ret;
- 
--	assert(((alignment - 1) & alignment) == 0 && alignment >=
--	    sizeof(void *));
-+	assert(((alignment - 1) & alignment) == 0);
- 
- 	if (malloc_init()) {
- 		ret = NULL;
- 		goto RETURN;
- 	}
- 
-+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
- 	ret = ipalloc(alignment, size);
- 
- RETURN:
- #ifdef MALLOC_XMALLOC
- 	if (opt_xmalloc && ret == NULL) {
- 		_malloc_message(_getprogname(),
- 		": (malloc) Error in memalign(): out of memory\n", "", "");
- 		abort();
-
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 8542ac2..fdcbe59 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xulrunner
-         VERSION=1.9.2.6
-       FFVERSION=3.6.6
+         VERSION=1.9.2.7
+       FFVERSION=3.6.7
           SOURCE=firefox-$FFVERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
@@ -9,8 +9,8 @@ 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=14
-      PATCHLEVEL=1
+  SECURITY_PATCH=15
+      PATCHLEVEL=0
          ENTERED=20060829
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index c4e7048..ba0dd81 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2010-07-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15
+	* PRE_BUILD, 1000_fix_alignment.patch: removed patch
+
 2010-07-03 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, 1000_fix_alignment.patch: added patch to fix
 	  crash on start
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 40963c3..933f54b 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -7,7 +7,6 @@ sed -i 's/^#elif$/#else/' toolkit/xre/nsAppRunner.cpp  &&
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
 
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/1000_fix_alignment.patch &&
 
 # Needed to make things using XUL find NSPR.
 echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&



More information about the SM-Commit mailing list