[packages/iceweasel] - started update to 22.0 - let's try building with system xulrunner again

baggins baggins at pld-linux.org
Thu Jun 27 01:11:23 CEST 2013 

commit 6b81c9befae0e32a4b21df883d941a867198ec34
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jun 27 01:10:52 2013 +0200

    - started update to 22.0
    - let's try building with system xulrunner again

 gyp-slashism.patch        |   9 ----
 iceweasel-branding.patch  | 126 +++++++++++++++++++---------------------------
 iceweasel-packaging.patch |  91 +++++++++++++++++----------------
 iceweasel-prefs.patch     |   4 +-
 iceweasel.spec            |  14 +++---
 system-virtualenv.patch   |  65 +++++-------------------
 6 files changed, 117 insertions(+), 192 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 9bd5f7e..76a1b54 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -7,7 +7,7 @@
 %bcond_without	gnomeui		# disable gnomeui support
 %bcond_without	gnome		# synonym for gnomeui (gconf, libnotify and gio are still enabled)
 %bcond_without	kerberos	# disable krb5 support
-%bcond_with	xulrunner	# build without system xulrunner
+%bcond_without	xulrunner	# build without system xulrunner
 %bcond_with	pgo		# PGO-enabled build (requires working $DISPLAY == :100)
 
 %if %{without gnome}
@@ -15,8 +15,8 @@
 %endif
 
 # convert firefox release number to platform version: 19.0.x -> 19.0.x
-%define		xulrunner_main	20.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#20.0})
+%define		xulrunner_main	22.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#22.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -30,14 +30,14 @@ Summary:	Iceweasel web browser
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	20.0.1
-Release:	4
+Version:	22.0
+Release:	0.1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	b822ff4b2348410587dec563235d9320
+# Source0-md5:	4ffb6d1c1a04ca8e3dbca23df09626dd
 Source1:	%{name}-branding.tar.bz2
-# Source1-md5:	816d926bd2c76a5bba5108979ba776ac
+# Source1-md5:	513af080c920d916362b607a872adf00
 Source2:	%{name}-rm_nonfree.sh
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
diff --git a/gyp-slashism.patch b/gyp-slashism.patch
index 4c2f0ff..5100011 100644
--- a/gyp-slashism.patch
+++ b/gyp-slashism.patch
@@ -34,15 +34,6 @@
      if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
          # If WriteTargetMakefile returns True, then this is a useful target
        dirs.append(rel_path)
-@@ -376,7 +382,7 @@
-     WriteMakefile(output_file, data, build_file, depth, top,
-                   # we set srcdir up one directory, since the subdir
-                   # doesn't actually exist in the source directory
--                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
-+                  swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
-                   self.relative_srcdir,
-                   self.common_mk_path)
-     return True
 @@ -399,7 +405,7 @@
    # The relative path from objdir to gyp_file_dir
    srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index 6d6842a..63fa987 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -18,33 +18,31 @@ Subject: Determine which phishing shavar to use depending on
  MOZ_OFFICIAL_BRANDING
 
 ---
- browser/app/Makefile.in                          |    4 ++++
- browser/app/profile/firefox.js                   |    4 ++++
- browser/components/safebrowsing/Makefile.in      |    4 ++++
- browser/components/safebrowsing/SafeBrowsing.jsm |    4 ++++
- 4 files changed, 16 insertions(+)
+ browser/app/Makefile.in        | 4 ++++
+ browser/app/profile/firefox.js | 4 ++++
+ 2 files changed, 8 insertions(+)
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
-index 5f891ca..e337ef4 100644
+index fdcee86..3c6cb9f 100644
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -132,6 +132,10 @@ endif
- 
- endif #} LIBXUL_SDK
+@@ -141,6 +141,10 @@ libs::
+ 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(FINAL_TARGET)/chrome/icons/default
+ endif
  
 +ifdef MOZ_OFFICIAL_BRANDING
 +DEFINES += -DMOZ_OFFICIAL_BRANDING
 +endif
 +
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- libs::
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
+ libs:: $(srcdir)/profile/prefs.js
+ 	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
+ 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index d02a1b1..2b0b9fd 100644
+index 02c8e3f..979e01a 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -742,7 +742,11 @@ pref("urlclassifier.gethashnoise", 4);
- pref("urlclassifier.randomizeclient", false);
+@@ -760,7 +760,11 @@ pref("urlclassifier.alternate_error_page", "blocked");
+ pref("urlclassifier.gethashnoise", 4);
  
  // The list of tables that use the gethash request to confirm partial results.
 +#ifdef MOZ_OFFICIAL_BRANDING
