Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2013-04-06 08:58:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2013-03-15 10:42:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2013-04-06 08:58:10.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Mar 29 22:15:21 UTC 2013 - [email protected] + +- update to Firefox 20.0 (bnc#813026) + * requires NSPR 4.9.5 and NSS 3.14.3 + * mozilla-webrtc-ppc.patch included upstream + * MFSA 2013-30/CVE-2013-0788/CVE-2013-0789 + Miscellaneous memory safety hazards + * MFSA 2013-31/CVE-2013-0800 (bmo#825721) + Out-of-bounds write in Cairo library + * MFSA 2013-35/CVE-2013-0796 (bmo#827106) + WebGL crash with Mesa graphics driver on Linux + * MFSA 2013-36/CVE-2013-0795 (bmo#825697) + Bypass of SOW protections allows cloning of protected nodes + * MFSA 2013-37/CVE-2013-0794 (bmo#626775) + Bypass of tab-modal dialog origin disclosure + * MFSA 2013-38/CVE-2013-0793 (bmo#803870) + Cross-site scripting (XSS) using timed history navigations + * MFSA 2013-39/CVE-2013-0792 (bmo#722831) + Memory corruption while rendering grayscale PNG images +- use GStreamer 1.0 starting with 12.3 (mozilla-gstreamer-1.patch) + +------------------------------------------------------------------- Old: ---- firefox-19.0.2-source.tar.bz2 l10n-19.0.2.tar.bz2 mozilla-webrtc-ppc.patch New: ---- firefox-20.0-source.tar.bz2 l10n-20.0.tar.bz2 mozilla-gstreamer-1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -17,10 +17,16 @@ # -%define major 19 -%define mainver %major.0.2 +%define major 20 +%define mainver %major.0 %define update_channel release +%if %suse_version > 1220 +%define gstreamer_ver 1.0 +%else +%define gstreamer_ver 0.10 +%endif + Name: MozillaFirefox BuildRequires: Mesa-devel BuildRequires: autoconf213 @@ -44,17 +50,17 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.4 -BuildRequires: mozilla-nss-devel >= 3.14.1 +BuildRequires: mozilla-nspr-devel >= 4.9.5 +BuildRequires: mozilla-nss-devel >= 3.14.3 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-app-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) +BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) +BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainver} Release: 0 -%define releasedate 2013030600 +%define releasedate 2013032900 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -95,10 +101,10 @@ Patch10: mozilla-sle11.patch Patch11: mozilla-disable-neon-option.patch Patch12: mozilla-arm-disable-edsp.patch -Patch14: mozilla-ppc.patch -Patch15: mozilla-gstreamer-760140.patch -Patch17: mozilla-libproxy-compat.patch -Patch18: mozilla-webrtc-ppc.patch +Patch13: mozilla-ppc.patch +Patch14: mozilla-gstreamer-760140.patch +Patch15: mozilla-libproxy-compat.patch +Patch16: mozilla-gstreamer-1.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -111,6 +117,7 @@ Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils Requires: %{name}-branding > 4.0 +Conflicts: %{name}-branding > %{version} Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 @@ -230,10 +237,10 @@ %endif #%patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch17 -p1 -%patch18 -p1 +%patch16 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -309,7 +316,7 @@ %endif %if %suse_version > 1140 cat << EOF >> $MOZCONFIG -ac_add_options --enable-gstreamer +ac_add_options --enable-gstreamer=%{gstreamer_ver} EOF %endif %if %branding ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -5,7 +5,7 @@ <size unit="G">9</size> </disk> <memory> - <size unit="M">2500</size> + <size unit="M">2900</size> </memory> </hardware> </constraints> ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_19_0_2_RELEASE" -VERSION="19.0.2" +RELEASE_TAG="FIREFOX_20_0_RELEASE" +VERSION="20.0" # mozilla echo "cloning $BRANCH..." ++++++ firefox-19.0.2-source.tar.bz2 -> firefox-20.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-19.0.2-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-20.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent ab9210b3779914924d12de5a3952d4cc52cd9d78 +# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -133,16 +133,21 @@ endif - endif #} LIBXUL_SDK +@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d + endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: @@ -54,7 +54,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -541,18 +541,21 @@ +@@ -552,18 +552,21 @@ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/[email protected] ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1276 @@ +@@ -0,0 +1,1221 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -49,7 +49,6 @@ + windowtype="navigator:browser" + macanimationtype="document" + screenX="4" screenY="4" -+ browsingmode="normal" + fullscreenbutton="true" + persist="screenX screenY width height sizemode"> + @@ -199,7 +198,7 @@ + <button id="social-undoactivation-button" + label="&social.activated.undobutton.label;" + accesskey="&social.activated.undobutton.accesskey;" -+ onclick="SocialUI.undoActivation();"/> ++ onclick="SocialUI.undoActivation(this);"/> + <button default="true" + autofocus="autofocus" + label="&social.ok.label;" @@ -214,7 +213,7 @@ + <button id="social-undoactivation-button" + label="&social.activated.undobutton.label;" + accesskey="&social.activated.undobutton.accesskey;" -+ onclick="SocialUI.undoActivation();"/> ++ onclick="SocialUI.undoActivation(this);"/> +#endif + </hbox> + </vbox> @@ -283,22 +282,6 @@ + noautofocus="true" + position="topcenter topright"/> + -+ <menupopup id="inspector-node-popup"> -+ <menuitem id="inspectorHTMLCopyInner" -+ label="&inspectorHTMLCopyInner.label;" -+ accesskey="&inspectorHTMLCopyInner.accesskey;" -+ command="Inspector:CopyInner"/> -+ <menuitem id="inspectorHTMLCopyOuter" -+ label="&inspectorHTMLCopyOuter.label;" -+ accesskey="&inspectorHTMLCopyOuter.accesskey;" -+ command="Inspector:CopyOuter"/> -+ <menuseparator/> -+ <menuitem id="inspectorHTMLDelete" -+ label="&inspectorHTMLDelete.label;" -+ accesskey="&inspectorHTMLDelete.accesskey;" -+ command="Inspector:DeleteNode"/> -+ </menupopup> -+ + <menupopup id="toolbar-context-menu" + onpopupshowing="onViewToolbarsPopupShowing(event);"> + <menuseparator/> @@ -465,6 +448,34 @@ + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> ++ ++ <popupnotification id="webRTC-shareDevices-notification" hidden="true"> ++ <popupnotificationcontent id="webRTC-selectCamera" orient="vertical"> ++ <separator class="thin"/> ++ <label value="&getUserMedia.selectCamera.label;" ++ accesskey="&getUserMedia.selectCamera.accesskey;" ++ control="webRTC-selectCamera-menulist"/> ++ <menulist id="webRTC-selectCamera-menulist"> ++ <menupopup id="webRTC-selectCamera-menupopup"/> ++ </menulist> ++ </popupnotificationcontent> ++ <popupnotificationcontent id="webRTC-selectMicrophone" orient="vertical"> ++ <separator class="thin"/> ++ <label value="&getUserMedia.selectMicrophone.label;" ++ accesskey="&getUserMedia.selectMicrophone.accesskey;" ++ control="webRTC-selectMicrophone-menulist"/> ++ <menulist id="webRTC-selectMicrophone-menulist"> ++ <menupopup id="webRTC-selectMicrophone-menupopup"/> ++ </menulist> ++ </popupnotificationcontent> ++ </popupnotification> ++ ++ <popupnotification id="geolocation-notification" hidden="true"> ++ <popupnotificationcontent orient="vertical" align="start"> ++ <separator class="thin"/> ++ <label id="geolocation-learnmore-link" class="text-link"/> ++ </popupnotificationcontent> ++ </popupnotification> + </popupset> + +#ifdef CAN_DRAW_IN_TITLEBAR @@ -522,7 +533,7 @@ + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="large" -+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls" ++ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls" + context="toolbar-context-menu"> + + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" @@ -579,6 +590,8 @@ + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + </box> + <!-- Use onclick instead of normal popup= syntax since the popup + code fires onmousedown, and hence eats our favicon drag events. @@ -654,6 +667,18 @@ + <searchbar id="searchbar" flex="1"/> + </toolbaritem> + ++ <toolbarbutton id="webrtc-status-button" ++ class="toolbarbutton-1 chromeclass-toolbar-additional" ++ type="menu" ++ hidden="true" ++ orient="horizontal" ++ label="&webrtcIndicatorButton.label;" ++ tooltiptext="&webrtcIndicatorButton.tooltip;"> ++ <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);" ++ onpopuphiding="WebrtcIndicator.clearPopup(this);" ++ oncommand="WebrtcIndicator.menuCommand(event.target);"/> ++ </toolbarbutton> ++ + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + persist="class" removable="true" + label="&homeButton.label;" @@ -669,6 +694,7 @@ + removable="false" + title="&socialToolbar.title;" + hidden="true" ++ skipintoolbarset="true" + observes="socialActiveBroadcaster"> + <toolbarbutton id="social-provider-button" + class="toolbarbutton-1" @@ -700,6 +726,7 @@ + label="&social.toggleNotifications.label;" + accesskey="&social.toggleNotifications.accesskey;"/> + <menuseparator class="social-statusarea-separator"/> ++ <menuseparator class="social-provider-menu" hidden="true"/> + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> + <menuitem class="social-remove-menuitem" command="Social:Remove"/> + </menupopup> @@ -893,7 +920,8 @@ + tabbrowser="content" + flex="1" + setfocus="false" -+ tooltip="tabbrowser-tab-tooltip"> ++ tooltip="tabbrowser-tab-tooltip" ++ stopwatchid="FX_TAB_CLICK_MS"> + <tab class="tabbrowser-tab" selected="true" fadein="true"/> + </tabs> + @@ -1048,6 +1076,8 @@ + </toolbarpalette> + </toolbox> + ++ <hbox id="fullscr-toggler" collapsed="true"/> ++ + <hbox flex="1" id="browser"> + <vbox id="browser-border-start" hidden="true" layer="true"/> + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> @@ -1071,19 +1101,6 @@ + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> + <statuspanel id="statusbar-display" inactive="true"/> + </vbox> -+ <splitter id="devtools-side-splitter" hidden="true"/> -+ <vbox id="devtools-sidebar-box" hidden="true" -+ style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> -+ <toolbar id="devtools-sidebar-toolbar" -+ class="devtools-toolbar" -+ nowindowdrag="true"> -+ <spacer flex="1"/> -+ <toolbarbutton tooltiptext="&inspectSidebarCloseButton.tooltiptext;" -+ class="devtools-closebutton" -+ command="Inspector:Sidebar"/> -+ </toolbar> -+ <deck id="devtools-sidebar-deck" flex="1"/> -+ </vbox> + <splitter id="social-sidebar-splitter" + class="chromeclass-extrachrome sidebar-splitter" + observes="socialSidebarBroadcaster"/> @@ -1122,52 +1139,6 @@ + </hbox> + + <vbox id="browser-bottombox" layer="true"> -+ <toolbar id="inspector-toolbar" -+ class="devtools-toolbar" -+ nowindowdrag="true" -+ hidden="true"> -+#ifdef XP_MACOSX -+ <toolbarbutton id="highlighter-closebutton" -+ class="devtools-closebutton" -+ oncommand="InspectorUI.closeInspectorUI(false);" -+ tooltiptext="&inspectCloseButton.tooltiptext;"/> -+#endif -+ <toolbarbutton id="inspector-inspect-toolbutton" -+ class="devtools-toolbarbutton" -+ command="Inspector:Inspect"/> -+ <toolbarbutton id="inspector-treepanel-toolbutton" -+ class="devtools-toolbarbutton" -+ tabindex="0" -+ aria-label="&markupButton.arialabel;" -+ accesskey="&markupButton.accesskey;" -+ command="Inspector:HTMLPanel"/> -+ <arrowscrollbox id="inspector-breadcrumbs" -+ flex="1" orient="horizontal" -+ clicktoscroll="true"/> -+ <hbox id="inspector-tools"> -+ <toolbarbutton id="inspector-3D-button" -+ class="devtools-toolbarbutton" -+ hidden="true" -+ label="&inspect3DViewButton.label;" -+ accesskey="&inspect3DViewButton.accesskey;" -+ tabindex="0" -+ command="Inspector:Tilt"/> -+ <toolbarbutton id="inspector-style-button" -+ class="devtools-toolbarbutton" -+ label="&inspectStyleButton.label;" -+ accesskey="&inspectStyleButton.accesskey;" -+ tabindex="0" -+ command="Inspector:Sidebar"/> -+ <!-- registered tools go here --> -+ </hbox> -+#ifndef XP_MACOSX -+ <toolbarbutton id="highlighter-closebutton" -+ class="devtools-closebutton" -+ oncommand="InspectorUI.closeInspectorUI(false);" -+ tooltiptext="&inspectCloseButton.tooltiptext;"/> -+#endif -+ </toolbar> -+ + <toolbar id="developer-toolbar" + class="devtools-toolbar" + hidden="true"> @@ -1184,36 +1155,10 @@ + <hbox class="gclitoolbar-complete-node"/> + <textbox class="gclitoolbar-input-node" rows="1"/> + </stack> -+ <toolbarbutton id="developer-toolbar-webconsole" -+ class="developer-toolbar-button" -+ observes="devtoolsMenuBroadcaster_WebConsole"/> -+ <toolbarbutton id="developer-toolbar-inspector" ++ <toolbarbutton id="developer-toolbar-toolbox-button" + class="developer-toolbar-button" -+ observes="devtoolsMenuBroadcaster_Inspect"/> -+ <toolbarbutton id="developer-toolbar-styleeditor" -+ class="developer-toolbar-button" -+ observes="devtoolsMenuBroadcaster_StyleEditor"/> -+ <toolbarbutton id="developer-toolbar-debugger" -+ class="developer-toolbar-button" -+ observes="devtoolsMenuBroadcaster_Debugger"/> -+ <toolbarbutton id="developer-toolbar-other-tools" -+ type="menu" -+ class="developer-toolbar-button" -+ label="&devToolbarOtherToolsButton.label;"> -+ <menupopup position="before_end"> -+ <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/> -+ <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/> -+ <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/> -+ <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/> -+ <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/> -+ <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/> -+ <menuitem observes="devtoolsMenuBroadcaster_PageSource"/> -+ <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/> -+ <menuseparator/> -+ <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/> -+ </menupopup> -+ </toolbarbutton> -+ ++ observes="devtoolsMenuBroadcaster_DevToolbox" ++ tooltiptext="&devToolbarToolsButton.tooltip;"/> +#ifndef XP_MACOSX + <toolbarbutton id="developer-toolbar-closebutton" + class="devtools-closebutton" @@ -1282,8 +1227,8 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -50,16 +50,18 @@ browser.jar: - content/browser/abouthome/[email protected] (content/abouthome/[email protected]) +@@ -55,16 +55,18 @@ browser.jar: + content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) #endif content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) @@ -1323,7 +1268,7 @@ #include "rdf.h" #include "nsFeedSniffer.h" -@@ -32,18 +32,16 @@ using namespace mozilla::browser; +@@ -34,18 +34,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1342,9 +1287,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) - #endif +@@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); + #endif static const mozilla::Module::CIDEntry kBrowserCIDs[] = { { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, @@ -1387,7 +1332,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -715,14 +721,25 @@ var gAdvancedPane = { +@@ -791,14 +797,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1849,24 +1794,25 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -578,18 +578,20 @@ - @BINPATH@/@PREF_DIR@/healthreport-prefs.js - #endif - @BINPATH@/greprefs.js - @BINPATH@/defaults/autoconfig/platform.js +@@ -578,19 +578,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js + @BINPATH@/defaults/profile/prefs.js + #ifndef LIBXUL_SDK ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) + ; Technically this is an app pref file, but we are keeping it in the original + ; gre location for now. @BINPATH@/defaults/pref/channel-prefs.js +@BINPATH@/defaults/pref/kde.js #else + ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) @BINPATH@/@PREF_DIR@/channel-prefs.js +@BINPATH@/@PREF_DIR@/kde.js #endif - @BINPATH@/defaults/profile/prefs.js - ; [Layout Engine Resources] - ; Style Sheets, Graphics and other Resources used by the layout engine. - @BINPATH@/res/EditorOverride.css - @BINPATH@/res/contenteditable.css - @BINPATH@/res/designmode.css + ; Services (gre) prefs + #ifdef MOZ_SERVICES_AITC + @BINPATH@/defaults/pref/services-aitc.js + #endif + #ifdef MOZ_SERVICES_NOTIFICATIONS + @BINPATH@/defaults/pref/services-notifications.js ++++++ l10n-19.0.2.tar.bz2 -> l10n-20.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-19.0.2.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-20.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gstreamer-1.patch ++++++ ++++ 692 lines (skipped) ++++++ mozilla-gstreamer-760140.patch ++++++ ++++ 866 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-gstreamer-760140.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-gstreamer-760140.patch ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -54,14 +54,15 @@ endif # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -17,9 +17,8 @@ endif +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre -+ - greprefs.js: $(GREPREF_FILES) + greprefs.js: $(grepref_files) $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@ libs:: greprefs.js @@ -39,13 +38,13 @@ +#include "nsKDEUtils.h" #include "nsQuickSort.h" - #include "prmem.h" #include "pldhash.h" #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -950,16 +951,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char + +@@ -946,16 +947,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -975,17 +994,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -971,17 +990,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1079,28 +1098,40 @@ static nsresult pref_InitInitialObjects( +@@ -1075,28 +1094,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -180,7 +179,7 @@ #include "AndroidBridge.h" #endif -@@ -2740,16 +2744,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2739,16 +2743,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -207,14 +206,14 @@ showTaskbarAlert = goat > alertIntervalUSec; @@ -2775,19 +2788,20 @@ nsDownload::SetState(DownloadState aStat - // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, - message, !removeWhenDone, EmptyString(), mDownloadManager, - EmptyString()); + message, !removeWhenDone, + mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), + mDownloadManager, EmptyString()); - } + } } @@ -1366,7 +1365,7 @@ + if (this.lastSelected) { + lastPane = document.getElementById(this.lastSelected); + if (!lastPane) { -+ this.lastSelected = null; ++ this.lastSelected = ""; + } + } + ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8108,16 +8108,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8275,16 +8275,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,7 +42,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -93,10 +93,13 @@ DEFINES += \ +@@ -92,16 +92,19 @@ DEFINES += \ $(NULL) EXPORTS += \ @@ -54,6 +54,12 @@ +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + + EXPORTS_NAMESPACES = mozilla + + EXPORTS_mozilla += \ + PublicSSL.h \ + $(NULL) + include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp @@ -83,7 +89,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1735,18 +1742,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -123,7 +129,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -500,17 +500,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.jR8vnN/_old 2013-04-06 08:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jR8vnN/_new 2013-04-06 08:58:29.000000000 +0200 @@ -1,2 +1,2 @@ -REV=6ffe3e9da8a8 +REV=c90d44bfa96c REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
