- updated to 3.6.3

[packages/firefox.git] / mozilla-firefox-install.patch

diff --git a/mozilla-firefox-install.patch b/mozilla-firefox-install.patch
index 73a35306a817f2a24c6b6cc11cdc633c7d0a58bc..5ef4da6aaea74c5442b290d1524c64daf2f5a25f 100644 (file)
--- a/mozilla-firefox-install.patch
+++ b/mozilla-firefox-install.patch
@@ -1,37 +1,62 @@
---- mozilla/toolkit/mozapps/installer/packager.mk      2006-12-23 03:38:32.302235167 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk      2008-03-05 22:59:55.020447000 +0000
-@@ -328,13 +328,13 @@
+--- 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 @@
  # 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_APPNAME)
-+      @mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR)
+-      @mkdir $(DIST)/$(MOZ_PKG_DIR)
++      @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
  ifdef MOZ_PKG_MANIFEST
        $(RM) -rf $(DIST)/xpt
-       $(call PACKAGER_COPY, "$(DIST)",\
--               "$(DIST)/$(MOZ_PKG_APPNAME)", \
-+               "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
+       $(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)
--      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
-+      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
+-      $(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)"
  else # !MOZ_PKG_MANIFEST
  ifeq ($(MOZ_PKG_FORMAT),DMG)
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -343,7 +343,7 @@
-       @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME)
+@@ -377,11 +377,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_APPNAME); tar -xf -)
+-      @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
-@@ -375,7 +375,7 @@
+       @echo "Linking XPT files..."
+       @rm -rf $(DIST)/xpt
+       @$(NSINSTALL) -D $(DIST)/xpt
+--- mozilla/browser/app/Makefile.in    2008-06-22 22:54:03.000000000 +0200
++++ mozilla/browser/app/Makefile.in    2008-06-23 10:34:59.000000000 +0200
+@@ -397,7 +397,7 @@
+       rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
+       $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+ ifdef LIBXUL_SDK
+-      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
++      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)-bin
+ else
+       rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
+       rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
+@@ -359,7 +359,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-      cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++      cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
  endif
-       @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
--      cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+      cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  endif
- ifdef MOZ_PKG_REMOVALS
-       $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
+ 
+@@ -433,7 +433,7 @@
+       rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
+ else
+       $(NSINSTALL) -D $(DIST)/bin/xulrunner
+-      (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
++      cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
+ endif # cocoa
+ endif # SKIP_COPY_XULRUNNER
+ endif # LIBXUL_SDK