@@ -55,62 +53,34 @@ index d02a1b1..2b0b9fd 100644
  
  // If an urlclassifier table has not been updated in this number of seconds,
  // a gethash request will be forced to check that the result is still in
-diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in
-index 8585a34..3aceb9f 100644
---- a/browser/components/safebrowsing/Makefile.in
-+++ b/browser/components/safebrowsing/Makefile.in
-@@ -24,4 +24,8 @@ EXTRA_PP_JS_MODULES = \
-   SafeBrowsing.jsm \
-   $(NULL)
- 
-+ifdef MOZ_OFFICIAL_BRANDING
-+DEFINES += -DMOZ_OFFICIAL_BRANDING
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-diff --git a/toolkit/components/url-classifier/SafeBrowsing.jsm b/toolkit/components/url-classifier/SafeBrowsing.jsm
-index 313ac48..ba9b6f4 100644
---- a/toolkit/components/url-classifier/SafeBrowsing.jsm
-+++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
-@@ -10,7 +10,11 @@ const Cu = Components.utils;
- 
- Cu.import("resource://gre/modules/Services.jsm");
- 
-+#ifdef MOZ_OFFICIAL_BRANDING
- const phishingList = "goog-phish-shavar";
-+#else
-+const phishingList = "googpub-phish-shavar";
-+#endif
- const malwareList  = "goog-malware-shavar";
- 
- var debug = false;
 From: Mike Hommey <mh at glandium.org>
 Date: Sat, 19 Feb 2011 11:04:53 +0100
 Subject: Modify search plugins depending on MOZ_APP_NAME
 
 ---
- browser/locales/Makefile.in                     |    1 +
- browser/locales/en-US/searchplugins/answers.xml |    2 +-
- browser/locales/en-US/searchplugins/google.xml  |    5 +++++
- 3 files changed, 7 insertions(+), 1 deletion(-)
+ browser/locales/Makefile.in                     | 2 ++
+ browser/locales/en-US/searchplugins/answers.xml | 2 +-
+ browser/locales/en-US/searchplugins/google.xml  | 5 +++++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 340bb5f..dd0761f 100644
+index 07a105e..fa8ea25 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -167,6 +167,7 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
- 	for SEARCH_PLUGIN in $^; do\
- 	  SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
- 	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
-+        -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
- 	    $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \
- 	done
+@@ -83,6 +83,8 @@ SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
+ SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
+ PP_TARGETS += SEARCHPLUGINS
  
++DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME)
++
+ # Required for l10n.mk - defines a list of app sub dirs that should
+ # be included in langpack xpis.
+ ifdef MOZ_METRO
 diff --git a/browser/locales/en-US/searchplugins/answers.xml b/browser/locales/en-US/searchplugins/answers.xml
-index ea32303..2da83aa 100644
+index f131ea6..357d42e 100644
 --- a/browser/locales/en-US/searchplugins/answers.xml
 +++ b/browser/locales/en-US/searchplugins/answers.xml
-@@ -8,6 +8,6 @@
+@@ -12,6 +12,6 @@
    <Param name="gwp" value="13"/>
  </Url>
  <Url type="application/x-suggestions+json" method="GET"
@@ -119,43 +89,49 @@ index ea32303..2da83aa 100644
  <SearchForm>http://www.answers.com/</SearchForm>
  </SearchPlugin>
 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
-index 1ccd459..b87c867 100644
+index 10ba30b..f23b99e 100644
 --- a/browser/locales/en-US/searchplugins/google.xml
 +++ b/browser/locales/en-US/searchplugins/google.xml
