[packages/iceweasel] - updated patches to 32.0.3
baggins
baggins at pld-linux.org
Sat Sep 27 15:48:56 CEST 2014
commit b08bfd2a9b5cd5983b7d7d205902c74ce024848f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Sep 27 15:48:38 2014 +0200
- updated patches to 32.0.3
Disable-Firefox-Health-Report.patch | 2 +-
iceweasel-packaging.patch | 33 +++++++++++++--------------------
2 files changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/Disable-Firefox-Health-Report.patch b/Disable-Firefox-Health-Report.patch
index 081a9b2..bf66b3a 100644
--- a/Disable-Firefox-Health-Report.patch
+++ b/Disable-Firefox-Health-Report.patch
@@ -11,9 +11,9 @@ index 35cbdac..906de7a 100644
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -27,7 +27,7 @@ MOZ_CHROME_FILE_FORMAT=omni
- MOZ_SAFE_BROWSING=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
+ MOZ_SERVICES_FXACCOUNTS=1
-MOZ_SERVICES_HEALTHREPORT=1
+MOZ_SERVICES_HEALTHREPORT=
MOZ_SERVICES_METRICS=1
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 8011c30..7ef6029 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -73,9 +73,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
+#ifndef LIBXUL_SDK
@BINPATH@/platform.ini
+#endif
- #ifndef XP_OS2
#ifndef MOZ_NATIVE_SQLITE
#ifndef MOZ_FOLD_LIBS
+ @BINPATH@/@DLL_PREFIX at mozsqlite3@DLL_SUFFIX@
@@ -132,25 +148,34 @@
#ifdef XP_UNIX
#ifndef XP_MACOSX
@@ -111,7 +111,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
@BINPATH@/components/caps.xpt
@BINPATH@/components/chrome.xpt
@BINPATH@/components/commandhandler.xpt
-@@ -169,6 +194,7 @@
+@@ -169,9 +194,11 @@
@BINPATH@/components/dom_apps.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_system.xpt
@@ -119,14 +119,10 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
#ifdef MOZ_B2G_BT
@BINPATH@/components/dom_bluetooth.xpt
#endif
-@@ -212,6 +212,7 @@
- #ifdef MOZ_B2G_BT
- @BINPATH@/components/dom_bluetooth.xpt
- #endif
+#ifndef LIBXUL_SDK
- @BINPATH@/components/dom_camera.xpt
@BINPATH@/components/dom_canvas.xpt
- @BINPATH@/components/dom_contacts.xpt
+ @BINPATH@/components/dom_alarm.xpt
+ @BINPATH@/components/dom_core.xpt
@@ -216,6 +243,8 @@
@BINPATH@/components/dom_xbl.xpt
@BINPATH@/components/dom_xpath.xpt
@@ -194,14 +190,14 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
@BINPATH@/browser/components/FeedConverter.js
@BINPATH@/browser/components/FeedWriter.js
@@ -354,6 +394,7 @@
- @BINPATH@/browser/components/BrowserPlaces.manifest
- @BINPATH@/browser/components/devtools-clhandler.manifest
- @BINPATH@/browser/components/devtools-clhandler.js
+ @BINPATH@/browser/components/Experiments.manifest
+ @BINPATH@/browser/components/ExperimentsService.js
+ @BINPATH@/browser/components/translation.manifest
+#ifndef LIBXUL_SDK
@BINPATH@/components/Downloads.manifest
@BINPATH@/components/DownloadLegacy.js
@BINPATH@/components/BrowserPageThumbs.manifest
-@@ -381,31 +422,39 @@
+@@ -381,28 +422,36 @@
@BINPATH@/components/nsDownloadManagerUI.js
@BINPATH@/components/NetworkGeolocationProvider.manifest
@BINPATH@/components/NetworkGeolocationProvider.js
@@ -212,6 +208,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
@BINPATH@/components/extensions.manifest
@BINPATH@/components/addonManager.js
@BINPATH@/components/amContentHandler.js
+ @BINPATH@/components/amInstallTrigger.js
@BINPATH@/components/amWebInstallListener.js
@BINPATH@/components/nsBlocklistService.js
+#endif
@@ -232,11 +229,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
@BINPATH@/components/nsURLFormatter.manifest
@BINPATH@/components/nsURLFormatter.js
+#endif
- #ifndef XP_OS2
@BINPATH@/browser/components/@DLL_PREFIX at browsercomps@DLL_SUFFIX@
- #else
- @BINPATH@/browser/components/brwsrcmp at DLL_SUFFIX@
- #endif
+#ifndef LIBXUL_SDK
@BINPATH@/components/txEXSLTRegExFunctions.manifest
@BINPATH@/components/txEXSLTRegExFunctions.js
@@ -298,9 +291,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
@BINPATH@/components/cryptoComponents.manifest
@BINPATH@/components/TelemetryPing.js
@@ -581,7 +581,9 @@
-
- @BINPATH@/components/HttpDataUsage.manifest
- @BINPATH@/components/HttpDataUsage.js
+ @BINPATH@/components/PeerConnection.js
+ @BINPATH@/components/PeerConnection.manifest
+ #endif
+#endif
+#ifndef LIBXUL_SDK
@@ -413,7 +406,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
+#ifndef LIBXUL_SDK
@BINPATH@/components/DataStore.manifest
- @BINPATH@/components/DataStoreService.js
+ @BINPATH@/components/DataStoreImpl.js
@BINPATH@/components/dom_datastore.xpt
+#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/b08bfd2a9b5cd5983b7d7d205902c74ce024848f
More information about the pld-cvs-commit
mailing list