packages: icedove/system-mozldap.patch, icedove/icedove-install.patch - upd...

[hawk]

Author: hawk                         Date: Thu Jul  8 09:29:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 3.1

---- Files affected:
packages/icedove:
   system-mozldap.patch (1.1 -> 1.2) , icedove-install.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/icedove/system-mozldap.patch
diff -u packages/icedove/system-mozldap.patch:1.1 packages/icedove/system-mozldap.patch:1.2
--- packages/icedove/system-mozldap.patch:1.1	Fri Apr  9 13:29:37 2010
+++ packages/icedove/system-mozldap.patch	Thu Jul  8 11:29:39 2010
@@ -1,6 +1,6 @@
---- mozilla/configure.in~	2010-03-17 19:02:26.000000000 +0200
-+++ mozilla/configure.in	2010-04-09 14:19:51.573033459 +0300
-@@ -4953,6 +4953,13 @@
+--- mozilla/configure.in.orig	2010-06-23 19:43:07.000000000 +0200
++++ mozilla/configure.in	2010-07-06 11:14:54.350499449 +0200
+@@ -5032,6 +5032,13 @@
      MOZ_LDAP_XPCOM=,
      MOZ_LDAP_XPCOM=1)
  
@@ -14,12 +14,12 @@
  dnl ========================================================
  dnl = Trademarked Branding 
  dnl ========================================================
-@@ -7625,7 +7632,7 @@
+@@ -7612,7 +7619,7 @@
+ 
  # if we're building the LDAP XPCOM component, we need to build 
  # the c-sdk first.  
- #
--if test "$MOZ_LDAP_XPCOM"; then
-+if test "$MOZ_LDAP_XPCOM" && test -z "$MOZ_LDAP_DIR"; then
- 
+-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
++if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
      # these subdirs may not yet have been created in the build tree.
      # don't use the "-p" switch to mkdir, since not all platforms have it
+     if test ! -d "directory/c-sdk/ldap"; then

================================================================
Index: packages/icedove/icedove-install.patch
diff -u packages/icedove/icedove-install.patch:1.3 packages/icedove/icedove-install.patch:1.4
--- packages/icedove/icedove-install.patch:1.3	Fri Dec 18 14:51:24 2009
+++ packages/icedove/icedove-install.patch	Thu Jul  8 11:29:39 2010
@@ -1,6 +1,6 @@
 --- comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk.orig	2009-12-18 14:28:59.997141166 +0100
 +++ comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk	2009-12-18 14:32:54.201542762 +0100
-@@ -365,7 +365,7 @@
+@@ -369,7 +369,7 @@
  # NOTE: this must be a tar now that dist links into the tree so that we
  # do not strip the binaries actually in the tree.
  	@echo "Creating package directory..."
@@ -8,18 +8,23 @@
 +	@mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
  ifdef MOZ_PKG_MANIFEST
  	$(RM) -rf $(DIST)/xpt
- 	$(call PACKAGER_COPY, "$(DIST)",\
-@@ -384,7 +384,7 @@
+ 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+@@ -384,11 +384,11 @@
+ ifndef STAGE_SDK
+ 	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+ else
+-	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++	cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  endif
  endif
  else
 -	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +	cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -416,7 +416,7 @@
- endif
+ 	@echo "Linking XPT files..."
+ 	@rm -rf $(DIST)/xpt
+ 	@$(NSINSTALL) -D $(DIST)/xpt
+@@ -431,7 +431,7 @@
+ endif # PKG_SKIP_STRIP
  	@echo "Removing unpackaged files..."
  ifdef NO_PKG_FILES
 -	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
@@ -38,41 +43,6 @@
    -DAB_CD=$(AB_CD) \
    -DGRE_MILESTONE=$(GRE_MILESTONE) \
    -DGRE_BUILDID=$(GRE_BUILDID) \
-@@ -80,9 +80,9 @@
-     $(NULL)
- 
- ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
--PROGRAM = thunderbird$(BIN_SUFFIX)
-+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
- else
--PROGRAM = thunderbird-bin$(BIN_SUFFIX)
-+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
- endif
- 
- REQUIRES = \
-@@ -311,18 +311,18 @@
- endif
- 
- ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
--thunderbird:: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
-+$(MOZ_APP_NAME):: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
- 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
- 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
- 	chmod +x $@
- 
--libs:: thunderbird
-+libs:: $(MOZ_APP_NAME)
- 	$(INSTALL) $< $(DIST)/bin
- 
--install:: thunderbird
-+install:: $(MOZ_APP_NAME)
- 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
- 
--GARBAGE += thunderbird
-+GARBAGE += $(MOZ_APP_NAME)
- GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
- endif
- 
 @@ -359,7 +359,7 @@
  endif
  	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/system-mozldap.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-install.patch?r1=1.3&r2=1.4&f=u