[Libreoffice-commits] .: 2 commits - nss/makefile.mk nss/nss-asm-fix.patch nss/nss-clang_os_Linux_x86_64_s_comments.patch nss/nss-clang_os_Linux_x86_s_comments.patch nss/nss-config.patch nss/nss-linux3.patch nss/nss-string-concat.patch nss/nss.aix.patch nss/nss.patch nss/nss_macosx.patch ooo.lst.in
Michael Stahl
mst at kemper.freedesktop.org
Mon Jul 16 09:21:01 PDT 2012
nss/makefile.mk | 17 +-
nss/nss-asm-fix.patch | 56 -------
nss/nss-clang_os_Linux_x86_64_s_comments.patch | 149 --------------------
nss/nss-clang_os_Linux_x86_s_comments.patch | 178 -------------------------
nss/nss-config.patch | 2
nss/nss-linux3.patch | 13 -
nss/nss-string-concat.patch | 11 -
nss/nss.aix.patch | 28 +--
nss/nss.patch | 70 ++-------
nss/nss_macosx.patch | 4
ooo.lst.in | 2
11 files changed, 45 insertions(+), 485 deletions(-)
New commits:
commit 7e6a07a6d2bcf50925fc499ec53216c960692f79
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Jul 14 00:05:33 2012 +0200
nss: upgrade to 3.13.5
- drop nss-linux3.patch, builds out of the box on Linux 3.x now
- drop nss-string-concat.patch, was fixed upstream
- drop nss-clang_os_Linux_x86_s_comments.patch
nss-clang_os_Linux_x86_64_s_comments.patch
the invalid asm comments were fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=624868
- drop nss-asm-fix.patch, fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=671711
- not updated nss.patch.mingw since it looks unmaintained
- remove the setting of FREEBL_NO_DEPEND, which is
a) no longer necessary, because it will be set automatically
on Linux 2.6
b) harmful because it prevents automatic setting of FREEBL_LOWHASH,
which is necessary to prevent conflicts with system libfreebl3.so
at least on Fedora 16/17
Change-Id: Idf9338d83f9b34000068c1b8691ca3135f56dd21
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 4338857..c123ef8 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -42,13 +42,13 @@ all:
.ENDIF
VER_MAJOR=3
-VER_MINOR=12
-VER_PATCH=8
+VER_MINOR=13
+VER_PATCH=5
-TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6
-TARFILE_MD5=71474203939fafbe271e1263e61d083e
+TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.9.1
+TARFILE_MD5=a0a861f539f0e7a91d05e6b9457e4db1
TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
-PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch nss-clang_os_Linux_x86_64_s_comments.patch nss-string-concat.patch nss-asm-fix.patch
+PATCH_FILES=nss.patch nss.aix.patch nss-config.patch
.IF "$(OS)"=="MACOSX"
PATCH_FILES+=nss_macosx.patch
@@ -98,10 +98,9 @@ OUT2BIN=config/nspr-config mozilla/security/nss/nss-config
BUILD_DIR=mozilla/security/nss
BUILD_ACTION= $(GNUMAKE) nss_build_all -j1
-#See #i105566# && moz#513024#
-.IF "$(OS)"=="LINUX"
-BUILD_ACTION+=FREEBL_NO_DEPEND=1
-.ENDIF
+#Note: with the new version the libfreebl3.so gets built in a way that does
+# not conflict with the system one on Linux automatically;
+# it is no longer necessary to add a workaround for #i105566# && moz#513024#
.IF "$(OS)$(COM)"=="SOLARISGCC"
BUILD_ACTION+=NS_USE_GCC=1
.ENDIF
diff --git a/nss/nss-asm-fix.patch b/nss/nss-asm-fix.patch
deleted file mode 100644
index b45e179..0000000
--- a/nss/nss-asm-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- misc/build/nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mp_comba.c.sav 2012-03-16 12:30:23.255942001 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mp_comba.c 2012-03-16 12:29:01.730170001 +0100
-@@ -49,7 +49,7 @@ __asm__ (
- "addq %%rax,%0 \n\t" \
- "adcq %%rdx,%1 \n\t" \
- "adcq $0,%2 \n\t" \
-- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","cc");
-
-
-
-@@ -76,7 +76,7 @@ __asm__ (
- "addq %%rax,%0 \n\t" \
- "adcq %%rdx,%1 \n\t" \
- "adcq $0,%2 \n\t" \
-- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","%cc");
-+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","cc");
-
- #define SQRADD2(i, j) \
- __asm__ ( \
-@@ -88,7 +88,7 @@ __asm__ (
- "addq %%rax,%0 \n\t" \
- "adcq %%rdx,%1 \n\t" \
- "adcq $0,%2 \n\t" \
-- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","cc");
-
- #define SQRADDSC(i, j) \
- __asm__ ( \
-@@ -97,7 +97,7 @@ __asm__ (
- "movq %%rax,%0 \n\t" \
- "movq %%rdx,%1 \n\t" \
- "xorq %2,%2 \n\t" \
-- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%rax","%rdx","cc");
-
- #define SQRADDAC(i, j) \
- __asm__ ( \
-@@ -106,7 +106,7 @@ __asm__ (
- "addq %%rax,%0 \n\t" \
- "adcq %%rdx,%1 \n\t" \
- "adcq $0,%2 \n\t" \
-- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","cc");
-
- #define SQRADDDB \
- __asm__ ( \
-@@ -116,7 +116,7 @@ __asm__ (
- "addq %6,%0 \n\t" \
- "adcq %7,%1 \n\t" \
- "adcq %8,%2 \n\t" \
-- :"=&r"(c0), "=&r"(c1), "=&r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc");
-+ :"=&r"(c0), "=&r"(c1), "=&r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc");
-
-
-
diff --git a/nss/nss-clang_os_Linux_x86_64_s_comments.patch b/nss/nss-clang_os_Linux_x86_64_s_comments.patch
deleted file mode 100644
index 604e4b7..0000000
--- a/nss/nss-clang_os_Linux_x86_64_s_comments.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s.sav 2010-04-11 07:47:01.000000000 +0200
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2012-03-16 12:17:12.083170001 +0100
-@@ -1,46 +1,46 @@
--/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
--/
--/ ***** BEGIN LICENSE BLOCK *****
--/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
--/
--/ The contents of this file are subject to the Mozilla Public License Version
--/ 1.1 (the "License"); you may not use this file except in compliance with
--/ the License. You may obtain a copy of the License at
--/ http://www.mozilla.org/MPL/
--/
--/ Software distributed under the License is distributed on an "AS IS" basis,
--/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--/ for the specific language governing rights and limitations under the
--/ License.
--/
--/ The Original Code is the Netscape Portable Runtime (NSPR).
--/
--/ The Initial Developer of the Original Code is
--/ Netscape Communications Corporation.
--/ Portions created by the Initial Developer are Copyright (C) 2004
--/ the Initial Developer. All Rights Reserved.
--/
--/ Contributor(s):
--/
--/ Alternatively, the contents of this file may be used under the terms of
--/ either the GNU General Public License Version 2 or later (the "GPL"), or
--/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--/ in which case the provisions of the GPL or the LGPL are applicable instead
--/ of those above. If you wish to allow use of your version of this file only
--/ under the terms of either the GPL or the LGPL, and not to allow others to
--/ use your version of this file under the terms of the MPL, indicate your
--/ decision by deleting the provisions above and replace them with the notice
--/ and other provisions required by the GPL or the LGPL. If you do not delete
--/ the provisions above, a recipient may use your version of this file under
--/ the terms of any one of the MPL, the GPL or the LGPL.
--/
--/ ***** END LICENSE BLOCK *****
-+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape Portable Runtime (NSPR).
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 2004
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-
--/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
--/
--/ Atomically increment the integer pointed to by 'val' and return
--/ the result of the increment.
--/
-+# PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
-+#
-+# Atomically increment the integer pointed to by 'val' and return
-+# the result of the increment.
-+#
- .text
- .globl _PR_x86_64_AtomicIncrement
- .type _PR_x86_64_AtomicIncrement, @function
-@@ -53,11 +53,11 @@ _PR_x86_64_AtomicIncrement:
- ret
- .size _PR_x86_64_AtomicIncrement, .-_PR_x86_64_AtomicIncrement
-
--/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
--/
--/ Atomically decrement the integer pointed to by 'val' and return
--/ the result of the decrement.
--/
-+# PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
-+#
-+# Atomically decrement the integer pointed to by 'val' and return
-+# the result of the decrement.
-+#
- .text
- .globl _PR_x86_64_AtomicDecrement
- .type _PR_x86_64_AtomicDecrement, @function
-@@ -70,11 +70,11 @@ _PR_x86_64_AtomicDecrement:
- ret
- .size _PR_x86_64_AtomicDecrement, .-_PR_x86_64_AtomicDecrement
-
--/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
--/
--/ Atomically set the integer pointed to by 'val' to the new
--/ value 'newval' and return the old value.
--/
-+# PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
-+#
-+# Atomically set the integer pointed to by 'val' to the new
-+# value 'newval' and return the old value.
-+#
- .text
- .globl _PR_x86_64_AtomicSet
- .type _PR_x86_64_AtomicSet, @function
-@@ -85,11 +85,11 @@ _PR_x86_64_AtomicSet:
- ret
- .size _PR_x86_64_AtomicSet, .-_PR_x86_64_AtomicSet
-
--/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
--/
--/ Atomically add 'val' to the integer pointed to by 'ptr'
--/ and return the result of the addition.
--/
-+# PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-+#
-+# Atomically add 'val' to the integer pointed to by 'ptr'
-+# and return the result of the addition.
-+#
- .text
- .globl _PR_x86_64_AtomicAdd
- .type _PR_x86_64_AtomicAdd, @function
-@@ -102,5 +102,5 @@ _PR_x86_64_AtomicAdd:
- ret
- .size _PR_x86_64_AtomicAdd, .-_PR_x86_64_AtomicAdd
-
--/ Magic indicating no need for an executable stack
-+# Magic indicating no need for an executable stack
- .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/nss/nss-clang_os_Linux_x86_s_comments.patch b/nss/nss-clang_os_Linux_x86_s_comments.patch
deleted file mode 100644
index 04f2a7e..0000000
--- a/nss/nss-clang_os_Linux_x86_s_comments.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- misc/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2006-12-11 09:45:30.000000000 +0000
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2012-02-18 20:48:10.702109102 +0000
-@@ -1,46 +1,46 @@
--/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
--/
--/ ***** BEGIN LICENSE BLOCK *****
--/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
--/
--/ The contents of this file are subject to the Mozilla Public License Version
--/ 1.1 (the "License"); you may not use this file except in compliance with
--/ the License. You may obtain a copy of the License at
--/ http://www.mozilla.org/MPL/
--/
--/ Software distributed under the License is distributed on an "AS IS" basis,
--/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--/ for the specific language governing rights and limitations under the
--/ License.
--/
--/ The Original Code is the Netscape Portable Runtime (NSPR).
--/
--/ The Initial Developer of the Original Code is
--/ Netscape Communications Corporation.
--/ Portions created by the Initial Developer are Copyright (C) 2000
--/ the Initial Developer. All Rights Reserved.
--/
--/ Contributor(s):
--/
--/ Alternatively, the contents of this file may be used under the terms of
--/ either the GNU General Public License Version 2 or later (the "GPL"), or
--/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--/ in which case the provisions of the GPL or the LGPL are applicable instead
--/ of those above. If you wish to allow use of your version of this file only
--/ under the terms of either the GPL or the LGPL, and not to allow others to
--/ use your version of this file under the terms of the MPL, indicate your
--/ decision by deleting the provisions above and replace them with the notice
--/ and other provisions required by the GPL or the LGPL. If you do not delete
--/ the provisions above, a recipient may use your version of this file under
--/ the terms of any one of the MPL, the GPL or the LGPL.
--/
--/ ***** END LICENSE BLOCK *****
--
--/ PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val)
--/
--/ Atomically increment the integer pointed to by 'val' and return
--/ the result of the increment.
--/
-+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape Portable Runtime (NSPR).
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+# PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val)
-+#
-+# Atomically increment the integer pointed to by 'val' and return
-+# the result of the increment.
-+
- .text
- .globl _PR_x86_AtomicIncrement
- .align 4
-@@ -52,11 +52,11 @@
- incl %eax
- ret
-
--/ PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val)
--/
--/ Atomically decrement the integer pointed to by 'val' and return
--/ the result of the decrement.
--/
-+# PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val)
-+#
-+# Atomically decrement the integer pointed to by 'val' and return
-+# the result of the decrement.
-+
- .text
- .globl _PR_x86_AtomicDecrement
- .align 4
-@@ -68,25 +68,25 @@
- decl %eax
- ret
-
--/ PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval)
--/
--/ Atomically set the integer pointed to by 'val' to the new
--/ value 'newval' and return the old value.
--/
--/ An alternative implementation:
--/ .text
--/ .globl _PR_x86_AtomicSet
--/ .align 4
--/_PR_x86_AtomicSet:
--/ movl 4(%esp), %ecx
--/ movl 8(%esp), %edx
--/ movl (%ecx), %eax
--/retry:
--/ lock
--/ cmpxchgl %edx, (%ecx)
--/ jne retry
--/ ret
--/
-+# PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval)
-+#
-+# Atomically set the integer pointed to by 'val' to the new
-+# value 'newval' and return the old value.
-+#
-+# An alternative implementation:
-+# .text
-+# .globl _PR_x86_AtomicSet
-+# .align 4
-+#_PR_x86_AtomicSet:
-+# movl 4(%esp), %ecx
-+# movl 8(%esp), %edx
-+# movl (%ecx), %eax
-+#retry:
-+# lock
-+# cmpxchgl %edx, (%ecx)
-+# jne retry
-+# ret
-+
- .text
- .globl _PR_x86_AtomicSet
- .align 4
-@@ -96,11 +96,11 @@
- xchgl %eax, (%ecx)
- ret
-
--/ PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val)
--/
--/ Atomically add 'val' to the integer pointed to by 'ptr'
--/ and return the result of the addition.
--/
-+# PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-+#
-+# Atomically add 'val' to the integer pointed to by 'ptr'
-+# and return the result of the addition.
-+
- .text
- .globl _PR_x86_AtomicAdd
- .align 4
-@@ -113,5 +113,5 @@
- addl %edx, %eax
- ret
-
--/ Magic indicating no need for an executable stack
-+# Magic indicating no need for an executable stack
- .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/nss/nss-config.patch b/nss/nss-config.patch
index d65499f..071cb99 100644
--- a/nss/nss-config.patch
+++ b/nss/nss-config.patch
@@ -1,5 +1,5 @@
--- /dev/null
-+++ misc/build/nss-3.12.8/mozilla/security/nss/nss-config.in 2010-06-11 16:35:54.946870871 +0200
++++ misc/build/nss-3.13.5/mozilla/security/nss/nss-config.in 2010-06-11 16:35:54.946870871 +0200
@@ -0,0 +1,147 @@
+#!/bin/sh
+
diff --git a/nss/nss-linux3.patch b/nss/nss-linux3.patch
deleted file mode 100644
index 62c667f..0000000
--- a/nss/nss-linux3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:31.808695724 +0200
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:00.074648943 +0200
-@@ -152,6 +152,10 @@
-
- ifeq ($(OS_ARCH),Linux)
- OS_RELEASE := $(subst ., ,$(OS_RELEASE))
-+ # force Linux 3.x to 2.6
-+ ifeq ($(word 1,$(OS_RELEASE)),3)
-+ OS_RELEASE := 2 6
-+ endif
- ifneq ($(words $(OS_RELEASE)),1)
- OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
- endif
diff --git a/nss/nss-string-concat.patch b/nss/nss-string-concat.patch
deleted file mode 100644
index 68f9c4b..0000000
--- a/nss/nss-string-concat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h.sav 2008-12-17 22:39:05.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h 2012-03-16 01:56:47.881621915 +0100
-@@ -338,7 +338,7 @@ typedef PRUint32 PK11AttrFlags;
- #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
-
- #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
--"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})"
-+"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})"
-
- #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
- #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1)
diff --git a/nss/nss.aix.patch b/nss/nss.aix.patch
index 430b699..c71fef5 100644
--- a/nss/nss.aix.patch
+++ b/nss/nss.aix.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500
+--- misc/nss-3.13.5/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500
@@ -2973,7 +2973,8 @@
#define SYSV 1
EOF
@@ -18,8 +18,8 @@
AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o'
if test -n "$USE_64"; then
---- misc/nss-3.12.8/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500
+--- misc/nss-3.13.5/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500
@@ -831,7 +831,8 @@
AC_DEFINE(XP_UNIX)
AC_DEFINE(AIX)
@@ -42,8 +42,8 @@
AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o'
if test -n "$USE_64"; then
---- misc/nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500
+--- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500
@@ -110,7 +110,6 @@
endif
@@ -52,8 +52,8 @@
OS_LIBS = -lodm -lcfg
ifeq ($(CLASSIC_NSPR),1)
ifeq ($(OS_RELEASE),4.1)
---- misc/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500
+--- misc/nss-3.13.5/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500
@@ -62,35 +62,30 @@
DEFAULT_COMPILER = xlc_r
@@ -96,8 +96,8 @@
ifeq ($(USE_64), 1)
OS_CFLAGS += -DAIX_64BIT
OBJECT_MODE=64
---- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500
+--- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500
@@ -173,7 +173,7 @@
$(NULL)
@@ -116,8 +116,8 @@
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
---- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500
+--- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500
@@ -75,7 +75,9 @@
endif
@@ -129,8 +129,8 @@
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
---- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500
-+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500
+--- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500
++++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500
@@ -75,6 +75,9 @@
endif
diff --git a/nss/nss.patch b/nss/nss.patch
index c8d69bf..636c323 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200
+--- misc/nss-3.13.5/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200
@@ -3900,7 +3900,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
@@ -9,14 +9,14 @@
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined
---- misc/nss-3.12.8/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
+--- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
@@ -39,8 +39,12 @@
DEFAULT_COMPILER = cc
--CC = cc
--CCC = c++
+-CC = gcc
+-CCC = g++
+# CC is taken from environment automatically.
+#CC = cc
+# Use CCC from environment.
@@ -26,8 +26,8 @@
RANLIB = ranlib
ifndef CPU_ARCH
---- misc/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200
+--- misc/nss-3.13.5/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200
@@ -46,8 +46,11 @@
IMPL_STRATEGY = _PTH
endif
@@ -65,8 +65,8 @@
# The -rpath '$$ORIGIN' linker option instructs this library to search for its
# dependencies in the same directory where it resides.
---- misc/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200
+--- misc/nss-3.13.5/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200
@@ -89,8 +89,12 @@
# OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif
@@ -82,8 +82,8 @@
ASFLAGS += -Wa,-P
OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
ifndef BUILD_OPT
---- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200
+--- misc/nss-3.13.5/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200
@@ -324,7 +324,12 @@
# IMPL_STRATEGY may be defined too.
#
@@ -98,8 +98,8 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
ifndef BUILD_OPT
---- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200
+--- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200
@@ -41,27 +41,28 @@
ifeq ($(OS_ARCH), SunOS)
ifeq ($(BUILD_SUN_PKG), 1)
@@ -136,8 +136,8 @@
endif
endif
endif
---- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
-+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200
+--- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
++++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200
@@ -78,10 +78,15 @@
# sign any and all shared libraries that contain the word freebl
@@ -157,14 +157,14 @@
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
---- misc/nss-3.12.8/mozilla/security/coreconf/Darwin.mk
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Darwin.mk
+--- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
++++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
@@ -64,12 +64,16 @@
endif
ifneq (,$(MACOS_SDK_DIR))
+ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }')
- GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[ ]*//" | awk '{ print $$1 }')
+ GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch
index a6ddcd1..ac6fe71 100644
--- a/nss/nss_macosx.patch
+++ b/nss/nss_macosx.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.12.8/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
+--- misc/nss-3.13.5/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
@@ -104,6 +104,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
diff --git a/ooo.lst.in b/ooo.lst.in
index c4976e2..6322f63 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -78,7 +78,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
-71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
+a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
commit 7cdda27c17ddb309d7473b311485b970d57562b5
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 20:15:15 2012 +0200
nss: no need to care about STLPort include paths
Change-Id: Ibbee91f8ce21f76bc4a5e66ff9c5852dc693793b
diff --git a/nss/nss.patch b/nss/nss.patch
index fa08086..c8d69bf 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,19 +1,3 @@
---- misc/nss-3.12.8/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200
-@@ -345,7 +345,12 @@
- ifdef NS_USE_GCC
- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
- else
-- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+ #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+ #OOo. stlport includes the system stl which will fail. By removing it,
-+ #rc will use the stl from the system if the path is in the INCLUDE
-+ #variable.
-+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+
- endif # GCC
- @echo $(RES) finished
- endif
--- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100
+++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200
@@ -3900,7 +3900,7 @@
@@ -114,22 +98,6 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
ifndef BUILD_OPT
---- misc/nss-3.12.8/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200
-@@ -355,7 +355,12 @@
- ifdef NS_USE_GCC
- $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
- else
-- $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+ #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+ #OOo. stlport includes the system stl which will fail. By removing it,
-+ #rc will use the stl from the system if the path is in the INCLUDE
-+ #variable.
-+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+
- endif
- @echo $(RES) finished
- endif
--- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100
+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200
@@ -41,27 +41,28 @@
More information about the Libreoffice-commits
mailing list