wok-6.x annotate nss/stuff/nss-nolocalsql.patch @ rev 6664
Revert last patch on gdk-pixbuf.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Mon Oct 11 22:51:08 2010 +0000 (2010-10-11) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@6444 | 1 diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile |
| slaxemulator@6444 | 2 --- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 |
| slaxemulator@6444 | 3 +++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 |
| slaxemulator@6444 | 4 @@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB |
| slaxemulator@6444 | 5 ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. |
| slaxemulator@6444 | 6 endif |
| slaxemulator@6444 | 7 |
| slaxemulator@6444 | 8 -ifndef MOZILLA_CLIENT |
| slaxemulator@6444 | 9 -ifndef NSS_USE_SYSTEM_SQLITE |
| slaxemulator@6444 | 10 -SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. |
| slaxemulator@6444 | 11 -endif |
| slaxemulator@6444 | 12 -endif |
| slaxemulator@6444 | 13 +#ifndef MOZILLA_CLIENT |
| slaxemulator@6444 | 14 +#ifndef NSS_USE_SYSTEM_SQLITE |
| slaxemulator@6444 | 15 +#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. |
| slaxemulator@6444 | 16 +#endif |
| slaxemulator@6444 | 17 +#endif |
| slaxemulator@6444 | 18 |
| slaxemulator@6444 | 19 ifndef MOZILLA_CLIENT |
| slaxemulator@6444 | 20 ifeq ($(OS_ARCH),Linux) |
| slaxemulator@6444 | 21 diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn |
| slaxemulator@6444 | 22 --- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 |
| slaxemulator@6444 | 23 +++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 |
| slaxemulator@6444 | 24 @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def |
| slaxemulator@6444 | 25 |
| slaxemulator@6444 | 26 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" |
| slaxemulator@6444 | 27 |
| slaxemulator@6444 | 28 -ifdef MOZILLA_CLIENT |
| slaxemulator@6444 | 29 -INCLUDES += -I$(DIST)/include/sqlite3 |
| slaxemulator@6444 | 30 -endif |
| slaxemulator@6444 | 31 +#ifdef MOZILLA_CLIENT |
| slaxemulator@6444 | 32 +#INCLUDES += -I$(DIST)/include/sqlite3 |
| slaxemulator@6444 | 33 +#endif |
| slaxemulator@6444 | 34 |
| slaxemulator@6444 | 35 CSRCS = \ |
| slaxemulator@6444 | 36 dbmshim.c \ |
| slaxemulator@6444 | 37 diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn |
| slaxemulator@6444 | 38 --- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 |
| slaxemulator@6444 | 39 +++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 |
| slaxemulator@6444 | 40 @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def |
| slaxemulator@6444 | 41 |
| slaxemulator@6444 | 42 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" |
| slaxemulator@6444 | 43 |
| slaxemulator@6444 | 44 -ifdef MOZILLA_CLIENT |
| slaxemulator@6444 | 45 -INCLUDES += -I$(DIST)/include/sqlite3 |
| slaxemulator@6444 | 46 -endif |
| slaxemulator@6444 | 47 +#ifdef MOZILLA_CLIENT |
| slaxemulator@6444 | 48 +#INCLUDES += -I$(DIST)/include/sqlite3 |
| slaxemulator@6444 | 49 +#endif |
| slaxemulator@6444 | 50 |
| slaxemulator@6444 | 51 EXPORTS = \ |
| slaxemulator@6444 | 52 secmodt.h \ |