-@@ -1,7 +1,9 @@
+@@ -2,6 +2,7 @@
     - License, v. 2.0. If a copy of the MPL was not distributed with this
     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
  
 +#filter substitution
- #define GOOGLE_PARAMS <Param name="q" value="{searchTerms}"/><Param name="ie" value="utf-8"/><Param name="oe" value="utf-8"/><Param name="aq" value="t"/><Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
+ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+ <ShortName>Google</ShortName>
+ <Description>Google Search</Description>
+@@ -14,6 +15,7 @@
+   <Param name="oe" value="utf-8"/>
+   <Param name="aq" value="t"/>
+   <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
 +#if MOZ_APP_NAME==firefox
  #if MOZ_UPDATE_CHANNEL == beta
- #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
+   <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
  #elif MOZ_UPDATE_CHANNEL == aurora
-@@ -8,6 +10,9 @@
+@@ -23,6 +25,9 @@
  #else
- #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
+   <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
  #endif
 +#else
-+#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="@MOZ_APP_NAME at -a" falseValue="@MOZ_APP_NAME@"/>
++  <MozParam name="client" condition="defaultEngine" trueValue="@MOZ_APP_NAME at -a" falseValue="@MOZ_APP_NAME@"/>
 +#endif
- <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
- <ShortName>Google</ShortName>
- <Description>Google Search</Description>
+   <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/>
+   <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/>
+   <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/>
 From: Mike Hommey <mh at glandium.org>
 Date: Sat, 19 Feb 2011 11:02:30 +0100
 Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
 
 ---
- browser/locales/Makefile.in                        |    2 ++
- .../en-US/chrome/overrides/appstrings.properties   |   20 ++++++++++----------
+ browser/locales/Makefile.in                          |  2 ++
+ .../en-US/chrome/overrides/appstrings.properties     | 20 ++++++++++----------
  2 files changed, 12 insertions(+), 10 deletions(-)
 
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index c5a09d2..340bb5f 100644
+index cfaa3db..07a105e 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -69,6 +69,8 @@ SUBMAKEFILES += \
+@@ -37,6 +37,8 @@ SUBMAKEFILES += \
  	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
  	$(NULL)
  
@@ -165,11 +141,11 @@ index c5a09d2..340bb5f 100644
  # build non-default locales to non-default dist/ locations. Be aware!
  
 diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
-index 87e9538..ac979f9 100644
+index 1de0093..8c77825 100644
 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties
 +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
-@@ -35,24 +35,24 @@
- # ***** END LICENSE BLOCK *****
+@@ -3,24 +3,24 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  malformedURI=The URL is not valid and cannot be loaded.
 -fileNotFound=Firefox can't find the file at %S.
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index d6ef4e9..a4b684f 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -1,6 +1,6 @@
 --- iceweasel-17.0/mozilla/browser/installer/package-manifest.in.orig	2012-11-27 08:03:11.673587982 +0100
 +++ iceweasel-17.0/mozilla/browser/installer/package-manifest.in	2012-11-27 08:31:24.343528272 +0100
-@@ -49,34 +49,44 @@
+@@ -49,35 +49,45 @@
  #endif
  
  [xpcom]
@@ -22,12 +22,13 @@
  #endif
 +#endif
  #ifndef MOZ_NATIVE_NSPR
+ #ifndef MOZ_FOLD_LIBS
  @BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
  @BINPATH@/@DLL_PREFIX at plc4@DLL_SUFFIX@
  @BINPATH@/@DLL_PREFIX at plds4@DLL_SUFFIX@
  #endif
+ #endif
 +#ifndef LIBXUL_SDK
- @BINPATH@/@DLL_PREFIX at xpcom@DLL_SUFFIX@
  #ifdef XP_MACOSX
  @BINPATH@/XUL
  #else
@@ -43,8 +44,8 @@
  #endif
 +#endif
  #ifdef XP_WIN32
