- even more files

[packages/icedove.git] / icedove-install.patch

diff --git a/icedove-install.patch b/icedove-install.patch
index a62d5a47b65bcb90c0a8c315dbeb3aa08895f5dd..7464b0470dd75879ecb46316cab04f87930588a7 100644 (file)
--- a/icedove-install.patch
+++ b/icedove-install.patch
@@ -1,36 +1,66 @@
---- ./mozilla/toolkit/mozapps/installer/packager.mk.org        2010-01-21 21:10:00.234466295 +0100
-+++ ./mozilla/toolkit/mozapps/installer/packager.mk    2010-01-21 21:10:29.847369216 +0100
-@@ -362,13 +362,13 @@
+--- ./mozilla/toolkit/mozapps/installer/packager.mk.orig       2011-03-19 00:34:12.000000000 +0100
++++ ./mozilla/toolkit/mozapps/installer/packager.mk    2011-03-22 23:53:43.877485659 +0100
+@@ -496,30 +496,30 @@
+ endif
+ 
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
+-      @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++      @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
  # 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..."
 -      @mkdir $(DIST)/$(MOZ_PKG_DIR)
-+      @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
++      @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
  ifdef MOZ_PKG_MANIFEST
-       $(RM) -rf $(DIST)/xpt
+       $(RM) -rf $(DIST)/xpt $(DIST)/manifests
        $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
--               "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+               "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
-               "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+-        "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++        "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+         "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
 -      $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
-+      $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
++      $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
+       $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+-        $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
++        $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
+         $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
+       $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+-        $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
++        $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
+         $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
+       $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+-        $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
++        $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+         $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+-      printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
++      printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
  else # !MOZ_PKG_MANIFEST
  ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -377,11 +377,11 @@
  ifndef STAGE_SDK
-       @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+@@ -529,10 +529,10 @@
+       @$(NSINSTALL) -D $(DIST)/xpt
+       @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/.  Continuing...
  else
 -      @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
-+      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif
++      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
  endif
  else
 -      @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
-+      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
++      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
        @echo "Linking XPT files..."
        @rm -rf $(DIST)/xpt
        @$(NSINSTALL) -D $(DIST)/xpt
+@@ -620,7 +620,7 @@
+       cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
+ endif
+       $(NSINSTALL) -D $(DESTDIR)$(installdir)
+-      (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
++      (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+         (cd $(DESTDIR)$(installdir) && tar -xf -)
+       $(NSINSTALL) -D $(DESTDIR)$(bindir)
+       $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
 --- comm-1.9.1/mail/app/Makefile.in.orig       2009-12-18 14:49:43.990647725 +0100
 +++ comm-1.9.1/mail/app/Makefile.in    2009-12-18 14:49:53.830739781 +0100
 @@ -48,7 +48,7 @@