[packages/mozilla-firefox] - saving update to 33.0.1

qboosh qboosh at pld-linux.org
Fri Oct 31 15:21:05 CET 2014 

commit 08ccc3c53a37c91a941fab9aad6c8d29fc076f07
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Oct 31 15:21:09 2014 +0100

    - saving update to 33.0.1

 mozilla-firefox-middle_click_paste.patch |   6 +-
 mozilla-firefox-packaging.patch          | 201 +++++++++----------------------
 mozilla-firefox.spec                     |  50 ++++----
 3 files changed, 86 insertions(+), 171 deletions(-)
---
diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 6df3efb..fd75346 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -9,25 +9,27 @@
 %bcond_with	tests		# enable tests (whatever they check)
 %bcond_with	gtk3		# GTK+ 3.x instead of 2.x
 %bcond_without	kerberos	# disable krb5 support
-%bcond_without	xulrunner	# system xulrunner
+%bcond_with	xulrunner	# system xulrunner [no longer supported]
+# - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
+%bcond_with	shared_js
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
 %endif
 
-%define		nspr_ver	4.10.3
-%define		nss_ver		3.16
+%define		nspr_ver	4.10.6
+%define		nss_ver		3.17.1
 
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	29.0.1
+Version:	33.0.1
 Release:	1
 License:	MPL v2.0
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	ca37addc3a69ef30247e00375dd93cd0
+# Source0-md5:	5a1c4b0b2349e3db94b45bd3f03f9288
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
 Source5:	vendor.js
@@ -48,6 +50,8 @@ BuildRequires:	cairo-devel >= 1.10.2-5
 BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	gcc-c++ >= 6:4.4
 BuildRequires:	glib2-devel >= 1:2.20
+BuildRequires:	gstreamer-devel >= 1.0
+BuildRequires:	gstreamer-plugins-base-devel >= 1.0
 %{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.14}
 %{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
@@ -62,21 +66,23 @@ BuildRequires:	libicu-devel >= 50.1
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libpng(APNG)-devel >= 0.10
-BuildRequires:	libpng-devel >= 2:1.6.7
+BuildRequires:	libpng-devel >= 2:1.6.10
 BuildRequires:	libstdc++-devel >= 6:4.4
 BuildRequires:	libvpx-devel >= 1.3.0
 BuildRequires:	nspr-devel >= 1:%{nspr_ver}
 BuildRequires:	nss-devel >= 1:%{nss_ver}
-BuildRequires:	pango-devel >= 1:1.14.0
+BuildRequires:	pango-devel >= 1:1.22.0
 BuildRequires:	pixman-devel >= 0.19.2
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libffi) >= 3.0.9
+BuildRequires:	pulseaudio-devel
 BuildRequires:	python-modules
 BuildRequires:	python-virtualenv
+BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	sqlite3-devel >= 3.8.2
+BuildRequires:	sqlite3-devel >= 3.8.5
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXext-devel
@@ -100,13 +106,13 @@ Requires:	glib2 >= 1:2.20
 %{!?with_gtk3:Requires:	gtk+2 >= 2:2.14}
 %{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
 Requires:	libjpeg-turbo
-Requires:	libpng >= 2:1.6.7
+Requires:	libpng >= 2:1.6.10
 Requires:	libpng(APNG) >= 0.10
 Requires:	libvpx >= 1.3.0
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
 Requires:	nss >= 1:%{nss_ver}
-Requires:	pango >= 1:1.14.0
+Requires:	pango >= 1:1.22.0
 Requires:	sqlite3 >= %{sqlite_build_version}
 Requires:	startup-notification >= 0.8
 %endif
@@ -150,17 +156,12 @@ cd mozilla
 
 %build
 cd mozilla
-cp -f %{_datadir}/automake/config.* build/autoconf
+cp -pf %{_datadir}/automake/config.* build/autoconf
 
-cat << EOF > .mozconfig
-. \$topsrcdir/browser/config/mozconfig
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
-# parallel build fails on _xpidlgen/
-%if %{without xulrunner}
-mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags}
-%endif
-mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Options for 'configure' (same as command-line options).
 ac_add_options --build=%{_target_platform}
