[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac external/nss

[Michael Stahl]

 config_host.mk.in      |    3 ---
 configure.ac           |    7 -------
 external/nss/nss.patch |   21 ---------------------
 3 files changed, 31 deletions(-)

New commits:
commit a2a7a6411f7754b537d0ba2ad28a9823dd52ef74
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 13 16:14:22 2013 +0100

    configure: NSS_MAJOR etc. unused since cffad630
    
    Change-Id: I5182e538219e85e8c2b0ae615d02d9aaaff75ca5

diff --git a/config_host.mk.in b/config_host.mk.in
index 0da03be..42bc002 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -402,9 +402,6 @@ export NM=@NM@
 export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
 export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
 export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
-export NSS_MAJOR=@NSS_MAJOR@
-export NSS_MINOR=@NSS_MINOR@
-export NSS_PATCH=@NSS_PATCH@
 export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
 export nodep=@nodep@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
diff --git a/configure.ac b/configure.ac
index 657e4b3..7218fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8831,14 +8831,7 @@ if test "$with_system_nss" = "yes"; then
     libo_MINGW_CHECK_DLL([nssutil3])
     libo_MINGW_CHECK_DLL([smime3])
     libo_MINGW_CHECK_DLL([ssl3])
-else
-    NSS_MAJOR="3"
-    NSS_MINOR="13"
-    NSS_PATCH="5"
 fi
-AC_SUBST(NSS_MAJOR)
-AC_SUBST(NSS_MINOR)
-AC_SUBST(NSS_PATCH)
 
 dnl ===================================================================
 dnl Check for system mozilla headers
commit d1299fd4c539a582e34c19e05ec635ee6ff6e0fa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 12 19:26:21 2013 +0100

    nss: remove obsolete signing-disabling patch
    
    Obsolete since the Mac build uses NSS_USE_SYSTEM_SQLITE=1 now.
    
    Change-Id: Ic02756c06a992d0f19849a4edf1e6305eafb8660

diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index e2d7d76..841685b 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -199,27 +199,6 @@
  endif
  endif
  endif
---- 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
- 
--CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
--CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
-+# Signing causes loading of some system library which in turn loads
-+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper
-+# version. Therefore signing fails.
-+# We cannot build with the system sqlite3, because it is too old (SDK
-+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. 
-+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
-+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
- ifndef NSS_DISABLE_DBM
--CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
-+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
- endif
- CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
- 
 --- 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 @@