icedove-install.patch

   1 --- ./mozilla/toolkit/mozapps/installer/packager.mk.orig        2011-03-19 00:34:12.000000000 +0100
   2 +++ ./mozilla/toolkit/mozapps/installer/packager.mk     2011-03-22 23:53:43.877485659 +0100
   3 @@ -496,30 +496,30 @@
   4  endif
   5
   6  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
   7 -       @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
   8 +       @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
   9  # NOTE: this must be a tar now that dist links into the tree so that we
  10  # do not strip the binaries actually in the tree.
  11         @echo "Creating package directory..."
  12 -       @mkdir $(DIST)/$(MOZ_PKG_DIR)
  13 +       @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
  14  ifndef UNIVERSAL_BINARY
  15  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  16  # STAGEPATH
  17  ifdef MOZ_PKG_MANIFEST
  18         $(RM) -rf $(DIST)/xpt $(DIST)/manifests
  19         $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
  20 -         "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
  21 +         "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
  22           "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
  23 -       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  24 +       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  25         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  26 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
  27 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
  28           $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
  29         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  30 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
  31 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
  32           $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
  33         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  34 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
  35 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
  36           $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
  37 -       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
  38 +       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
  39  else # !MOZ_PKG_MANIFEST
  40  ifeq ($(MOZ_PKG_FORMAT),DMG)
  41  ifndef STAGE_SDK
  42 @@ -529,10 +529,10 @@
  43         @$(NSINSTALL) -D $(DIST)/xpt
  44         @($(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...
  45  else
  46 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  47 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
  48  endif
  49  else
  50 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  51 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
  52         @echo "Linking XPT files..."
  53         @rm -rf $(DIST)/xpt
  54         @$(NSINSTALL) -D $(DIST)/xpt
  55 @@ -620,7 +620,7 @@
  56         cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  57  endif
  58         $(NSINSTALL) -D $(DESTDIR)$(installdir)
  59 -       (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  60 +       (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  61           (cd $(DESTDIR)$(installdir) && tar -xf -)
  62         $(NSINSTALL) -D $(DESTDIR)$(bindir)
  63         $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
  64 --- comm-1.9.1/mail/app/Makefile.in.orig        2009-12-18 14:49:43.990647725 +0100
  65 +++ comm-1.9.1/mail/app/Makefile.in     2009-12-18 14:49:53.830739781 +0100
  66 @@ -48,7 +48,7 @@
  67  GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
  68
  69  DEFINES += \
  70 -  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
  71 +  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
  72    -DAB_CD=$(AB_CD) \
  73    -DGRE_MILESTONE=$(GRE_MILESTONE) \
  74    -DGRE_BUILDID=$(GRE_BUILDID) \
  75 @@ -359,7 +359,7 @@
  76  endif
  77         mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  78         rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  79 -       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
  80 +       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
  81         printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
  82  #       remove CVS dirs from packaged app
  83         find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;