@@ -216,14 +217,15 @@ ac_add_options --disable-xterm-updates
 ac_add_options --enable-canvas
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
-ac_add_options --enable-extensions="default,gio"
+ac_add_options --enable-extensions=default
 ac_add_options --enable-gio
+ac_add_options --enable-gstreamer=1.0
 ac_add_options --enable-libxul
 ac_add_options --enable-mathml
 ac_add_options --enable-pango
 ac_add_options --enable-readline
 ac_add_options --enable-safe-browsing
-ac_add_options --enable-shared-js
+%{?with_shared_js:ac_add_options --enable-shared-js}
 ac_add_options --enable-startup-notification
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
@@ -251,10 +253,10 @@ ac_add_options --with-system-icu
 ac_add_options --with-x
 EOF
 
-%{__make} -f client.mk build \
-	STRIP="/bin/true" \
+%{__make} -j1 -f client.mk build \
 	CC="%{__cc}" \
-	CXX="%{__cxx}"
+	CXX="%{__cxx}" \
+	MOZ_MAKE_FLAGS="%{_smp_mflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -434,7 +436,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
 %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
-%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
+%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
diff --git a/mozilla-firefox-middle_click_paste.patch b/mozilla-firefox-middle_click_paste.patch
index b325338..14fc91a 100644
--- a/mozilla-firefox-middle_click_paste.patch
+++ b/mozilla-firefox-middle_click_paste.patch
@@ -1,9 +1,9 @@
 --- iceweasel-13.0/mozilla/browser/base/content/browser.js.orig	2012-06-06 11:12:17.021562264 +0200
 +++ iceweasel-13.0/mozilla/browser/base/content/browser.js	2012-06-06 11:21:37.000000000 +0200
-@@ -5231,12 +5231,9 @@
+@@ -5110,12 +5110,9 @@ function middleMousePaste(event) {
+   }
  