+ @BINPATH@/plugin-hang-ui at BIN_SUFFIX@
  #ifndef MOZ_DEBUG
- #if MOZ_MSVC_REDIST == 1400
 @@ -107,14 +117,18 @@
  #ifndef XP_UNIX
  @BINPATH@/@MOZ_APP_NAME at .exe
@@ -76,7 +77,7 @@
 +#endif
  
  ; [Components]
- @BINPATH@/components/components.manifest
+ @BINPATH@/browser/components/components.manifest
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/alerts.xpt
  #ifdef ACCESSIBILITY
@@ -86,8 +87,8 @@
  @BINPATH@/components/autocomplete.xpt
  @BINPATH@/components/autoconfig.xpt
 +#endif
- @BINPATH@/components/browsercompsbase.xpt
- @BINPATH@/components/browser-feeds.xpt
+ @BINPATH@/browser/components/browsercompsbase.xpt
+ @BINPATH@/browser/components/browser-feeds.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/caps.xpt
  @BINPATH@/components/chrome.xpt
@@ -97,7 +98,7 @@
  #endif
  @BINPATH@/components/find.xpt
 +#endif
- @BINPATH@/components/fuel.xpt
+ @BINPATH@/browser/components/fuel.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/gfx.xpt
  @BINPATH@/components/html5.xpt
@@ -107,21 +108,24 @@
  @BINPATH@/components/locale.xpt
  @BINPATH@/components/lwbrk.xpt
 +#endif
- @BINPATH@/components/migration.xpt
+ @BINPATH@/browser/components/migration.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/mimetype.xpt
  @BINPATH@/components/mozfind.xpt
  @BINPATH@/components/necko_about.xpt
-@@ -275,9 +298,13 @@
+@@ -275,12 +298,16 @@
  @BINPATH@/components/rdf.xpt
  @BINPATH@/components/satchel.xpt
  @BINPATH@/components/saxparser.xpt
 +#endif
- @BINPATH@/components/sessionstore.xpt
+ @BINPATH@/browser/components/sessionstore.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/services-crypto-component.xpt
 +#endif
- @BINPATH@/components/shellservice.xpt
+ #ifdef MOZ_CAPTIVEDETECT
+ @BINPATH@/components/captivedetect.xpt
+ #endif
+ @BINPATH@/browser/components/shellservice.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/shistory.xpt
  @BINPATH@/components/spellchecker.xpt
@@ -131,13 +135,13 @@
  @BINPATH@/components/FeedProcessor.manifest
  @BINPATH@/components/FeedProcessor.js
 +#endif
- @BINPATH@/components/BrowserFeeds.manifest
- @BINPATH@/components/FeedConverter.js
- @BINPATH@/components/FeedWriter.js
+ @BINPATH@/browser/components/BrowserFeeds.manifest
+ @BINPATH@/browser/components/FeedConverter.js
+ @BINPATH@/browser/components/FeedWriter.js
 @@ -340,6 +368,7 @@
- @BINPATH@/components/nsPrivateBrowsingService.manifest
- @BINPATH@/components/nsPrivateBrowsingService.js
- #endif
+ @BINPATH@/browser/components/DownloadsUI.js
+ @BINPATH@/browser/components/BrowserPlaces.manifest
+ @BINPATH@/components/BrowserPageThumbs.manifest
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/SiteSpecificUserAgent.js
  @BINPATH@/components/SiteSpecificUserAgent.manifest
@@ -147,8 +151,8 @@
  @BINPATH@/components/GPSDGeolocationProvider.manifest
  @BINPATH@/components/GPSDGeolocationProvider.js
 +#endif
- @BINPATH@/components/nsSidebar.manifest
- @BINPATH@/components/nsSidebar.js
+ @BINPATH@/browser/components/nsSidebar.manifest
+ @BINPATH@/browser/components/nsSidebar.js
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/extensions.manifest
  @BINPATH@/components/addonManager.js
@@ -166,17 +170,17 @@
  @BINPATH@/components/nsUpdateTimerManager.js
  @BINPATH@/components/pluginGlue.manifest
 +#endif
