Author: hawk Date: Mon Jun 23 10:19:28 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- taken from firefox 3.0 for iceweasel 3.0, updated for iceweasel rebranding
---- Files affected:
SOURCES:
iceweasel-install.patch (NONE -> 1.1) (NEW), iceweasel-prefs.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/iceweasel-install.patch
diff -u /dev/null SOURCES/iceweasel-install.patch:1.1
--- /dev/null Mon Jun 23 12:19:28 2008
+++ SOURCES/iceweasel-install.patch Mon Jun 23 12:19:22 2008
@@ -0,0 +1,75 @@
+--- 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 @@
+ # 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)
+ ifdef MOZ_PKG_MANIFEST
+ $(RM) -rf $(DIST)/xpt
+ $(call PACKAGER_COPY, "$(DIST)",\
+- "$(DIST)/$(MOZ_PKG_APPNAME)", \
++ "$(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)"
+ 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)
+ endif
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd
../$(MOZ_PKG_APPNAME); tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
+ endif # DMG
+ endif # MOZ_PKG_MANIFEST
+ ifndef PKG_SKIP_STRIP
+@@ -375,7 +375,7 @@
+ 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)
+--- 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
+@@ -407,7 +407,7 @@
+ -cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign
$(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
+ cp -RL $(DIST)/branding/firefox.icns
$(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
+ cp -RL $(DIST)/branding/document.icns
$(DIST)/$(APP_NAME).app/Contents/Resources/document.icns
+- cp -RL $(LIBXUL_DIST)/package/mozillaSuite.rsrc
$(DIST)/$(APP_NAME).app/Contents/Resources/firefox-bin.rsrc
++ cp -RL $(LIBXUL_DIST)/package/mozillaSuite.rsrc
$(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME)-bin.rsrc
+ echo -n APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ # remove CVS dirs from packaged app
+ find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {}
\;
+@@ -415,7 +415,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+- cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/firefox$(BIN_SUFFIX)
++ cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
+ endif
+ endif
+
+@@ -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
================================================================
Index: SOURCES/iceweasel-prefs.patch
diff -u /dev/null SOURCES/iceweasel-prefs.patch:1.1
--- /dev/null Mon Jun 23 12:19:29 2008
+++ SOURCES/iceweasel-prefs.patch Mon Jun 23 12:19:22 2008
@@ -0,0 +1,74 @@
+diff -ur mozilla.orig/browser/app/profile/firefox.js
mozilla/browser/app/profile/firefox.js
+--- mozilla.orig/browser/app/profile/firefox.js 2008-06-21
12:55:30.000000000 +0200
++++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000
+0200
+@@ -89,12 +89,12 @@
+ // App-specific update preferences
+
+ // Whether or not app updates are enabled
+-pref("app.update.enabled", true);
++pref("app.update.enabled", false);
+
+ // This preference turns on app.update.mode and allows automatic download and
+ // install to take place. We use a separate boolean toggle for this to make
+ // the UI easier to construct.
+-pref("app.update.auto", true);
++pref("app.update.auto", false);
+
+ // Defines how the Application Update Service notifies the user about updates:
+ //
+@@ -186,7 +186,7 @@
+
+ // Whether or not the application should check at startup each time if it
+ // is the default browser.
+-pref("browser.shell.checkDefaultBrowser", true);
++pref("browser.shell.checkDefaultBrowser", false);
+
+ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 =
resume previous browser session
+ // The behavior of option 3 is detailed at:
http://wiki.mozilla.org/Session_Restore
+@@ -592,10 +592,10 @@
+
+ #ifdef MOZ_SAFE_BROWSING
+ // Safe browsing does nothing unless this pref is set
+-pref("browser.safebrowsing.enabled", true);
++pref("browser.safebrowsing.enabled", false);
+
+ // Prevent loading of pages identified as malware
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.malware.enabled", false);
+
+ // Non-enhanced mode (local url lists) URL list to check for updates
+ pref("browser.safebrowsing.provider.0.updateURL",
"http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1";);
+@@ -739,7 +739,7 @@
+ // 0 - don't pre-populate anything
+ // 1 - pre-populate site URL, but don't fetch certificate
+ // 2 - pre-populate site URL and pre-fetch certificate
+-pref("browser.ssl_override_behavior", 1);
++pref("browser.ssl_override_behavior", 2);
+
+ // Controls the display of domain in the identity box for SSL connections.
+ // 0 - do not show domain
+diff -ur mozilla.orig/docshell/resources/content/netError.xhtml
mozilla/docshell/resources/content/netError.xhtml
+--- mozilla.orig/docshell/resources/content/netError.xhtml 2008-06-21
12:55:24.000000000 +0200
++++ mozilla/docshell/resources/content/netError.xhtml 2008-06-22
13:08:20.000000000 +0200
+@@ -334,8 +334,8 @@
+ <!-- Override section - For ssl errors only. Removed on init for
other
+ error types. -->
+ <div id="securityOverrideDiv">
+- <a id="securityOverrideLink"
href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
+- <div id="securityOverrideContent" style="display:
none;">&securityOverride.warningText;</div>
++ <a id="securityOverrideLink"
href="javascript:showSecuritySection();" style="display:
none;">&securityOverride.linkText;</a>
++ <div
id="securityOverrideContent">&securityOverride.warningText;</div>
+ </div>
+ </div>
+
+diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd
mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
+--- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd
2008-06-21 12:55:30.000000000 +0200
++++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
2008-06-22 13:52:26.000000000 +0200
+@@ -175,6 +175,6 @@
+ <!ENTITY securityOverride.warningText "
+ <p>You should not add an exception if you are using an internet connection
that you do not trust completely or if you are not used to seeing a warning for
this server.</p>
+
+-<xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
+ <xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/>
++<xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
+ ">
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
