packages: iceweasel/iceweasel-branding.patch, iceweasel/iceweasel-prefs.pat...

arekm arekm at pld-linux.org
Sun May 6 12:39:42 CEST 2012 

Author: arekm                        Date: Sun May  6 10:39:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 12.0

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.22 -> 1.23) , iceweasel-prefs.patch (1.6 -> 1.7) , iceweasel.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.22 packages/iceweasel/iceweasel-branding.patch:1.23
--- packages/iceweasel/iceweasel-branding.patch:1.22	Thu Mar 22 22:14:09 2012
+++ packages/iceweasel/iceweasel-branding.patch	Sun May  6 12:39:37 2012
@@ -113,15 +113,17 @@
  <Url type="text/html" method="GET" template="http://www.google.com/search">
    <Param name="q" value="{searchTerms}"/>
    <Param name="ie" value="utf-8"/>
-@@ -11,7 +11,7 @@
-   <Param name="aq" value="t"/>
-   <!-- Dynamic parameters -->
-   <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
--  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
-+  <MozParam name="client" condition="defaultEngine" trueValue="iceweasel-a" falseValue="iceweasel"/>
- </Url>
- <SearchForm>http://www.google.com/</SearchForm>
- </SearchPlugin>
+--- mozilla.org/browser/locales/en-US/searchplugins/google.xml~	2012-05-06 12:29:28.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/google.xml	2012-05-06 12:30:22.178143572 +0200
+@@ -6,7 +6,7 @@
+ #elif MOZ_UPDATE_CHANNEL == nightly
+ #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/>
+ #else
+-#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
++#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="iceweasel-a" falseValue="iceweasel"/>
+ #endif
+ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+ <ShortName>Google</ShortName>
 diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
 --- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2010-02-04 15:47:20.000000000 +0100
 +++ mozilla/toolkit/xre/nsAppRunner.cpp	2010-02-04 15:48:50.000000000 +0100
@@ -138,13 +140,13 @@
 --- mozilla/browser/branding/nightly/pref/firefox-branding.js~	2011-03-19 00:33:32.000000000 +0100
 +++ mozilla/browser/branding/nightly/pref/firefox-branding.js	2011-03-22 22:31:41.133961031 +0100
 @@ -1,5 +1,5 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
++pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
 +pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
  // The time interval between checks for a new version (in seconds)
- // nightly=8 hours, official=24 hours
- pref("app.update.interval", 28800);
+ pref("app.update.interval", 7200); // 2 hours
+ // The time interval between the downloading of mar file chunks in the
 @@ -12,11 +12,11 @@
  pref("app.update.url.manual", "http://nightly.mozilla.org/");
  // A default value for the "More information about this update" link

================================================================
Index: packages/iceweasel/iceweasel-prefs.patch
diff -u packages/iceweasel/iceweasel-prefs.patch:1.6 packages/iceweasel/iceweasel-prefs.patch:1.7
--- packages/iceweasel/iceweasel-prefs.patch:1.6	Fri Apr 29 18:54:26 2011
+++ packages/iceweasel/iceweasel-prefs.patch	Sun May  6 12:39:37 2012
@@ -16,10 +16,10 @@
  
  // Defines how the Application Update Service notifies the user about updates:
  //
-@@ -186,7 +186,7 @@
+@@ -249,7 +249,7 @@
+ #endif
  
- // Whether or not the application should check at startup each time if it 
- // is the default browser.
+ // At startup, check if we're the default browser and prompt user if not.
 -pref("browser.shell.checkDefaultBrowser", true);
 +pref("browser.shell.checkDefaultBrowser", false);
  

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.176 packages/iceweasel/iceweasel.spec:1.177
--- packages/iceweasel/iceweasel.spec:1.176	Fri Mar 23 21:37:33 2012
+++ packages/iceweasel/iceweasel.spec	Sun May  6 12:39:37 2012
@@ -16,8 +16,8 @@
 %endif
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define		xulrunner_main	11.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#11.0})
+%define		xulrunner_main	12.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#12.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,12 +28,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	11.0
+Version:	12.0
 Release:	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:	4b07acf47857aff72776d805409cdd1b
+# Source0-md5:	80c3e5927274de7f181fb5f931ac5fd4
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:	%{name}-rm_nonfree.sh
@@ -149,9 +149,6 @@
 cd mozilla
 /bin/sh %{SOURCE2}
 
-# libvpx fix
-grep -q VPX_CODEC_USE_INPUT_PARTITION configure.in && sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure || exit 1
-
 %patch0 -p1
 %patch1 -p1
 
@@ -416,6 +413,7 @@
 %{_libdir}/%{name}/components/ChromeProfileMigrator.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
+%{_libdir}/%{name}/components/FirefoxProfileMigrator.js
 %{_libdir}/%{name}/components/PlacesProtocolHandler.js
 %{_libdir}/%{name}/components/Weave.js
 %{_libdir}/%{name}/components/WebContentConverter.js
@@ -429,10 +427,14 @@
 %{_libdir}/%{name}/components/nsSessionStore.js
 %{_libdir}/%{name}/components/nsSetDefaultBrowser.js
 %{_libdir}/%{name}/components/nsSidebar.js
+%{_libdir}/%{name}/components/PageThumbsProtocol.js
+%{_libdir}/%{name}/components/ProfileMigrator.js
 
 %{_libdir}/%{name}/components/components.manifest
 %{_libdir}/%{name}/components/interfaces.manifest
 
+%{_libdir}/%{name}/update-settings.ini
+
 %if %{without xulrunner}
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/components/ConsoleAPI.js
@@ -545,6 +547,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2012/05/06 10:39:37  arekm
+- up to 12.0
+
 Revision 1.176  2012/03/23 20:37:33  qboosh
 - one more file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel-branding.patch?r1=1.22&r2=1.23
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel-prefs.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel.spec?r1=1.176&r2=1.177

More information about the pld-cvs-commit mailing list