wok-next diff nss/stuff/nss-nolocalsql.patch @ rev 13189
logrotate: update bdeps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Aug 03 21:44:00 2012 +0200 (2012-08-03) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/nss/stuff/nss-nolocalsql.patch Fri Aug 03 21:44:00 2012 +0200 1.3 @@ -0,0 +1,52 @@ 1.4 +diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile 1.5 +--- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 1.6 ++++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 1.7 +@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB 1.8 + ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. 1.9 + endif 1.10 + 1.11 +-ifndef MOZILLA_CLIENT 1.12 +-ifndef NSS_USE_SYSTEM_SQLITE 1.13 +-SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. 1.14 +-endif 1.15 +-endif 1.16 ++#ifndef MOZILLA_CLIENT 1.17 ++#ifndef NSS_USE_SYSTEM_SQLITE 1.18 ++#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. 1.19 ++#endif 1.20 ++#endif 1.21 + 1.22 + ifndef MOZILLA_CLIENT 1.23 + ifeq ($(OS_ARCH),Linux) 1.24 +diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 1.25 +--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 1.26 ++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 1.27 +@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def 1.28 + 1.29 + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" 1.30 + 1.31 +-ifdef MOZILLA_CLIENT 1.32 +-INCLUDES += -I$(DIST)/include/sqlite3 1.33 +-endif 1.34 ++#ifdef MOZILLA_CLIENT 1.35 ++#INCLUDES += -I$(DIST)/include/sqlite3 1.36 ++#endif 1.37 + 1.38 + CSRCS = \ 1.39 + dbmshim.c \ 1.40 +diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn 1.41 +--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 1.42 ++++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 1.43 +@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def 1.44 + 1.45 + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" 1.46 + 1.47 +-ifdef MOZILLA_CLIENT 1.48 +-INCLUDES += -I$(DIST)/include/sqlite3 1.49 +-endif 1.50 ++#ifdef MOZILLA_CLIENT 1.51 ++#INCLUDES += -I$(DIST)/include/sqlite3 1.52 ++#endif 1.53 + 1.54 + EXPORTS = \ 1.55 + secmodt.h \