Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-08-31 09:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-07-30 11:36:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-08-31 09:45:03.000000000 +0200 @@ -1,0 +2,41 @@ +Sun Aug 26 13:47:43 UTC 2012 - wr@rosenauer.org + +- update to Firefox 15.0 (bnc#777588) + * MFSA 2012-57/CVE-2012-1970 + Miscellaneous memory safety hazards + * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 + CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 + CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 + Use-after-free issues found using Address Sanitizer + * MFSA 2012-59/CVE-2012-1956 (bmo#756719) + Location object can be shadowed using Object.defineProperty + * MFSA 2012-60/CVE-2012-3965 (bmo#769108) + Escalation of privilege through about:newtab + * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) + Memory corruption with bitmap format images with negative height + * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 + WebGL use-after-free and memory corruption + * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 + SVG buffer overflow and use-after-free issues + * MFSA 2012-64/CVE-2012-3971 + Graphite 2 memory corruption + * MFSA 2012-65/CVE-2012-3972 (bmo#746855) + Out-of-bounds read in format-number in XSLT + * MFSA 2012-66/CVE-2012-3973 (bmo#757128) + HTTPMonitor extension allows for remote debugging without explicit + activation + * MFSA 2012-68/CVE-2012-3975 (bmo#770684) + DOMParser loads linked resources in extensions when parsing + text/html + * MFSA 2012-69/CVE-2012-3976 (bmo#768568) + Incorrect site SSL certificate data display + * MFSA 2012-70/CVE-2012-3978 (bmo#770429) + Location object security checks bypassed by chrome code + * MFSA 2012-72/CVE-2012-3980 (bmo#771859) + Web console eval capable of executing chrome-privileged code +- fix HTML5 video crash with GStreamer enabled (bmo#761030) +- GStreamer is only used for MP4 (no WebM, OGG) +- updated filelist +- moved browser specific preferences to correct location + +------------------------------------------------------------------- Old: ---- firefox-14.0.1-source.tar.bz2 l10n-14.0.1.tar.bz2 mozilla-dump_syms-static.patch mozilla-gcc47.patch mozilla-yarr-pcre.patch New: ---- firefox-15.0-source.tar.bz2 l10n-15.0.tar.bz2 mozilla-gstreamer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -17,8 +17,8 @@ # -%define major 14 -%define mainver %major.0.1 +%define major 15 +%define mainver %major.0 %define update_channel release Name: MozillaFirefox @@ -44,8 +44,8 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.5 +BuildRequires: mozilla-nspr-devel >= 4.9.1 +BuildRequires: mozilla-nss-devel >= 3.13.6 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 BuildRequires: pkgconfig(gstreamer-0.10) @@ -54,7 +54,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2012071300 +%define releasedate 2012082500 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -91,14 +91,12 @@ Patch7: mozilla-language.patch Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch -Patch10: mozilla-dump_syms-static.patch -Patch11: mozilla-sle11.patch -Patch12: mozilla-disable-neon-option.patch -Patch13: mozilla-yarr-pcre.patch -Patch14: mozilla-gcc47.patch -Patch15: mozilla-arm-disable-edsp.patch -Patch16: mozilla-crashreporter-restart-args.patch -Patch17: mozilla-ppc.patch +Patch10: mozilla-sle11.patch +Patch11: mozilla-disable-neon-option.patch +Patch13: mozilla-arm-disable-edsp.patch +Patch14: mozilla-crashreporter-restart-args.patch +Patch15: mozilla-gstreamer.patch +Patch16: mozilla-ppc.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -220,16 +218,14 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %if %suse_version < 1120 -%patch11 -p1 +%patch10 -p1 %endif -#%patch12 -p1 +#%patch11 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -340,12 +336,10 @@ cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins +mkdir -p $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ # install kde.js %if %suse_version >= 1110 -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js -# make sure that instantApply is true by default -# (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs) -echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox.js +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js %endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ @@ -369,6 +363,7 @@ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org + rm $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/chrome/.mkdir.done # remove prefs, profile defaults, and hyphenation from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation @@ -543,7 +538,6 @@ %{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ -%{progdir}/jssubloader/ %{progdir}/searchplugins/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0_1_RELEASE" -VERSION="14.0.1" +RELEASE_TAG="FIREFOX_15_0_RELEASE" +VERSION="15.0" # mozilla echo "cloning $BRANCH..." ++++++ firefox-14.0.1-source.tar.bz2 -> firefox-15.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-14.0.1-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-15.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 7f0b0738f036cd9d2e51c51c3552dc608ac598f9 +# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -160,16 +160,21 @@ endif +@@ -127,16 +127,21 @@ endif endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -29,7 +29,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ +@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -54,8 +54,8 @@ 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 -@@ -476,18 +476,21 @@ - @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png +@@ -496,18 +496,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif ++++++ firefox-kde-114.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,27 +1,25 @@ # HG changeset patch # User Wolfgang Rosenauer <wr@rosenauer.org> -# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a +# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -705,17 +705,17 @@ var gAdvancedPane = { - shellSvc.setDefaultBrowser(true, false); - if (kde_session == 1) { - var shellObj = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - shellObj.initWithPath("/usr/bin/kwriteconfig"); - var process = Components.classes["@mozilla.org/process/util;1"] - .createInstance(Components.interfaces.nsIProcess); - process.init(shellObj); -- var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"]; - process.run(false, args, args.length); - } - } +@@ -719,15 +719,15 @@ var gAdvancedPane = { + if (kde_session == 1) { + var shellObj = Components.classes["@mozilla.org/file/local;1"] + .createInstance(Components.interfaces.nsILocalFile); + shellObj.initWithPath("/usr/bin/kwriteconfig"); + var process = Components.classes["@mozilla.org/process/util;1"] + .createInstance(Components.interfaces.nsIProcess); + process.init(shellObj); + var args = ["--file", "kdeglobals", "--group", "General", "--key", +- "BrowserApplication", "MozillaFirefox"]; ++ "BrowserApplication", "firefox"]; + process.run(false, args, args.length); } - else { - promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", - [brandShortName]); - psvc.alert(window, promptTitle, promptMessage); + document.getElementById("setDefaultPane").selectedIndex = 1; + } + #endif + }; ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -2,62 +2,14 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1122 @@ +@@ -0,0 +1,1126 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- +# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Mozilla Communicator client code, released -+# March 31, 1998. -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 1998-2000 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Blake Ross <blake@cs.stanford.edu> -+# David Hyatt <hyatt@mozilla.org> -+# Joe Hewitt <hewitt@netscape.com> -+# Pierre Chanial <chanial@noos.fr> -+# Dean Tessman <dean_tessman@hotmail.com> -+# Johnathan Nightingale <johnath@mozilla.com> -+# Dão Gottwald <dao@mozilla.com> -+# Ehsan Akhgari <ehsan.akhgari@gmail.com> -+# Robert Strong <robert.bugzilla@gmail.com> -+# Rob Campbell <rcampbell@mozilla.com> -+# Patrick Walton <pcwalton@mozilla.com> -+# David Dahl <ddahl@mozilla.com> -+# Frank Yan <fyan@mozilla.com> -+# Victor Porof <vporof@mozilla.com> -+# Paul Rouget <paul@mozilla.com> -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** ++# This Source Code Form is subject to the terms of the Mozilla Public ++# 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/. + +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> @@ -257,7 +209,6 @@ + type="checkbox" + label="&viewTabsOnTop.label;" + accesskey="&viewTabsOnTop.accesskey;"/> -+ <menuseparator/> + <menuitem command="cmd_CustomizeToolbars" + label="&viewCustomizeToolbar.label;" + accesskey="&viewCustomizeToolbar.accesskey;"/> @@ -414,7 +365,7 @@ + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> -+ ++ + <tooltip id="forward-button-tooltip"> + <label class="tooltip-label" value="&forwardButton.tooltip;"/> +#ifdef XP_MACOSX @@ -994,9 +945,22 @@ + + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> + <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> -+ <hbox id="full-screen-warning-message"> -+ <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description> -+ </hbox> ++ <vbox id="full-screen-warning-message" align="center"> ++ <description id="full-screen-domain-text"/> ++ <description class="full-screen-description" value="&fullscreenExitHint.value;"/> ++ <vbox id="full-screen-approval-pane" align="center"> ++ <description class="full-screen-description" value="&fullscreenApproval.value;"/> ++ <hbox> ++ <button label="&fullscreenAllowButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(true);" ++ class="full-screen-approval-button"/> ++ <button label="&fullscreenExitButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(false);" ++ class="full-screen-approval-button"/> ++ </hbox> ++ <checkbox id="full-screen-remember-decision"/> ++ </vbox> ++ </vbox> + </hbox> + </hbox> + @@ -1007,9 +971,28 @@ + hidden="true"> +#ifdef XP_MACOSX + <toolbarbutton id="highlighter-closebutton" ++ class="devtools-closebutton" + oncommand="InspectorUI.closeInspectorUI(false);" + tooltiptext="&inspectCloseButton.tooltiptext;"/> +#endif ++ <toolbarbutton id="inspector-option-toolbarbutton" ++ type="menu" ++ tabindex="0" ++ tooltiptext="&inspectOptionButton.tooltiptext;"> ++ <menupopup id="inspector-option-popup" ++ position="before_start"> ++ <menuitem id="inspectorToggleVeil" ++ type="checkbox" ++ label="&inspectorToggleVeil.label;" ++ accesskey="&inspectorToggleVeil.accesskey;" ++ command="Inspector:ToggleVeil"/> ++ <menuitem id="inspectorToggleInfobar" ++ type="checkbox" ++ label="&inspectorToggleInfobar.label;" ++ accesskey="&inspectorToggleInfobar.accesskey;" ++ command="Inspector:ToggleInfobar"/> ++ </menupopup> ++ </toolbarbutton> + <toolbarbutton id="inspector-inspect-toolbutton" + class="devtools-toolbarbutton" + command="Inspector:Inspect"/> @@ -1040,10 +1023,55 @@ + </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"> ++#ifdef XP_MACOSX ++ <toolbarbutton id="developer-toolbar-closebutton" ++ class="devtools-closebutton" ++ oncommand="DeveloperToolbar.hide();" ++ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> ++#endif ++ <stack class="gclitoolbar-stack-node" flex="1"> ++ <hbox class="gclitoolbar-prompt"> ++ <label class="gclitoolbar-prompt-label">»</label> ++ </hbox> ++ <hbox class="gclitoolbar-complete-node"/> ++ <textbox class="gclitoolbar-input-node" rows="1"/> ++ </stack> ++ <toolbarbutton id="developer-toolbar-webconsole" ++ label="&webConsoleButton.label;" ++ class="devtools-toolbarbutton" ++ command="Tools:WebConsole"/> ++ <toolbarbutton id="developer-toolbar-inspector" ++ label="&inspectorButton.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:Inspect"/> ++ <toolbarbutton id="developer-toolbar-responsiveui" ++ label="&responsiveDesignTool.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:ResponsiveUI"/> ++ <toolbarbutton id="developer-toolbar-debugger" ++ label="&scriptsButton.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:Debugger"/> ++#ifndef XP_MACOSX ++ <toolbarbutton id="developer-toolbar-closebutton" ++ class="devtools-closebutton" ++ oncommand="DeveloperToolbar.hide();" ++ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> ++#endif ++ </toolbar> ++ + <toolbar id="addon-bar" + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" + collapsed="true" @@ -1063,58 +1091,34 @@ + +#ifndef XP_UNIX + <svg:svg height="0"> -+ <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> -+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> -+ <svg:circle cx="-0.34" cy="0.5" r="0.61"/> -+ </svg:mask> -+ <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> -+ <svg:circle cx="-11" cy="18" r="15"/> -+ </svg:mask> ++ <svg:clipPath id="winstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> ++ <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="winstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/> ++ </svg:clipPath> + </svg:svg> +#endif +#ifdef XP_MACOSX + <svg:svg height="0"> -+ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> -+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> -+ <svg:circle cx="-0.41" cy="0.5" r="0.65"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:rect x="0" y="-5" width="10000" height="55" fill="white"/> -+ <svg:circle cx="-9" cy="11" r="15"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="9" cy="3" r="3" fill="white"/> -+ <svg:rect x="9" y="0" width="3" height="3" fill="white"/> -+ <svg:rect x="6" y="3" width="6" height="19" fill="white"/> -+ <svg:rect x="1" y="17" width="5" height="5" fill="white"/> -+ <svg:circle cx="1" cy="17" r="5"/> -+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="3" cy="3" r="3" fill="white"/> -+ <svg:rect x="0" y="0" width="3" height="3" fill="white"/> -+ <svg:rect x="0" y="3" width="6" height="19" fill="white"/> -+ <svg:rect x="6" y="17" width="5" height="5" fill="white"/> -+ <svg:circle cx="11" cy="17" r="5"/> -+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="9" cy="20" r="3" fill="white"/> -+ <svg:rect x="9" y="20" width="3" height="3" fill="white"/> -+ <svg:rect x="6" y="1" width="6" height="19" fill="white"/> -+ <svg:rect x="1" y="1" width="5" height="5" fill="white"/> -+ <svg:circle cx="1" cy="6" r="5"/> -+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="3" cy="20" r="3" fill="white"/> -+ <svg:rect x="0" y="20" width="3" height="3" fill="white"/> -+ <svg:rect x="0" y="1" width="6" height="19" fill="white"/> -+ <svg:rect x="6" y="1" width="5" height="5" fill="white"/> -+ <svg:circle cx="11" cy="6" r="5"/> -+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> -+ </svg:mask> ++ <svg:clipPath id="pinstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> ++ <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/> ++ </svg:clipPath> + </svg:svg> +#endif + @@ -1128,7 +1132,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -32,16 +32,18 @@ browser.jar: +@@ -35,16 +35,18 @@ browser.jar: content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) content/browser/abouthome/noise.png (content/abouthome/noise.png) @@ -1150,7 +1154,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp -@@ -41,17 +41,17 @@ +@@ -8,17 +8,17 @@ #include "nsBrowserCompsCID.h" #include "DirectoryProvider.h" @@ -1169,7 +1173,7 @@ #include "rdf.h" #include "nsFeedSniffer.h" -@@ -65,18 +65,16 @@ using namespace mozilla::browser; +@@ -32,18 +32,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1188,7 +1192,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) +@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); @@ -1210,54 +1214,57 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -716,24 +716,42 @@ var gAdvancedPane = { - var brandBundle = document.getElementById("bundleBrand"); - var shellBundle = document.getElementById("bundleShell"); - var brandShortName = brandBundle.getString("brandShortName"); - var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); - var promptMessage; - const IPS = Components.interfaces.nsIPromptService; - var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(IPS); -+ +@@ -23,16 +23,22 @@ var gAdvancedPane = { + if (extraArgs && extraArgs["advancedTab"]){ + advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); + } else { + var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); + if (preference.value !== null) + advancedPrefs.selectedIndex = preference.value; + } + + var env = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") + kde_session = 1; + - if (!shellSvc.isDefaultBrowser(false)) { - promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", - [brandShortName]); - var rv = psvc.confirmEx(window, promptTitle, promptMessage, - IPS.STD_YES_NO_BUTTONS, - null, null, null, null, { }); -- if (rv == 0) -+ if (rv == 0) { - shellSvc.setDefaultBrowser(true, false); -+ if (kde_session == 1) { -+ var shellObj = Components.classes["@mozilla.org/file/local;1"] -+ .createInstance(Components.interfaces.nsILocalFile); -+ shellObj.initWithPath("/usr/bin/kwriteconfig"); -+ var process = Components.classes["@mozilla.org/process/util;1"] -+ .createInstance(Components.interfaces.nsIProcess); -+ process.init(shellObj); -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; -+ process.run(false, args, args.length); -+ } -+ } - } - else { - promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", - [brandShortName]); - psvc.alert(window, promptTitle, promptMessage); - } + #ifdef HAVE_SHELL_SERVICE + this.updateSetDefaultBrowser(); + #endif + #ifdef MOZ_UPDATER + this.updateReadPrefs(); + #endif + this.updateOfflineApps(); + #ifdef MOZ_CRASHREPORTER +@@ -715,12 +721,23 @@ var gAdvancedPane = { + * Set browser as the operating system default browser. + */ + setDefaultBrowser: function() + { + let shellSvc = getShellService(); + if (!shellSvc) + return; + shellSvc.setDefaultBrowser(true, false); ++ if (kde_session == 1) { ++ var shellObj = Components.classes["@mozilla.org/file/local;1"] ++ .createInstance(Components.interfaces.nsILocalFile); ++ shellObj.initWithPath("/usr/bin/kwriteconfig"); ++ var process = Components.classes["@mozilla.org/process/util;1"] ++ .createInstance(Components.interfaces.nsIProcess); ++ process.init(shellObj); ++ var args = ["--file", "kdeglobals", "--group", "General", "--key", ++ "BrowserApplication", "MozillaFirefox"]; ++ process.run(false, args, args.length); ++ } + document.getElementById("setDefaultPane").selectedIndex = 1; } #endif + }; diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in -@@ -51,17 +51,18 @@ endif +@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1 ifeq ($(OS_ARCH),WINNT) CPPSRCS = nsWindowsShellService.cpp @@ -1720,8 +1727,8 @@ 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 -@@ -501,18 +501,20 @@ - @BINPATH@/@PREF_DIR@/services-sync.js +@@ -520,18 +520,20 @@ + @BINPATH@/@PREF_DIR@/services-aitc.js #endif @BINPATH@/greprefs.js @BINPATH@/defaults/autoconfig/platform.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr@rosenauer.org> -# Parent dd43958a61127a39cb7e59ba6118a57b685255e2 +# Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr +@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr +@@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) @@ -95,7 +95,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -103,16 +103,17 @@ +@@ -108,16 +108,17 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) @@ -108,8 +108,8 @@ % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) + % locale pdf.js @AB_CD@ %locale/pdfviewer/ + locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) + locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) #ifdef MOZ_WEBAPP_RUNTIME % locale webapprt @AB_CD@ %locale/webapprt/ - locale/webapprt/webapp.dtd (%webapprt/webapp.dtd) - locale/webapprt/webapp.properties (%webapprt/webapp.properties) - #endif ++++++ l10n-14.0.1.tar.bz2 -> l10n-15.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-14.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-15.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-crashreporter-restart-args.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr@rosenauer.org> -# Parent 0373328cfcb6ad3995f53598e974d61252ddebf4 +# Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp -@@ -1353,32 +1353,25 @@ nsresult +@@ -1360,32 +1360,25 @@ nsresult SetRestartArgs(int argc, char** argv) { if (!gExceptionHandler) ++++++ mozilla-gstreamer.patch ++++++ # HG changeset patch # Parent a9a49c20c491011f981b6c110aadfa6a01a1431e # User Wolfgang Rosenauer <wr@rosenauer.org> Bug 761030 - Crash with HTML 5 video with gstreamer enabled (TM: 16) No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -2278,21 +2278,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_OGG if (IsOggType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WAVE if (IsWaveType(aType)) { nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); @@ -2306,21 +2302,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WEBM if (IsWebMType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_GSTREAMER if (IsH264Type(aType)) { diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp --- a/content/media/gstreamer/nsGStreamerReader.cpp +++ b/content/media/gstreamer/nsGStreamerReader.cpp @@ -447,16 +447,18 @@ bool nsGStreamerReader::DecodeVideoFrame for(int i = 0; i < 3; i++) { b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i, width, height); b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width); b.mPlanes[i].mHeight = gst_video_format_get_component_height(format, i, height); b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, i, width); + b.mPlanes[i].mOffset = 0; + b.mPlanes[i].mSkip = 0; } bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); /* XXX ? */ PRInt64 offset = 0; VideoData *video = VideoData::Create(mInfo, mDecoder->GetImageContainer(), ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.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 -@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -27,7 +27,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp -@@ -57,16 +57,17 @@ +@@ -23,16 +23,17 @@ #include "nsIStringEnumerator.h" #include "nsIZipReader.h" #include "nsPrefBranch.h" @@ -45,7 +45,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +80,7 @@ return NS_OK; bool hasMore; -@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList( nsCAutoString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +99,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( +@@ -1036,28 +1055,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) @@ -143,8 +143,7 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ - nsDownloadManagerUI.js \ +@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \ nsDownloadManagerUI.manifest \ $(NULL) endif @@ -152,13 +151,15 @@ TEST_DIRS += test include $(topsrcdir)/config/rules.mk -+ + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + ++ + CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -74,16 +74,20 @@ +@@ -35,16 +35,20 @@ #ifdef XP_WIN #include <shlobj.h> @@ -179,7 +180,7 @@ #include "AndroidBridge.h" #endif -@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +206,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2269,19 +2282,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 @@ -220,7 +221,7 @@ } + } - #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) + #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2) nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); nsCOMPtr<nsIFile> file; nsAutoString path; @@ -230,7 +231,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -44,29 +44,33 @@ toolkit.jar: +@@ -45,29 +45,33 @@ toolkit.jar: *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/browser.xml (widgets/browser.xml) @@ -268,8 +269,12 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,447 @@ +@@ -0,0 +1,451 @@ +<?xml version="1.0"?> ++<!-- This Source Code Form is subject to the terms of the Mozilla Public ++ - 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/. --> ++ + +<bindings id="dialogBindings" + xmlns="http://www.mozilla.org/xbl" @@ -300,7 +305,7 @@ + pack="end"> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="cancel" class="dialog-button"/> @@ -720,7 +725,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1373 @@ +@@ -0,0 +1,1339 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1307,8 +1312,8 @@ + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX + pack="end"> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> @@ -1985,9 +1990,9 @@ + <handlers> + <handler event="command"> + // This "command" event handler tracks changes made to preferences by -+ // the user in this window. -+ if (event.sourceEvent) -+ event = event.sourceEvent; ++ // the user in this window. ++ if (event.sourceEvent) ++ event = event.sourceEvent; + this.userChangedValue(event.target); + </handler> + <handler event="select"> @@ -2046,43 +2051,9 @@ +</bindings> + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is the Preferences System. -+# -+# The Initial Developer of the Original Code is -+# Ben Goodger. -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Ben Goodger <ben@mozilla.org> -+# Josh Aas <josh@mozilla.com> -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** ++# This Source Code Form is subject to the terms of the Mozilla Public ++# 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/. + +# +# This is PrefWindow 6. The Code Could Well Be Ready, Are You? @@ -2097,7 +2068,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -46,16 +46,18 @@ +@@ -12,16 +12,18 @@ #include "nsArrayUtils.h" #include "prnetdb.h" #include "prenv.h" @@ -2116,7 +2087,7 @@ nsUnixSystemProxySettings() {} nsresult Init(); -@@ -67,16 +69,17 @@ private: +@@ -33,16 +35,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2134,7 +2105,7 @@ nsUnixSystemProxySettings::Init() { // If this is a GNOME session, load gconf and try to use its preferences. -@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR +@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR nsCAutoString host; rv = aURI->GetHost(host); NS_ENSURE_SUCCESS(rv, rv); @@ -2154,7 +2125,7 @@ if (mGConf) return GetProxyFromGConf(scheme, host, port, aResult); -@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID +@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2192,7 +2163,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -100,17 +100,18 @@ else +@@ -69,17 +69,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -2679,7 +2650,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -90,18 +90,19 @@ LOCAL_INCLUDES = -I$(srcdir) +@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ @@ -3047,7 +3018,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,30 +50,33 @@ +@@ -16,30 +16,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -3083,7 +3054,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3108,7 +3079,7 @@ if (*_retval) return NS_OK; -@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3142,7 +3113,7 @@ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIURI> uri; -@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3164,7 +3135,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -@@ -44,17 +44,17 @@ +@@ -10,17 +10,17 @@ #if defined(MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include <QString> @@ -3183,7 +3154,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" #include "nsIFileStreams.h" -@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); if (action.isValid()) @@ -3215,7 +3186,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c +@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c minorType, mime_types_description, true); @@ -3234,7 +3205,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 nsMIMEInfoBase *gnomeInfo = nsnull; if (handler.IsEmpty()) { @@ -3256,7 +3227,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3274,11 +3245,11 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp --- a/widget/gtk2/nsFilePicker.cpp +++ b/widget/gtk2/nsFilePicker.cpp -@@ -33,16 +33,17 @@ - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +@@ -1,16 +1,17 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ #include "mozilla/Util.h" @@ -3292,7 +3263,7 @@ #include "nsIStringBundle.h" #include "nsArrayEnumerator.h" -@@ -51,16 +52,17 @@ +@@ -19,16 +20,17 @@ #include "nsNetUtil.h" #include "nsReadableUtils.h" #include "mozcontainer.h" @@ -3310,7 +3281,7 @@ using namespace mozilla; #define MAX_PREVIEW_SIZE 180 -@@ -285,17 +287,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3331,7 +3302,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat +@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat return NS_ERROR_FAILURE; } @@ -3351,7 +3322,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; -@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3589,7 +3560,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h --- a/widget/gtk2/nsFilePicker.h +++ b/widget/gtk2/nsFilePicker.h -@@ -89,11 +89,17 @@ protected: +@@ -57,11 +57,17 @@ protected: nsString mDefault; nsString mDefaultExtension; @@ -3610,7 +3581,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -91,10 +91,11 @@ LOCAL_INCLUDES = \ +@@ -59,10 +59,11 @@ LOCAL_INCLUDES = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -3625,7 +3596,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -63,16 +63,17 @@ +@@ -30,16 +30,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3643,7 +3614,7 @@ const char* directive; int argc; -@@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL +@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3661,7 +3632,7 @@ NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); nsAutoString appID; -@@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL +@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL CopyUTF8toUTF16(s, abi); abi.Insert(PRUnichar('_'), 0); abi.Insert(osTarget, 0); @@ -3708,7 +3679,7 @@ char *token; char *newline = buf; -@@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL +@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3735,7 +3706,7 @@ #if defined(MOZ_WIDGET_ANDROID) bool tablet = false; if (CheckFlag(kTablet, wtoken, tablet)) { -@@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL +@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL } if (!ok || @@ -3756,7 +3727,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3778,7 +3749,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -90,16 +90,17 @@ +@@ -48,16 +48,17 @@ #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" @@ -3796,7 +3767,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3862,7 +3833,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1861,16 +1869,23 @@ nsLocalFile::Launch() +@@ -1826,16 +1834,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ mozilla-ppc.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 67e6f1e1d06ca3d54cea1d26877c2a68f0c096e5 +# Parent 0f6722dd9d75458124795d22e9240887c9b4aeca # User Wolfgang Rosenauer <wr@rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 @@ -93,23 +93,22 @@ diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h -@@ -49,17 +49,18 @@ - // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then +@@ -50,17 +50,17 @@ // the result is equal to 89255e-22. // The best way to test this, is to create a division-function and to compare // the output of the division with the expected result. (Inlining must be // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) #if defined(_M_X64) || defined(__x86_64__) || \ - defined(__ARMEL__) || \ -- defined(_MIPS_ARCH_MIPS32R2) -+ defined(_MIPS_ARCH_MIPS32R2) || \ -+ defined(__powerpc__) || defined(__powerpc64__) + defined(__ARMEL__) || defined(__avr32__) || \ + defined(__hppa__) || defined(__ia64__) || \ +- defined(__mips__) || defined(__powerpc__) || \ ++ defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #else - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #endif // _WIN32 ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent d50497c25f208e4868a386f081edc790a505795c +# Parent c9af3b8022c3f92070c1bd205553d799887cd1b8 diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in -@@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ +@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) @@ -26,7 +26,7 @@ diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in -@@ -67,17 +67,17 @@ endif +@@ -35,17 +35,17 @@ endif ifeq (Android,$(OS_TARGET)) DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) endif @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -74,7 +74,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -240,20 +240,20 @@ endif +@@ -220,20 +220,20 @@ endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP @@ -91,11 +91,11 @@ + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) - $(call errorIfEmpty,SOURCE_REPO) + + # command set should change based on revision control use. + # warn for now in case (git, bzr, ...) is in use. + $(call warnIfEmpty,SOURCE_REPO) # extra sanity check for old versions of hg, no showconfig support ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) INIARGS += --sourcerepo=$(SOURCE_REPO) - endif - - endif # MOZ_SOURCE_STAMP ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO +@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,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 -@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) +@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ @@ -85,14 +85,12 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -39,16 +39,23 @@ - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. +@@ -1,14 +1,21 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * ***** END LICENSE BLOCK ***** */ + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) @@ -109,7 +107,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +147,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,2 +1,2 @@ -REV=e5728a4e106c +REV=450143d2d810 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org