packages: iceweasel/iceweasel-agent.patch, iceweasel/iceweasel-no-subshell....

baggins baggins at pld-linux.org
Tue Mar 22 18:24:32 CET 2011 

Author: baggins                      Date: Tue Mar 22 17:24:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- started update to 4.0
- branding and install patches need updating

---- Files affected:
packages/iceweasel:
   iceweasel-agent.patch (1.1 -> 1.2) , iceweasel-no-subshell.patch (1.2 -> 1.3) , iceweasel-nss_cflags.patch (1.3 -> 1.4) , iceweasel-pld-branding.patch (1.2 -> 1.3) , iceweasel-ppc.patch (1.1 -> 1.2) , iceweasel-prefs.patch (1.4 -> 1.5) , iceweasel.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-agent.patch
diff -u packages/iceweasel/iceweasel-agent.patch:1.1 packages/iceweasel/iceweasel-agent.patch:1.2
--- packages/iceweasel/iceweasel-agent.patch:1.1	Mon Jun 23 12:18:19 2008
+++ packages/iceweasel/iceweasel-agent.patch	Tue Mar 22 18:24:26 2011
@@ -1,9 +1,9 @@
 --- mozilla-firefox/browser/app/profile/firefox.js.orig	2007-03-21 17:21:55.000000000 +0100
 +++ mozilla-firefox/browser/app/profile/firefox.js	2007-03-21 17:23:53.000000000 +0100
 @@ -163,6 +163,9 @@
+ 
  pref("general.useragent.locale", "@AB_CD@");
  pref("general.skins.selectedSkin", "classic/1.0");
- pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
 +pref("general.useragent.vendor", "PLD");
 +pref("general.useragent.vendorSub", "3.0");
 +pref("general.useragent.vendorComment", "Th");

================================================================
Index: packages/iceweasel/iceweasel-no-subshell.patch
diff -u packages/iceweasel/iceweasel-no-subshell.patch:1.2 packages/iceweasel/iceweasel-no-subshell.patch:1.3
--- packages/iceweasel/iceweasel-no-subshell.patch:1.2	Tue Jun 30 15:55:41 2009
+++ packages/iceweasel/iceweasel-no-subshell.patch	Tue Mar 22 18:24:26 2011
@@ -9,15 +9,3 @@
  fi
  
  exit $exitcode
---- iceweasel-3.0.10/mozilla/build/unix/mozilla.in~	2007-10-05 10:29:26.000000000 +0300
-+++ iceweasel-3.0.10/mozilla/build/unix/mozilla.in	2009-05-05 19:26:08.278322082 +0300
-@@ -135,8 +135,5 @@
- then
-   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
--exitcode=$?
--
--exit $exitcode
-+exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
- # EOF.

================================================================
Index: packages/iceweasel/iceweasel-nss_cflags.patch
diff -u packages/iceweasel/iceweasel-nss_cflags.patch:1.3 packages/iceweasel/iceweasel-nss_cflags.patch:1.4
--- packages/iceweasel/iceweasel-nss_cflags.patch:1.3	Thu Jan 21 14:53:45 2010
+++ packages/iceweasel/iceweasel-nss_cflags.patch	Tue Mar 22 18:24:26 2011
@@ -27,5 +27,5 @@
 -	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- %: %.c $(GLOBAL_DEPS)
+ %:: %.c $(GLOBAL_DEPS)
  	$(REPORT_BUILD)

================================================================
Index: packages/iceweasel/iceweasel-pld-branding.patch
diff -u packages/iceweasel/iceweasel-pld-branding.patch:1.2 packages/iceweasel/iceweasel-pld-branding.patch:1.3
--- packages/iceweasel/iceweasel-pld-branding.patch:1.2	Tue Jun 30 15:51:52 2009
+++ packages/iceweasel/iceweasel-pld-branding.patch	Tue Mar 22 18:24:26 2011
@@ -3,7 +3,7 @@
 +++ mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-28 15:29:30.000000000 +0200
 @@ -24,4 +24,12 @@
          <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
-         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
      </DL><p>
 +    <DT><H3>PLD Linux Distribution</H3>
 +    <DL><p>