- @BINPATH@/components/nsSessionStore.manifest
- @BINPATH@/components/nsSessionStartup.js
- @BINPATH@/components/nsSessionStore.js
+ @BINPATH@/browser/components/nsSessionStore.manifest
+ @BINPATH@/browser/components/nsSessionStartup.js
+ @BINPATH@/browser/components/nsSessionStore.js
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/nsURLFormatter.manifest
  @BINPATH@/components/nsURLFormatter.js
 +#endif
  #ifndef XP_OS2
- @BINPATH@/components/@DLL_PREFIX at browsercomps@DLL_SUFFIX@
+ @BINPATH@/browser/components/@DLL_PREFIX at browsercomps@DLL_SUFFIX@
  #else
- @BINPATH@/components/brwsrcmp at DLL_SUFFIX@
+ @BINPATH@/browser/components/brwsrcmp at DLL_SUFFIX@
  #endif
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/txEXSLTRegExFunctions.manifest
@@ -187,7 +191,7 @@
  @BINPATH@/components/nsPlacesAutoComplete.js
  @BINPATH@/components/nsPlacesExpiration.js
 +#endif
- @BINPATH@/components/PlacesProtocolHandler.js
+ @BINPATH@/browser/components/PlacesProtocolHandler.js
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/PlacesCategoriesStarter.js
  @BINPATH@/components/ColorAnalyzer.js
@@ -214,9 +218,9 @@
  @BINPATH@/components/@DLL_PREFIX at dbusservice@DLL_SUFFIX@
  #endif
 @@ -457,6 +500,7 @@
- @BINPATH@/components/AitcComponents.manifest
- @BINPATH@/components/Aitc.js
- #endif
+ @BINPATH@/components/nsINIProcessor.js
+ @BINPATH@/components/nsPrompter.manifest
+ @BINPATH@/components/nsPrompter.js
 +#endif
  #ifdef MOZ_DATA_REPORTING
  @BINPATH@/components/DataReporting.manifest
@@ -229,12 +233,15 @@
  #ifdef MOZ_SERVICES_SYNC
  @BINPATH@/components/SyncComponents.manifest
  @BINPATH@/components/Weave.js
-@@ -488,11 +533,14 @@
+@@ -488,14 +533,17 @@
  @BINPATH@/components/AlarmsManager.manifest
  @BINPATH@/components/TCPSocket.js
  @BINPATH@/components/TCPSocket.manifest
 +#endif
  
+ @BINPATH@/components/AppProtocolHandler.js
+ @BINPATH@/components/AppProtocolHandler.manifest
+ 
 +#ifndef LIBXUL_SDK
  #ifdef MOZ_WEBRTC
  @BINPATH@/components/PeerConnection.js
@@ -262,40 +269,32 @@
  #ifdef MOZ_ANGLE_RENDERER
 @@ -531,8 +579,10 @@
  #ifdef SHIP_FEEDBACK
- @BINPATH@/distribution/extensions/testpilot at labs.mozilla.com.xpi
+ @BINPATH@/browser/distribution/extensions/testpilot at labs.mozilla.com.xpi
  #endif
 +#ifndef LIBXUL_SDK
  @BINPATH@/chrome/toolkit at JAREXT@
  @BINPATH@/chrome/toolkit.manifest
 +#endif