-   Task.spawn(function() {
-     let data = yield getShortcutOrURIAndPostData(clipboard);
+   getShortcutOrURIAndPostData(clipboard, data => {
 -    try {
 -      makeURI(data.url);
 -    } catch (ex) {
diff --git a/mozilla-firefox-packaging.patch b/mozilla-firefox-packaging.patch
index 8011c30..0cb79ff 100644
--- a/mozilla-firefox-packaging.patch
+++ b/mozilla-firefox-packaging.patch
@@ -1,6 +1,5 @@
-diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in iceweasel-24.0/mozilla/browser/installer/package-manifest.in
---- iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in	2013-09-11 01:14:52.000000000 +0200
-+++ iceweasel-24.0/mozilla/browser/installer/package-manifest.in	2013-10-23 08:51:36.788646262 +0200
+--- iceweasel-32.0.3/mozilla/browser/installer/package-manifest.in~	2014-09-24 03:05:09.000000000 +0200
++++ iceweasel-32.0.3/mozilla/browser/installer/package-manifest.in	2014-09-28 03:16:25.047988707 +0200
 @@ -32,14 +32,18 @@
  [@AB_CD@]
  @BINPATH@/browser/chrome/@AB_CD@@JAREXT@
@@ -20,7 +19,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
  @BINPATH@/browser/searchplugins/*
  #ifdef XP_WIN32
-@@ -51,20 +55,26 @@
+@@ -51,17 +55,23 @@
  #endif
  
  [xpcom]
@@ -44,10 +43,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  #ifdef MOZ_DMD
  @BINPATH@/@DLL_PREFIX at dmd@DLL_SUFFIX@
  #endif
- #ifndef MOZ_NATIVE_NSPR
- #ifndef MOZ_FOLD_LIBS
- @BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
-@@ -72,14 +82,18 @@
+@@ -75,14 +85,18 @@
  #ifdef XP_MACOSX
  @BINPATH@/XUL
  #else
@@ -65,18 +61,18 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
 +#endif
  #ifdef XP_WIN32
  @BINPATH@/plugin-hang-ui at BIN_SUFFIX@
- #ifndef MOZ_DEBUG
-@@ -118,7 +132,9 @@
+ #if MOZ_MSVC_REDIST == 1600
+@@ -135,7 +149,9 @@
  #ifdef MOZ_UPDATER
  @BINPATH@/update-settings.ini
  #endif
 +#ifndef LIBXUL_SDK
  @BINPATH@/platform.ini
 +#endif
- #ifndef XP_OS2
  #ifndef MOZ_NATIVE_SQLITE
  #ifndef MOZ_FOLD_LIBS
-@@ -132,25 +148,34 @@
+ @BINPATH@/@DLL_PREFIX at mozsqlite3@DLL_SUFFIX@
+@@ -145,12 +161,15 @@
  #ifdef XP_UNIX
  #ifndef XP_MACOSX
  @BINPATH@/run-mozilla.sh
@@ -90,17 +86,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/components/components.manifest
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/alerts.xpt
-+#endif
  #ifdef ACCESSIBILITY
  #ifdef XP_WIN32
- @BINPATH@/AccessibleMarshal.dll
- #endif
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/accessibility.xpt
- #endif
-+#endif
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/appshell.xpt
+@@ -162,8 +181,10 @@
  @BINPATH@/components/appstartup.xpt
  @BINPATH@/components/autocomplete.xpt
  @BINPATH@/components/autoconfig.xpt
@@ -111,32 +99,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 @@
- @BINPATH@/components/dom_apps.xpt
- @BINPATH@/components/dom_base.xpt
- @BINPATH@/components/dom_system.xpt
-+#endif
- #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
-@@ -216,6 +243,8 @@
- @BINPATH@/components/dom_xbl.xpt
- @BINPATH@/components/dom_xpath.xpt
- @BINPATH@/components/dom_xul.xpt
-+#endif
-+#ifndef LIBXUL_SDK
- #ifdef MOZ_GAMEPAD
- @BINPATH@/components/dom_gamepad.xpt
- #endif
-@@ -231,7 +260,9 @@
+@@ -238,7 +259,9 @@
  @BINPATH@/components/filepicker.xpt
  #endif
  @BINPATH@/components/find.xpt
@@ -146,7 +109,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/gfx.xpt
  @BINPATH@/components/html5.xpt
  @BINPATH@/components/htmlparser.xpt
-@@ -254,7 +285,9 @@
+@@ -262,7 +285,9 @@
  @BINPATH@/components/layout_xul.xpt
  @BINPATH@/components/locale.xpt
  @BINPATH@/components/lwbrk.xpt
@@ -156,7 +119,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/mimetype.xpt
  @BINPATH@/components/mozfind.xpt
  @BINPATH@/components/necko_about.xpt
-@@ -289,12 +322,16 @@
+@@ -299,12 +324,16 @@
  @BINPATH@/components/rdf.xpt
  @BINPATH@/components/satchel.xpt
  @BINPATH@/components/saxparser.xpt
@@ -164,28 +127,27 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/components/sessionstore.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/services-crypto-component.xpt
-+#endif
  #ifdef MOZ_CAPTIVEDETECT
  @BINPATH@/components/captivedetect.xpt
  #endif
++#endif
  @BINPATH@/browser/components/shellservice.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/shistory.xpt
  @BINPATH@/components/spellchecker.xpt
  @BINPATH@/components/storage.xpt
-@@ -312,9 +349,11 @@
- @BINPATH@/components/webBrowser_core.xpt
- @BINPATH@/components/webbrowserpersist.xpt
- @BINPATH@/components/widget.xpt
+@@ -343,8 +372,10 @@
+ @BINPATH@/components/xultmpl.xpt
+ @BINPATH@/components/zipwriter.xpt
+ @BINPATH@/components/telemetry.xpt
 +#endif
- #ifdef XP_MACOSX
- @BINPATH@/components/widget_cocoa.xpt
- #endif
+ 
+ ; JavaScript components
 +#ifndef LIBXUL_SDK
- @BINPATH@/components/windowds.xpt
- @BINPATH@/components/windowwatcher.xpt
- @BINPATH@/components/xpcom_base.xpt
-@@ -339,6 +378,7 @@
+ @BINPATH@/components/ChromeNotifications.js
+ @BINPATH@/components/ChromeNotifications.manifest
+ @BINPATH@/components/ConsoleAPI.manifest
+@@ -353,6 +384,7 @@
  @BINPATH@/components/BrowserElementParent.js
  @BINPATH@/components/FeedProcessor.manifest
  @BINPATH@/components/FeedProcessor.js
@@ -193,15 +155,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/components/BrowserFeeds.manifest
  @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
+@@ -373,6 +405,7 @@
+ @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 @@
+@@ -404,8 +437,10 @@
  @BINPATH@/components/nsDownloadManagerUI.js
  @BINPATH@/components/NetworkGeolocationProvider.manifest
  @BINPATH@/components/NetworkGeolocationProvider.js
@@ -212,15 +174,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/amWebInstallListener.js
- @BINPATH@/components/nsBlocklistService.js
-+#endif
- #ifdef MOZ_UPDATER
- @BINPATH@/components/nsUpdateService.manifest
- @BINPATH@/components/nsUpdateService.js
- @BINPATH@/components/nsUpdateServiceStub.js
- #endif
-+#ifndef LIBXUL_SDK
+@@ -420,12 +455,16 @@
  @BINPATH@/components/nsUpdateTimerManager.manifest
  @BINPATH@/components/nsUpdateTimerManager.js
  @BINPATH@/components/pluginGlue.manifest
@@ -232,18 +186,14 @@ 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
  @BINPATH@/components/toolkitplaces.manifest
-@@ -414,7 +463,9 @@
- @BINPATH@/components/nsPlacesAutoComplete.manifest
- @BINPATH@/components/nsPlacesAutoComplete.js
+@@ -436,7 +475,9 @@
+ @BINPATH@/components/UnifiedComplete.manifest
+ @BINPATH@/components/UnifiedComplete.js
  @BINPATH@/components/nsPlacesExpiration.js
 +#endif
  @BINPATH@/browser/components/PlacesProtocolHandler.js
@@ -251,7 +201,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/PlacesCategoriesStarter.js
  @BINPATH@/components/ColorAnalyzer.js
  @BINPATH@/components/PageThumbsProtocol.js
-@@ -437,6 +488,7 @@
+@@ -461,6 +502,7 @@
  @BINPATH@/components/contentSecurityPolicy.js
  @BINPATH@/components/contentAreaDropListener.manifest
  @BINPATH@/components/contentAreaDropListener.js
@@ -259,63 +209,19 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/components/BrowserProfileMigrators.manifest
  @BINPATH@/browser/components/ProfileMigrator.js
  @BINPATH@/browser/components/ChromeProfileMigrator.js
-@@ -462,17 +514,24 @@
+@@ -472,6 +514,7 @@
+ #ifdef XP_MACOSX
  @BINPATH@/browser/components/SafariProfileMigrator.js
  #endif
- #ifdef MOZ_ENABLE_DBUS
 +#ifndef LIBXUL_SDK
+ #ifdef MOZ_ENABLE_DBUS
  @BINPATH@/components/@DLL_PREFIX at dbusservice@DLL_SUFFIX@
  #endif
-+#endif
- #ifdef MOZ_ENABLE_GNOME_COMPONENT
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/@DLL_PREFIX at mozgnome@DLL_SUFFIX@
- #endif
-+#endif
- #ifdef MOZ_ENABLE_GNOMEVFS
- @BINPATH@/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
- #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS)
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/components.manifest
- #endif
-+#endif
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/nsINIProcessor.manifest
- @BINPATH@/components/nsINIProcessor.js
- @BINPATH@/components/nsPrompter.manifest
-@@ -488,10 +547,12 @@
- @BINPATH@/components/SyncComponents.manifest
- @BINPATH@/components/Weave.js
+@@ -588,19 +631,24 @@
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
  #endif
 +#endif
- #ifdef MOZ_CAPTIVEDETECT
- @BINPATH@/components/CaptivePortalDetectComponents.manifest
- @BINPATH@/components/captivedetect.js
- #endif
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/servicesComponents.manifest
- @BINPATH@/components/cryptoComponents.manifest
- @BINPATH@/components/TelemetryPing.js
-@@ -581,7 +581,9 @@
- 
- @BINPATH@/components/HttpDataUsage.manifest
- @BINPATH@/components/HttpDataUsage.js
-+#endif
- 
-+#ifndef LIBXUL_SDK
- @BINPATH@/chrome/marionette at JAREXT@
- @BINPATH@/chrome/marionette.manifest
- @BINPATH@/components/MarionetteComponents.manifest
-@@ -594,6 +596,7 @@
- ; InputMethod API
- @BINPATH@/components/MozKeyboard.js
- @BINPATH@/components/InputMethod.manifest
-+#endif
- 
- ; Modules
- @BINPATH@/browser/modules/*
-@@ -597,16 +600,20 @@
  
  ; Modules
  @BINPATH@/browser/modules/*
@@ -336,8 +242,8 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  
  ; ANGLE GLES-on-D3D rendering library
  #ifdef MOZ_ANGLE_RENDERER
-@@ -570,10 +640,12 @@
- @BINPATH@/browser/chrome/pdfjs/*
+@@ -628,10 +676,12 @@
+ #endif
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 +#ifndef LIBXUL_SDK
@@ -349,7 +255,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  #ifdef MOZ_GTK
  @BINPATH@/browser/chrome/icons/default/default16.png
  @BINPATH@/browser/chrome/icons/default/default32.png
-@@ -596,9 +668,11 @@
+@@ -661,9 +711,11 @@
  ; All the pref files must be part of base to prevent migration bugs
  @BINPATH@/browser/@PREF_DIR@/firefox.js
  @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
@@ -361,7 +267,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/defaults/profile/prefs.js
  
  #ifndef LIBXUL_SDK
-@@ -608,7 +682,7 @@
+@@ -673,7 +725,7 @@
  @BINPATH@/defaults/pref/channel-prefs.js
  #else
  ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
@@ -370,7 +276,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  #endif
  
  ; Services (gre) prefs
-@@ -616,11 +690,14 @@
+@@ -681,11 +733,14 @@
  @BINPATH@/defaults/pref/services-notifications.js
  #endif
  #ifdef MOZ_SERVICES_SYNC
@@ -385,7 +291,14 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/res/EditorOverride.css
  @BINPATH@/res/contenteditable.css
  @BINPATH@/res/designmode.css
-@@ -663,6 +740,7 @@
+@@ -723,11 +778,14 @@
+ #ifdef XP_MACOSX
+ @BINPATH@/res/MainMenu.nib/
+ #endif
++#endif
+ 
+ ; svg
++#ifndef LIBXUL_SDK
  @BINPATH@/res/svg.css
  @BINPATH@/components/dom_svg.xpt
  @BINPATH@/components/dom_smil.xpt
@@ -393,7 +306,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  
  ; [Personal Security Manager]
  ;
-@@ -683,11 +761,13 @@
+@@ -748,11 +806,13 @@
  #endif
  @BINPATH@/@DLL_PREFIX at softokn3@DLL_SUFFIX@
  #endif
@@ -405,15 +318,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/pippki.xpt
 +#endif
  
- ; for Solaris SPARC
- #ifdef SOLARIS
-@@ -907,9 +907,11 @@
+ ; For content sandboxing
+ #if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+@@ -859,9 +919,11 @@
  @BINPATH@/metro/modules
  #endif
  
 +#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/mozilla-firefox.git/commitdiff/08ccc3c53a37c91a941fab9aad6c8d29fc076f07

More information about the pld-cvs-commit mailing list