Author: hawk Date: Mon May 15 20:00:38 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - taken from mozilla.spec for xulrunner.spec
---- Files affected: SOURCES: xulrunner-ldap-with-nss.patch (NONE -> 1.1) (NEW), xulrunner-nss.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xulrunner-ldap-with-nss.patch diff -u /dev/null SOURCES/xulrunner-ldap-with-nss.patch:1.1 --- /dev/null Mon May 15 22:00:38 2006 +++ SOURCES/xulrunner-ldap-with-nss.patch Mon May 15 22:00:32 2006 @@ -0,0 +1,36 @@ +--- seamonkey-1.0/configure.in.orig 2006-01-10 04:11:42.000000000 +0100 ++++ seamonkey-1.0/configure.in 2006-02-01 21:10:12.670658750 +0100 +@@ -7098,7 +7098,7 @@ + mkdir "directory/c-sdk/ldap" + fi + +- ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla" ++ ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla" + if test -z "$MOZ_DEBUG"; then + ac_configure_args="$ac_configure_args --disable-debug" + fi +--- seamonkey-1.0/configure.orig 2006-01-11 06:43:03.000000000 +0100 ++++ seamonkey-1.0/configure 2006-02-01 21:10:17.982990750 +0100 +@@ -20209,7 +20209,7 @@ + mkdir "directory/c-sdk/ldap" + fi + +- ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla" ++ ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla" + if test -z "$MOZ_DEBUG"; then + ac_configure_args="$ac_configure_args --disable-debug" + fi +--- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig Fri May 17 08:54:00 2002 ++++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in Wed Aug 28 11:37:29 2002 +@@ -53,9 +53,8 @@ + LOCAL_INCLUDES = -I$(PUBLIC)/nspr + INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \ + -I$(DIST)/include \ +- -I$(DIST)/public/security \ +- -I$(DIST)/public/nss \ +- -I$(DIST)/include/nspr ++ -I/usr/include/nss \ ++ -I/usr/include/nspr + DEFINES += $(DEFS) + + PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS ================================================================ Index: SOURCES/xulrunner-nss.patch diff -u /dev/null SOURCES/xulrunner-nss.patch:1.1 --- /dev/null Mon May 15 22:00:38 2006 +++ SOURCES/xulrunner-nss.patch Mon May 15 22:00:32 2006 @@ -0,0 +1,80 @@ +--- mozilla/config/config.mk~ Wed Apr 23 02:54:06 2003 ++++ mozilla/config/config.mk Thu May 15 10:23:19 2003 +@@ -169,7 +169,7 @@ + + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ ++ -lcrmf \ + -lsmime3 \ + -lssl3 \ + -lnss3 \ +@@ -189,11 +189,6 @@ + endif + + NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ + $(NULL) + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +--- mozilla/security/manager/Makefile.in~ 2004-03-23 05:15:56.000000000 +0100 ++++ mozilla/security/manager/Makefile.in 2004-05-15 12:27:22.988489544 +0200 +@@ -148,43 +148,6 @@ + else + cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) + endif +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) +-endif +-ifndef DISABLE_DIST_GRE +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) +-ifdef HAVE_FREEBL_MODULES +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) +-endif +-endif +-ifndef _SKIP_OLD_GRE_INSTALL +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +-ifdef HAVE_FREEBL_MODULES +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin +-endif +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + ifdef MOZ_XUL +--- mozilla/security/manager/ssl/src/Makefile.in~ Fri Apr 11 02:56:20 2003 ++++ mozilla/security/manager/ssl/src/Makefile.in Thu May 15 10:27:52 2003 +@@ -114,7 +114,7 @@ + + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += -I$(DIST)/public/nss \ ++LOCAL_INCLUDES += -I/usr/include/nss \ + $(NULL) + + EXTRA_DSO_LDOPTS += \ ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