+ @BINPATH@/chrome/recording.manifest
+ @BINPATH@/chrome/recording/*
  #ifdef MOZ_GTK2
- @BINPATH@/chrome/icons/default/default16.png
- @BINPATH@/chrome/icons/default/default32.png
 @@ -560,14 +610,14 @@
  
  ; [Default Preferences]
  ; All the pref files must be part of base to prevent migration bugs
 +#ifndef LIBXUL_SDK
- @BINPATH@/@PREF_DIR@/firefox.js
- @BINPATH@/@PREF_DIR@/firefox-branding.js
+ @BINPATH@/browser/@PREF_DIR@/firefox.js
+ @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
  @BINPATH@/greprefs.js
  @BINPATH@/defaults/autoconfig/platform.js
  @BINPATH@/defaults/autoconfig/prefcalls.js
- @BINPATH@/defaults/profile/prefs.js
+ @BINPATH@/browser/defaults/profile/prefs.js
  
 -#ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
- @BINPATH@/defaults/pref/channel-prefs.js
- #else
-@@ -566,15 +616,19 @@
- #endif
- 
- ; Services (gre) prefs
-+#ifndef LIBXUL_SDK
- #ifdef MOZ_SERVICES_AITC
- @BINPATH@/defaults/pref/services-aitc.js
- #endif
-+#endif
+ ; Technically this is an app pref file, but we are keeping it in the original
+ ; gre location for now.
+@@ -566,9 +616,11 @@
  #ifdef MOZ_SERVICES_NOTIFICATIONS
  @BINPATH@/defaults/pref/services-notifications.js
  #endif
diff --git a/iceweasel-prefs.patch b/iceweasel-prefs.patch
index f802d12..d8cc277 100644
--- a/iceweasel-prefs.patch
+++ b/iceweasel-prefs.patch
@@ -26,14 +26,14 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile
  // Defines how the Application Update Service notifies the user about updates:
  //
 @@ -252,7 +252,7 @@
- #endif
+ pref("general.useragent.complexOverride.moodle", false); // bug 797703
  
  // At startup, check if we're the default browser and prompt user if not.
 -pref("browser.shell.checkDefaultBrowser", true);
 +pref("browser.shell.checkDefaultBrowser", false);
+ pref("browser.shell.shortcutFavicons",true);
  
  // 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
 @@ -448,6 +448,8 @@
  //  0: no backups created (and deletes all existing backups)
  pref("browser.bookmarks.max_backups",             10);
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index fbba18b..a2d150f 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,53 +1,12 @@
-Restore --system-site-packages when system virtualenv gets 1.7 upgrade
-
---- a/mozilla/configure.in~	2013-02-15 22:14:45.000000000 +0100
-+++ a/mozilla/configure.in	2013-02-20 17:05:55.258742791 +0100
-@@ -141,7 +141,7 @@
-     PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
-     ;;
- *)
--    PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
-+    PYTHON=/usr/bin/python
-     ;;
- esac
- 
---- a/mozilla/configure~	2013-02-15 22:15:48.000000000 +0100
-+++ a/mozilla/configure	2013-02-20 17:06:11.479134735 +0100
-@@ -1344,7 +1344,7 @@
-     PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
-     ;;
- *)
--    PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
-+    PYTHON=/usr/bin/python
-     ;;
- esac
- 
---- iceweasel-19.0/mozilla/configure.in~	2013-02-20 17:11:35.849980531 +0100
-+++ iceweasel-19.0/mozilla/configure.in	2013-02-20 17:18:24.806617099 +0100
-@@ -128,13 +128,6 @@
-     AC_MSG_ERROR([python was not found in \$PATH])
- fi
- 
--AC_MSG_RESULT([Creating Python environment])
--dnl This verifies our Python version is sane and ensures the Python
--dnl virtualenv is present and up to date. It sanitizes the environment
--dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
--
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
- mingw*)
---- iceweasel-19.0/mozilla/configure~	2013-02-20 17:11:35.853313949 +0100
-+++ iceweasel-19.0/mozilla/configure	2013-02-20 17:17:59.639339399 +0100
-@@ -1335,10 +1335,6 @@
-     { echo "configure: error: python was not found in \$PATH" 1>&2; exit 1; }
- fi
- 
--echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
--
- case "$host_os" in
- mingw*)
-     PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
+--- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~	2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py	2013-05-14 22:51:32.136719267 +0200
+@@ -37,8 +37,7 @@
+     @property
+     def virtualenv_script_path(self):
+         """Path to virtualenv's own populator script."""
+-        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
+-            'virtualenv.py')
++        return '/usr/bin/virtualenv'
+ 
+     @property
+     def python_path(self):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/6b81c9befae0e32a4b21df883d941a867198ec34

More information about the pld-cvs-commit mailing list