================================================================
Index: packages/iceweasel/iceweasel-ppc.patch
diff -u packages/iceweasel/iceweasel-ppc.patch:1.1 packages/iceweasel/iceweasel-ppc.patch:1.2
--- packages/iceweasel/iceweasel-ppc.patch:1.1	Thu Jul  2 10:05:37 2009
+++ packages/iceweasel/iceweasel-ppc.patch	Tue Mar 22 18:24:26 2011
@@ -14,4 +14,4 @@
 +#endif
  
  //
- // This class serves as a base class for nsTArray.  It shouldn't be used
+ // NB: nsTArray assumes that your "T" can be memmove()d.  This is in

================================================================
Index: packages/iceweasel/iceweasel-prefs.patch
diff -u packages/iceweasel/iceweasel-prefs.patch:1.4 packages/iceweasel/iceweasel-prefs.patch:1.5
--- packages/iceweasel/iceweasel-prefs.patch:1.4	Tue Jun 30 15:46:52 2009
+++ packages/iceweasel/iceweasel-prefs.patch	Tue Mar 22 18:24:26 2011
@@ -2,7 +2,7 @@
 --- 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
+ pref("app.update.certs.2.commonName", "aus3.mozilla.org");
  
  // Whether or not app updates are enabled
 -pref("app.update.enabled", true);
@@ -25,14 +25,15 @@
  
  // 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
-@@ -391,6 +394,7 @@
- pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
+@@ -391,6 +394,8 @@
+ //  0: no backups created (and deletes all existing backups)
+ pref("browser.bookmarks.max_backups",             10);
  
- // l12n and i18n
 +pref("intl.locale.matchOS", true);
- pref("intl.accept_languages", "chrome://global/locale/intl.properties");
- pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
- pref("intl.charsetmenu.browser.more1",  "chrome://global/locale/intl.properties");
++
+ // Scripts & Windows prefs
+ pref("dom.disable_open_during_load",              true);
+ pref("javascript.options.showInConsole",          true);
 @@ -445,7 +445,7 @@
  pref("alerts.totalOpenTime", 4000);
  
@@ -40,8 +41,8 @@
 -pref("browser.xul.error_pages.expert_bad_cert", false);
 +pref("browser.xul.error_pages.expert_bad_cert", true);
  
- // We want to make sure mail URLs are handled externally...
- pref("network.protocol-handler.external.mailto", true); // for mail
+ // Work Offline is best manually managed by the user.
+ pref("network.manage-offline-status", false);
 @@ -592,10 +592,10 @@
  
  #ifdef MOZ_SAFE_BROWSING
@@ -54,15 +55,15 @@
 +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");
+ pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
 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 "
+ <!ENTITY securityOverride.warningContent "
  <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;'/>
+-<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
+ <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
++<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
  ">

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.127 packages/iceweasel/iceweasel.spec:1.128
--- packages/iceweasel/iceweasel.spec:1.127	Sat Mar 12 07:19:45 2011
+++ packages/iceweasel/iceweasel.spec	Tue Mar 22 18:24:26 2011
@@ -17,9 +17,9 @@
 %undefine	with_gnomevfs
 %endif
 
-# convert firefox release number to platform version: 3.6.x -> 1.9.2.x
-%define		xulrunner_main	1.9.2
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#3.6})
+# convert firefox release number to platform version: 4.0.x -> 2.0.x
+%define		xulrunner_main	2.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#4.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -30,12 +30,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	3.6.15
-Release:	1
+Version:	4.0
+Release:	0.1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	fcf8042948d91f1f3d9c33599b79cf35
+# Source0-md5:	3468a2c463b4fc2788ba621e4b511c30
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	b49feae9f6434eca8a749776160c15a8
 Source2:	%{name}-rm_nonfree.sh
@@ -52,7 +52,6 @@
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
 Patch10:	%{name}-ppc.patch
-Patch11:	%{name}-libpng.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -175,7 +174,6 @@
 %patch8 -p1
 %patch9 -p2
 %patch10 -p1
-%patch11 -p0
 
 %build
 cd mozilla
@@ -526,6 +524,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2011/03/22 17:24:26  baggins
+- started update to 4.0
+- branding and install patches need updating
+
 Revision 1.127  2011/03/12 06:19:45  qboosh
 - __rm, not __rm -f
 - plain rm (-f) in heredoc script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-agent.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-no-subshell.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-nss_cflags.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-pld-branding.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-ppc.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-prefs.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.127&r2=1.128&f=u

More information about the pld-cvs-commit mailing list