forked from pool/MozillaFirefox
- update to Firefox 33.0 (bnc#900941)
New features: * OpenH264 support (sandboxed) * Enhanced Tiles * Improved search experience through the location bar * Slimmer and faster JavaScript strings * New CSP (Content Security Policy) backend * Support for connecting to HTTP proxy over HTTPS * Improved reliability of the session restoration * Proprietary window.crypto properties/functions removed - requires NSPR 4.10.7 - requires NSS 3.17.1 - removed obsolete patches: * mozilla-ppc.patch * mozilla-libproxy-compat.patch - added basic appdata information OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=399
This commit is contained in:
parent
ab5934fcc8
commit
2f02270073
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 11 08:48:24 UTC 2014 - wr@rosenauer.org
|
||||
|
||||
- update to Firefox 33.0 (bnc#900941)
|
||||
New features:
|
||||
* OpenH264 support (sandboxed)
|
||||
* Enhanced Tiles
|
||||
* Improved search experience through the location bar
|
||||
* Slimmer and faster JavaScript strings
|
||||
* New CSP (Content Security Policy) backend
|
||||
* Support for connecting to HTTP proxy over HTTPS
|
||||
* Improved reliability of the session restoration
|
||||
* Proprietary window.crypto properties/functions removed
|
||||
- requires NSPR 4.10.7
|
||||
- requires NSS 3.17.1
|
||||
- removed obsolete patches:
|
||||
* mozilla-ppc.patch
|
||||
* mozilla-libproxy-compat.patch
|
||||
- added basic appdata information
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 20 13:33:51 UTC 2014 - wr@rosenauer.org
|
||||
|
||||
|
@ -17,8 +17,8 @@
|
||||
#
|
||||
|
||||
|
||||
%define major 32
|
||||
%define mainver %major.0.2
|
||||
%define major 33
|
||||
%define mainver %major.0
|
||||
%define update_channel release
|
||||
|
||||
%if %suse_version > 1210
|
||||
@ -54,8 +54,8 @@ BuildRequires: libproxy-devel
|
||||
%else
|
||||
BuildRequires: wireless-tools
|
||||
%endif
|
||||
BuildRequires: mozilla-nspr-devel >= 4.10.6
|
||||
BuildRequires: mozilla-nss-devel >= 3.16.4
|
||||
BuildRequires: mozilla-nspr-devel >= 4.10.7
|
||||
BuildRequires: mozilla-nss-devel >= 3.17.1
|
||||
BuildRequires: nss-shared-helper-devel
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
%if %suse_version > 1210
|
||||
@ -74,7 +74,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
|
||||
%endif
|
||||
Version: %{mainver}
|
||||
Release: 0
|
||||
%define releasedate 2014092000
|
||||
%define releasedate 2014101000
|
||||
Provides: firefox = %{mainver}
|
||||
Provides: firefox = %{version}-%{release}
|
||||
Provides: web_browser
|
||||
@ -102,6 +102,7 @@ Source11: firefox.1
|
||||
Source12: mozilla-get-app-id
|
||||
Source13: add-plugins.sh.in
|
||||
Source14: create-tar.sh
|
||||
Source15: firefox-appdata.xml
|
||||
# Gecko/Toolkit
|
||||
Patch1: toolkit-download-folder.patch
|
||||
Patch2: mozilla-nongnome-proxies.patch
|
||||
@ -115,9 +116,6 @@ Patch9: mozilla-repo.patch
|
||||
Patch10: mozilla-sle11.patch
|
||||
Patch11: mozilla-icu-strncat.patch
|
||||
Patch12: mozilla-arm-disable-edsp.patch
|
||||
Patch13: mozilla-ppc.patch
|
||||
Patch14: mozilla-libproxy-compat.patch
|
||||
|
||||
# Firefox/browser
|
||||
Patch101: firefox-kde.patch
|
||||
Patch102: firefox-kde-114.patch
|
||||
@ -255,9 +253,6 @@ cd $RPM_BUILD_DIR/mozilla
|
||||
%endif
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
|
||||
# Firefox
|
||||
%patch101 -p1
|
||||
%if %suse_version >= 1140
|
||||
@ -450,6 +445,9 @@ install -m 644 %{SOURCE1} \
|
||||
# additional mime-types
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
|
||||
cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
|
||||
# appdata
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
cp %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/appdata/%{desktop_file_name}.appdata.xml
|
||||
# install man-page
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
|
||||
cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1
|
||||
@ -614,6 +612,7 @@ exit 0
|
||||
%{_datadir}/applications/%{desktop_file_name}.desktop
|
||||
%{_datadir}/mime/packages/%{progname}.xml
|
||||
%{_datadir}/pixmaps/firefox*
|
||||
%{_datadir}/appdata/
|
||||
%dir %{_datadir}/mozilla
|
||||
%dir %{_datadir}/mozilla/extensions
|
||||
%dir %{_datadir}/mozilla/extensions/%{firefox_appid}
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f2b695fb8fdc9ab44ec1187eb30726c0689b4fffbddafb49f2edcb706a6a0b3
|
||||
oid sha256:d3cccc117bcca233b9a17da85b479c57f6aceeb080ac17d8c9b300f8ea272318
|
||||
size 28432
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
CHANNEL="release"
|
||||
BRANCH="releases/mozilla-$CHANNEL"
|
||||
RELEASE_TAG="FIREFOX_32_0_2_RELEASE"
|
||||
VERSION="32.0.2"
|
||||
RELEASE_TAG="FIREFOX_33_0_RELEASE"
|
||||
VERSION="33.0"
|
||||
|
||||
# mozilla
|
||||
if [ -d mozilla ]; then
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42a568ca3517cfc1bb934a2acc9fcf8d087941f44b580708ace46348aead6256
|
||||
size 127358108
|
3
firefox-33.0-source.tar.xz
Normal file
3
firefox-33.0-source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:63c904a680581793a3c071bb1d81586a8102709d5d377bd0864727a11e2b9079
|
||||
size 131614988
|
31
firefox-appdata.xml
Normal file
31
firefox-appdata.xml
Normal file
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
||||
|
||||
<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
|
||||
BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
|
||||
SentUpstream: 2014-09-22
|
||||
-->
|
||||
|
||||
<application>
|
||||
<id type="desktop">firefox.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<description>
|
||||
<p>
|
||||
Bringing together all kinds of awesomeness to make browsing better for you.
|
||||
Get to your favorite sites quickly – even if you don’t remember the URLs.
|
||||
Type your term into the location bar (aka the Awesome Bar) and the autocomplete
|
||||
function will include possible matches from your browsing history, bookmarked
|
||||
sites and open tabs.
|
||||
</p>
|
||||
<!-- FIXME: Needs another couple of paragraphs -->
|
||||
</description>
|
||||
<url type="homepage">http://www.mozilla.org/en-US/</url>
|
||||
<screenshots>
|
||||
<!-- FIXME: Needs an official up to date screenshot -->
|
||||
<screenshot type="default">https://wiki.mozilla.org/images/e/e1/Bon_Echo_Beta_2_Screen_Shot_1.PNG</screenshot>
|
||||
</screenshots>
|
||||
<!-- FIXME: change this to an upstream email address for spec updates
|
||||
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
|
||||
-->
|
||||
</application>
|
||||
|
@ -1,5 +1,5 @@
|
||||
# HG changeset patch
|
||||
# Parent 17ccae9100af86bc65f924b87545184af2f4ada9
|
||||
# Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e
|
||||
|
||||
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
||||
--- a/browser/app/Makefile.in
|
||||
@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
|
||||
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
|
||||
@@ -629,18 +629,21 @@
|
||||
@@ -623,18 +623,21 @@
|
||||
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
||||
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
||||
@BINPATH@/chrome/toolkit@JAREXT@
|
||||
@ -71,8 +71,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
|
||||
#endif
|
||||
|
||||
; [Webide Files]
|
||||
#ifdef MOZ_DEVTOOLS_WEBIDE
|
||||
@BINPATH@/browser/chrome/webide@JAREXT@
|
||||
@BINPATH@/browser/chrome/webide.manifest
|
||||
@BINPATH@/browser/@PREF_DIR@/webide-prefs.js
|
||||
#endif
|
||||
|
||||
; shell icons
|
||||
|
@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/browser/base/content/browser-kde.xul
|
||||
@@ -0,0 +1,1206 @@
|
||||
@@ -0,0 +1,1238 @@
|
||||
+#filter substitution
|
||||
+<?xml version="1.0"?>
|
||||
+# -*- Mode: HTML -*-
|
||||
@ -181,7 +181,7 @@ new file mode 100644
|
||||
+ </row>
|
||||
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
|
||||
+ <hbox id="editBookmarkPanelBottomButtons" pack="end">
|
||||
+#ifdef XP_UNIX
|
||||
+#ifndef XP_UNIX
|
||||
+ <button id="editBookmarkPanelDoneButton"
|
||||
+ class="editBookmarkPanelBottomButton"
|
||||
+ label="&editBookmark.done.label;"
|
||||
@ -272,16 +272,48 @@ new file mode 100644
|
||||
+ noautofocus="true"
|
||||
+ position="topcenter topright"/>
|
||||
+
|
||||
+ <panel id="loop-notification-panel"
|
||||
+ class="loop-panel social-panel"
|
||||
+ type="arrow"
|
||||
+ hidden="true"
|
||||
+ noautofocus="true"/>
|
||||
+
|
||||
+ <panel id="loop-panel"
|
||||
+ class="loop-panel social-panel"
|
||||
+ type="arrow"
|
||||
+ orient="horizontal"
|
||||
+ hidden="true"/>
|
||||
+
|
||||
+ <menupopup id="toolbar-context-menu"
|
||||
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
|
||||
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
|
||||
+ accesskey="&customizeMenu.moveToPanel.accesskey;"
|
||||
+ label="&customizeMenu.moveToPanel.label;"
|
||||
+ contexttype="toolbaritem"
|
||||
+ class="customize-context-moveToPanel"/>
|
||||
+ <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
|
||||
+ accesskey="&customizeMenu.removeFromToolbar.accesskey;"
|
||||
+ label="&customizeMenu.removeFromToolbar.label;"
|
||||
+ contexttype="toolbaritem"
|
||||
+ class="customize-context-removeFromToolbar"/>
|
||||
+ <menuitem id="toolbar-context-reloadAllTabs"
|
||||
+ class="toolbaritem-tabsmenu"
|
||||
+ contexttype="tabbar"
|
||||
+ oncommand="gBrowser.reloadAllTabs();"
|
||||
+ label="&toolbarContextMenu.reloadAllTabs.label;"
|
||||
+ accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/>
|
||||
+ <menuitem id="toolbar-context-bookmarkAllTabs"
|
||||
+ class="toolbaritem-tabsmenu"
|
||||
+ contexttype="tabbar"
|
||||
+ command="Browser:BookmarkAllTabs"
|
||||
+ label="&toolbarContextMenu.bookmarkAllTabs.label;"
|
||||
+ accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/>
|
||||
+ <menuitem id="toolbar-context-undoCloseTab"
|
||||
+ class="toolbaritem-tabsmenu"
|
||||
+ contexttype="tabbar"
|
||||
+ label="&toolbarContextMenu.undoCloseTab.label;"
|
||||
+ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
|
||||
+ observes="History:UndoCloseTab"/>
|
||||
+ <menuseparator/>
|
||||
+ <menuseparator id="viewToolbarsMenuSeparator"/>
|
||||
+ <!-- XXXgijs: we're using oncommand handler here to avoid the event being
|
||||
@ -536,8 +568,7 @@ new file mode 100644
|
||||
+#endif
|
||||
+#endif
|
||||
+ context="toolbar-context-menu">
|
||||
+ <toolbaritem id="menubar-items" align="center"
|
||||
+ cui-areatype="toolbar">
|
||||
+ <toolbaritem id="menubar-items" align="center">
|
||||
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
|
||||
+# hiddenWindow.xul.
|
||||
+#include browser-menubar.inc
|
||||
@ -574,7 +605,6 @@ new file mode 100644
|
||||
+ flex="1"
|
||||
+ setfocus="false"
|
||||
+ tooltip="tabbrowser-tab-tooltip"
|
||||
+ cui-areatype="toolbar"
|
||||
+ stopwatchid="FX_TAB_CLICK_MS">
|
||||
+ <tab class="tabbrowser-tab" selected="true" fadein="true"/>
|
||||
+ </tabs>
|
||||
@ -605,8 +635,12 @@ new file mode 100644
|
||||
+ key="key_tabview"
|
||||
+ label="&viewTabGroups.label;"
|
||||
+ command="Browser:ToggleTabView"
|
||||
+ cui-areatype="toolbar"
|
||||
+ observes="tabviewGroupsNumber"/>
|
||||
+ <menuitem id="alltabs_undoCloseTab"
|
||||
+ class="menuitem-iconic"
|
||||
+ key="key_undoCloseTab"
|
||||
+ label="&undoCloseTab.label;"
|
||||
+ observes="History:UndoCloseTab"/>
|
||||
+ <menuseparator id="alltabs-popup-separator"/>
|
||||
+ </menupopup>
|
||||
+ </toolbarbutton>
|
||||
@ -640,7 +674,7 @@ new file mode 100644
|
||||
+ aria-label="&navbarCmd.label;"
|
||||
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
||||
+ iconsize="small"
|
||||
+ defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
|
||||
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
|
||||
+ customizationtarget="nav-bar-customization-target"
|
||||
+ overflowable="true"
|
||||
+ overflowbutton="nav-bar-overflow-button"
|
||||
@ -651,12 +685,10 @@ new file mode 100644
|
||||
+ <hbox id="nav-bar-customization-target" flex="1">
|
||||
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
|
||||
+ title="&locationItem.title;" removable="false"
|
||||
+ cui-areatype="toolbar"
|
||||
+ class="chromeclass-location" overflows="false">
|
||||
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ label="&backCmd.label;"
|
||||
+ command="Browser:BackOrBackDuplicate"
|
||||
+ cui-areatype="toolbar"
|
||||
+ onclick="checkForMiddleClick(this, event);"
|
||||
+ tooltip="back-button-tooltip"
|
||||
+ context="backForwardMenu"/>
|
||||
@ -664,7 +696,6 @@ new file mode 100644
|
||||
+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ label="&forwardCmd.label;"
|
||||
+ command="Browser:ForwardOrForwardDuplicate"
|
||||
+ cui-areatype="toolbar"
|
||||
+ onclick="checkForMiddleClick(this, event);"
|
||||
+ tooltip="forward-button-tooltip"
|
||||
+ context="backForwardMenu"/>
|
||||
@ -703,6 +734,8 @@ new file mode 100644
|
||||
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
+ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||
@ -718,6 +751,7 @@ new file mode 100644
|
||||
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
|
||||
+ ondragstart="gIdentityHandler.onDragStart(event);">
|
||||
+ <image id="page-proxy-favicon"
|
||||
+ consumeanchor="identity-box"
|
||||
+ onclick="PageProxyClickHandler(event);"
|
||||
+ pageproxystate="invalid"/>
|
||||
+ <hbox id="identity-icon-labels">
|
||||
@ -759,20 +793,6 @@ new file mode 100644
|
||||
+ <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;"
|
||||
+ cui-areatype="toolbar"
|
||||
+ overflows="false">
|
||||
+ <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
|
||||
+ onpopuphiding="WebrtcIndicator.clearPopup(this);"
|
||||
+ oncommand="WebrtcIndicator.menuCommand(event.target);"/>
|
||||
+ </toolbarbutton>
|
||||
+
|
||||
+ <toolbarbutton id="bookmarks-menu-button"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ persist="class"
|
||||
@ -902,6 +922,21 @@ new file mode 100644
|
||||
+ cui-areatype="toolbar"
|
||||
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
|
||||
+
|
||||
+ <!-- XXX Bug 1013989 will provide a label for the button -->
|
||||
+ <!-- This uses badged to be compatible with the social api code it shares.
|
||||
+ We may also want it to be badged in the future, for notification
|
||||
+ purposes. -->
|
||||
+ <toolbarbutton id="loop-call-button"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ persist="class"
|
||||
+ type="badged"
|
||||
+ removable="true"
|
||||
+ tooltiptext="&loopCallButton.tooltip;"
|
||||
+ oncommand="LoopUI.openCallPanel(event);"
|
||||
+ cui-areatype="toolbar"
|
||||
+ >
|
||||
+ </toolbarbutton>
|
||||
+
|
||||
+
|
||||
+ <toolbarbutton id="social-share-button"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
@ -915,17 +950,15 @@ new file mode 100644
|
||||
+
|
||||
+ <toolbarbutton id="nav-bar-overflow-button"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
|
||||
+ cui-areatype="toolbar"
|
||||
+ skipintoolbarset="true"
|
||||
+ tooltiptext="&navbarOverflow.label;"/>
|
||||
+
|
||||
+ <toolbaritem id="PanelUI-button"
|
||||
+ class="chromeclass-toolbar-additional"
|
||||
+ cui-areatype="toolbar"
|
||||
+ removable="false">
|
||||
+ <toolbarbutton id="PanelUI-menu-button"
|
||||
+ class="toolbarbutton-1"
|
||||
+ cui-areatype="toolbar"
|
||||
+ consumeanchor="PanelUI-button"
|
||||
+ label="&brandShortName;"
|
||||
+ tooltiptext="&appmenu.tooltip;"/>
|
||||
+ </toolbaritem>
|
||||
@ -941,7 +974,6 @@ new file mode 100644
|
||||
+# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
|
||||
+# to exit fullscreen and want it to behave like other toolbar buttons.
|
||||
+ class="toolbarbutton-1"
|
||||
+ cui-areatype="toolbar"
|
||||
+#endif
|
||||
+ tooltiptext="&fullScreenRestore.tooltip;"
|
||||
+ oncommand="BrowserFullScreen();"/>
|
||||
@ -1142,7 +1174,7 @@ new file mode 100644
|
||||
+ <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
|
||||
+ <vbox id="full-screen-approval-pane" align="center">
|
||||
+ <hbox>
|
||||
+#ifndef XP_UNIX
|
||||
+#ifdef XP_UNIX
|
||||
+ <button label="&fullscreenExitButton.label;"
|
||||
+ oncommand="FullScreen.setFullscreenAllowed(false);"
|
||||
+ class="full-screen-approval-button"/>
|
||||
@ -1209,6 +1241,47 @@ new file mode 100644
|
||||
+</deck>
|
||||
+
|
||||
+</window>
|
||||
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
|
||||
--- a/browser/base/content/browser.xul
|
||||
+++ b/browser/base/content/browser.xul
|
||||
@@ -171,17 +171,17 @@
|
||||
class="editBookmarkPanelHeaderButton"
|
||||
oncommand="StarUI.removeBookmarkButtonCommand();"
|
||||
accesskey="&editBookmark.removeBookmark.accessKey;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</row>
|
||||
<vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
|
||||
<hbox id="editBookmarkPanelBottomButtons" pack="end">
|
||||
-#ifndef XP_UNIX
|
||||
+#ifdef XP_UNIX
|
||||
<button id="editBookmarkPanelDoneButton"
|
||||
class="editBookmarkPanelBottomButton"
|
||||
label="&editBookmark.done.label;"
|
||||
default="true"
|
||||
oncommand="StarUI.panel.hidePopup();"/>
|
||||
<button id="editBookmarkPanelDeleteButton"
|
||||
class="editBookmarkPanelBottomButton"
|
||||
label="&editBookmark.cancel.label;"
|
||||
@@ -1164,17 +1164,17 @@
|
||||
|
||||
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
|
||||
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
|
||||
<vbox id="full-screen-warning-message" align="center">
|
||||
<description id="full-screen-domain-text"/>
|
||||
<description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
|
||||
<vbox id="full-screen-approval-pane" align="center">
|
||||
<hbox>
|
||||
-#ifdef XP_UNIX
|
||||
+#ifndef XP_UNIX
|
||||
<button label="&fullscreenExitButton.label;"
|
||||
oncommand="FullScreen.setFullscreenAllowed(false);"
|
||||
class="full-screen-approval-button"/>
|
||||
<button label="&fullscreenAllowButton.label;"
|
||||
oncommand="FullScreen.setFullscreenAllowed(true);"
|
||||
class="full-screen-approval-button"/>
|
||||
#else
|
||||
<button label="&fullscreenAllowButton.label;"
|
||||
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
||||
--- a/browser/base/jar.mn
|
||||
+++ b/browser/base/jar.mn
|
||||
@ -1317,7 +1390,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
|
||||
// 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.
|
||||
@@ -875,14 +881,25 @@ var gAdvancedPane = {
|
||||
@@ -889,14 +895,25 @@ var gAdvancedPane = {
|
||||
* Set browser as the operating system default browser.
|
||||
*/
|
||||
setDefaultBrowser: function()
|
||||
@ -1799,7 +1872,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -666,19 +666,21 @@
|
||||
@@ -658,19 +658,21 @@
|
||||
@BINPATH@/defaults/autoconfig/prefcalls.js
|
||||
@BINPATH@/browser/defaults/profile/prefs.js
|
||||
|
||||
|
@ -1,19 +1,19 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent b7bc98abc45462dec0f6603f3c9a88e772172f29
|
||||
# Parent 39f441dc7ba560595404d47506b0ce70180f99fd
|
||||
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
|
||||
|
||||
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
|
||||
@@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www.
|
||||
pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org");
|
||||
@@ -259,17 +259,17 @@ pref("browser.uitour.whitelist.add.260",
|
||||
pref("browser.uitour.whitelist.add.340", "about:home");
|
||||
|
||||
pref("browser.customizemode.tip0.shown", false);
|
||||
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
|
||||
|
||||
pref("keyword.enabled", true);
|
||||
pref("browser.fixup.domainwhitelist.localhost", true);
|
||||
|
||||
-pref("general.useragent.locale", "@AB_CD@");
|
||||
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7c713ff9f70eb1cd909c95c0fd0b235dc4c0ca6a98c8ec7970452d74135f76c4
|
||||
size 40971896
|
3
l10n-33.0.tar.xz
Normal file
3
l10n-33.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5904c4c5ad5df00fae68afde41edb371d561f558b9818cad82e990455e1b7e46
|
||||
size 41114040
|
@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
|
||||
#include "prefread.h"
|
||||
#include "prefapi_private_data.h"
|
||||
|
||||
@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
|
||||
@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
|
||||
|
||||
static nsresult pref_LoadPrefsInDirList(const char *listId)
|
||||
{
|
||||
@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
|
||||
return NS_OK;
|
||||
|
||||
bool hasMore;
|
||||
@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList(
|
||||
@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList(
|
||||
|
||||
nsAutoCString leaf;
|
||||
path->GetNativeLeafName(leaf);
|
||||
@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
|
||||
{
|
||||
nsZipItemPtr<char> manifest(jarReader, name, true);
|
||||
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
|
||||
@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects(
|
||||
@@ -1296,26 +1315,38 @@ 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)
|
||||
@ -268,7 +268,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
|
||||
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
||||
--- a/toolkit/content/jar.mn
|
||||
+++ b/toolkit/content/jar.mn
|
||||
@@ -55,29 +55,33 @@ toolkit.jar:
|
||||
@@ -54,29 +54,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)
|
||||
@ -306,7 +306,7 @@ diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/di
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/toolkit/content/widgets/dialog-kde.xml
|
||||
@@ -0,0 +1,449 @@
|
||||
@@ -0,0 +1,455 @@
|
||||
+<?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
|
||||
@ -340,9 +340,9 @@ new file mode 100644
|
||||
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
|
||||
+#elif XP_UNIX
|
||||
+ >
|
||||
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
|
||||
+ <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"/>
|
||||
@ -675,8 +675,14 @@ new file mode 100644
|
||||
+ if (!button.disabled) {
|
||||
+ var noCancel = this._fireButtonEvent(aDlgType);
|
||||
+ if (noCancel) {
|
||||
+ if (aDlgType == "accept" || aDlgType == "cancel")
|
||||
+ if (aDlgType == "accept" || aDlgType == "cancel") {
|
||||
+ var closingEvent = new CustomEvent("dialogclosing", {
|
||||
+ bubbles: true,
|
||||
+ detail: { button: aDlgType },
|
||||
+ });
|
||||
+ this.dispatchEvent(closingEvent);
|
||||
+ window.close();
|
||||
+ }
|
||||
+ }
|
||||
+ return noCancel;
|
||||
+ }
|
||||
@ -2221,7 +2227,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
|
||||
'nsNativeAppSupportDefault.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_X11']:
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
|
||||
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
@ -3092,7 +3098,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
||||
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
|
||||
--- a/widget/gtk/Makefile.in
|
||||
+++ b/widget/gtk/Makefile.in
|
||||
@@ -3,11 +3,13 @@
|
||||
@@ -3,14 +3,16 @@
|
||||
# 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/.
|
||||
|
||||
@ -3106,6 +3112,9 @@ diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
|
||||
CFLAGS += $(TK_CFLAGS)
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
||||
ifdef MOZ_ENABLE_DBUS
|
||||
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
|
||||
endif
|
||||
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
|
||||
--- a/widget/gtk/nsFilePicker.cpp
|
||||
+++ b/widget/gtk/nsFilePicker.cpp
|
||||
|
@ -1,28 +0,0 @@
|
||||
# HG changeset patch
|
||||
# Parent 99164862ccce7947259465dcf9edbf6375d56413
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy
|
||||
Note: Remove that patch when openSUSE 11.2 runs out of any support!
|
||||
|
||||
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||
@@ -67,17 +67,17 @@ nsUnixSystemProxySettings::GetProxyForUR
|
||||
|
||||
if (!mProxyFactory) {
|
||||
mProxyFactory = px_proxy_factory_new();
|
||||
}
|
||||
NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE);
|
||||
|
||||
char **proxyArray = nullptr;
|
||||
proxyArray = px_proxy_factory_get_proxies(mProxyFactory,
|
||||
- PromiseFlatCString(aSpec).get());
|
||||
+ (char *) (PromiseFlatCString(aSpec).get()));
|
||||
NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
|
||||
|
||||
// Translate libproxy's output to PAC string as expected
|
||||
// libproxy returns an array of proxies in the format:
|
||||
// <procotol>://[username:password@]proxy:port
|
||||
// or
|
||||
// direct://
|
||||
//
|
@ -1,90 +0,0 @@
|
||||
# HG changeset patch
|
||||
# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
Bug 746112 - RegExp hang on ppc64 in execute.
|
||||
|
||||
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
|
||||
--- a/js/src/yarr/YarrInterpreter.h
|
||||
+++ b/js/src/yarr/YarrInterpreter.h
|
||||
@@ -162,17 +162,17 @@ struct ByteTerm {
|
||||
, m_invert(invert)
|
||||
{
|
||||
atom.characterClass = characterClass;
|
||||
atom.quantityType = QuantifierFixedCount;
|
||||
atom.quantityCount = 1;
|
||||
inputPosition = inputPos;
|
||||
}
|
||||
|
||||
- ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos)
|
||||
+ ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(false)
|
||||
{
|
||||
atom.subpatternId = subpatternId;
|
||||
atom.parenthesesDisjunction = parenthesesInfo;
|
||||
atom.quantityType = QuantifierFixedCount;
|
||||
atom.quantityCount = 1;
|
||||
@@ -183,17 +183,17 @@ struct ByteTerm {
|
||||
: type(type)
|
||||
, m_capture(false)
|
||||
, m_invert(invert)
|
||||
{
|
||||
atom.quantityType = QuantifierFixedCount;
|
||||
atom.quantityCount = 1;
|
||||
}
|
||||
|
||||
- ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos)
|
||||
+ ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(invert)
|
||||
{
|
||||
atom.subpatternId = subpatternId;
|
||||
atom.quantityType = QuantifierFixedCount;
|
||||
atom.quantityCount = 1;
|
||||
inputPosition = inputPos;
|
||||
diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
|
||||
--- a/js/src/yarr/YarrPattern.h
|
||||
+++ b/js/src/yarr/YarrPattern.h
|
||||
@@ -180,17 +180,17 @@ struct PatternTerm {
|
||||
, m_capture(false)
|
||||
, m_invert(invert)
|
||||
{
|
||||
characterClass = charClass;
|
||||
quantityType = QuantifierFixedCount;
|
||||
quantityCount = 1;
|
||||
}
|
||||
|
||||
- PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false)
|
||||
+ PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(invert)
|
||||
{
|
||||
parentheses.disjunction = disjunction;
|
||||
parentheses.subpatternId = subpatternId;
|
||||
parentheses.isCopy = false;
|
||||
parentheses.isTerminal = false;
|
||||
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
|
||||
--- a/memory/mozjemalloc/jemalloc.c
|
||||
+++ b/memory/mozjemalloc/jemalloc.c
|
||||
@@ -1099,17 +1099,17 @@ struct arena_s {
|
||||
static unsigned ncpus;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* When MALLOC_STATIC_SIZES is defined most of the parameters
|
||||
* controlling the malloc behavior are defined as compile-time constants
|
||||
* for best performance and cannot be altered at runtime.
|
||||
*/
|
||||
-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
|
||||
+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__))
|
||||
#define MALLOC_STATIC_SIZES 1
|
||||
#endif
|
||||
|
||||
#ifdef MALLOC_STATIC_SIZES
|
||||
|
||||
/*
|
||||
* VM page size. It must divide the runtime CPU page size or the code
|
||||
* will abort.
|
@ -7,7 +7,7 @@ References:
|
||||
diff --git a/configure.in b/configure.in
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then
|
||||
@@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then
|
||||
MOZ_ENABLE_SKIA_GPU=1
|
||||
AC_DEFINE(USE_SKIA_GPU)
|
||||
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
|
||||
@ -79,7 +79,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
|
||||
#include "nsCertVerificationThread.h"
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS()
|
||||
@@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS()
|
||||
if (NS_FAILED(rv)) {
|
||||
nsPSMInitPanic::SetPanic();
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
@ -115,15 +115,15 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
|
||||
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
|
||||
--- a/toolkit/library/libxul.mk
|
||||
+++ b/toolkit/library/libxul.mk
|
||||
@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid
|
||||
@@ -145,17 +145,17 @@ endif
|
||||
ifdef MOZ_WMF
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids)
|
||||
endif
|
||||
|
||||
ifdef MOZ_DIRECTSHOW
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
|
||||
|
||||
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
|
||||
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
REV=9dcc4d60ede2
|
||||
REV=1f22a8cc7aa5
|
||||
REPO=http://hg.mozilla.org/releases/mozilla-release
|
||||
|
Loading…
Reference in New Issue
Block a user