Djam/firefox-esr68
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr68.git synced 2025-02-23 18:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged with mageia and python-env fix added

Browse source
This commit is contained in:
Alexander Khryukin 2012-09-04 11:53:20 -04:00
parent 2bad1134d9
commit c4728835be
26 changed files with 1164 additions and 658 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
firefox-10.0-no_optimizarion_override.diff
View file

@ -1,22 +0,0 @@
--- configure.in 2012-01-29 10:24:22.000000000 +0000
+++ configure.in.oden 2012-02-08 13:00:34.000000000 +0000
@@ -2402,7 +2402,7 @@
MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
esac
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
+ MOZ_OPTIMIZE_FLAGS="-O2 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
MOZ_DEBUG_FLAGS="-g"
fi
--- configure 2012-01-29 10:43:10.000000000 +0000
+++ configure.oden 2012-02-08 13:10:01.000000000 +0000
@@ -7516,7 +7516,7 @@
MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
esac
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
+ MOZ_OPTIMIZE_FLAGS="-O2 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
MOZ_DEBUG_FLAGS="-g"
fi

11
firefox-10.0-nss-binary.patch Normal file
View file

@ -0,0 +1,11 @@
--- toolkit/mozapps/installer/packager.mk.build 2012-03-17 11:59:21.000000000 +0800
+++ toolkit/mozapps/installer/packager.mk 2012-03-17 12:06:59.000000000 +0800
@@ -544,7 +544,7 @@
NSS_DLL_SUFFIX = .DLL
SIGN_CMD = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
else
-SIGN_CMD = $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i
+SIGN_CMD = $(RUN_TEST_PROGRAM) /usr/bin/shlibsign$(BIN_SUFFIX) -v -i
endif
endif

1
firefox-13-fix-cairo-build.patch
View file

@ -34,4 +34,3 @@ index 114cda9..3471966 100644
}
srcBuffer->AddRef();

11
firefox-13-fix-nspr-include.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./hal/sandbox/PHal.ipdl~ 2012-05-23 20:56:44.000000000 +0200
+++ ./hal/sandbox/PHal.ipdl 2012-05-30 01:09:58.750881338 +0200
@@ -39,7 +39,7 @@
include protocol PContent;
include protocol PBrowser;
-include "nspr/prtime.h";
+include "nspr4/prtime.h";
include "mozilla/HalSensor.h";
include "mozilla/HalTypes.h";

59
firefox-15b2-native-nss-nspr.patch Normal file
View file

@ -0,0 +1,59 @@
diff -p -up mozilla-beta/browser/installer/Makefile.in.system-nss-nspr mozilla-beta/browser/installer/Makefile.in
--- mozilla-beta/browser/installer/Makefile.in.system-nss-nspr 2012-07-25 04:15:07.000000000 +0200
+++ mozilla-beta/browser/installer/Makefile.in 2012-07-27 23:32:09.367999971 +0200
@@ -84,6 +84,14 @@ ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
endif
+ifdef MOZ_NATIVE_NSPR
+DEFINES += -DMOZ_NATIVE_NSPR=1
+endif
+
+ifdef MOZ_NATIVE_NSS
+DEFINES += -DMOZ_NATIVE_NSS=1
+endif
+
ifdef NECKO_WIFI
DEFINES += -DNECKO_WIFI
endif
diff -p -up mozilla-beta/browser/installer/package-manifest.in.system-nss-nspr mozilla-beta/browser/installer/package-manifest.in
--- mozilla-beta/browser/installer/package-manifest.in.system-nss-nspr 2012-07-25 04:15:07.000000000 +0200
+++ mozilla-beta/browser/installer/package-manifest.in 2012-07-27 23:51:19.523000278 +0200
@@ -58,9 +58,11 @@
#ifndef MOZ_STATIC_JS
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
#endif
+#ifndef MOZ_NATIVE_NSPR
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+#endif
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
#ifdef XP_MACOSX
@BINPATH@/XUL
@@ -109,7 +111,9 @@
#endif
@BINPATH@/platform.ini
#ifndef XP_OS2
+#ifndef MOZ_NATIVE_SQLITE
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+#endif
#else
@BINPATH@/mozsqlt3@DLL_SUFFIX@
#endif
@@ -579,6 +583,7 @@
; NSS libraries are signed in the staging directory,
; meaning their .chk files are created there directly.
;
+#ifndef MOZ_NATIVE_NSS
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
@@ -589,6 +594,7 @@
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
+#endif
@BINPATH@/chrome/pippki@JAREXT@
@BINPATH@/chrome/pippki.manifest
@BINPATH@/components/pipboot.xpt

33
firefox-3.5.3-default-mail-handler.patch Normal file
View file

@ -0,0 +1,33 @@
diff -p -up ./browser/locales/generic/profile/mimeTypes.rdf.orig ./browser/locales/generic/profile/mimeTypes.rdf
--- ./browser/locales/generic/profile/mimeTypes.rdf.orig 2009-10-19 15:53:21.000000000 -0200
+++ ./browser/locales/generic/profile/mimeTypes.rdf 2009-10-19 15:54:17.000000000 -0200
@@ -10,4 +10,28 @@
</Seq>
</NC:MIME-types>
</Description>
-</RDF>
+
+ <RDF:Seq RDF:about="urn:mimetypes:root">
+ </RDF:Seq>
+ <RDF:Description RDF:about="urn:handler:local:/usr/bin/xdg-email"
+ NC:prettyName="xdg-email"
+ NC:path="/usr/bin/xdg-email" />
+ <RDF:Description RDF:about="urn:scheme:externalApplication:mailto"
+ NC:prettyName="xdg-email"
+ NC:path="/usr/bin/xdg-email" />
+ <RDF:Seq RDF:about="urn:schemes:root">
+ <RDF:li RDF:resource="urn:scheme:mailto"/>
+ </RDF:Seq>
+ <RDF:Description RDF:about="urn:mimetypes">
+ <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
+ </RDF:Description>
+ <RDF:Description RDF:about="urn:scheme:handler:mailto"
+ NC:alwaysAsk="false">
+ <NC:possibleApplication RDF:resource="urn:handler:local:/usr/bin/xdg-email"/>
+ <NC:externalApplication RDF:resource="urn:scheme:externalApplication:mailto"/>
+ </RDF:Description>
+ <RDF:Description RDF:about="urn:scheme:mailto"
+ NC:value="mailto">
+ <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
+ </RDF:Description>
+</RDF:RDF>

1
firefox-5.0-asciidel.patch
View file

@ -13,3 +13,4 @@ diff -up mozilla-release/browser/base/Makefile.in.fu mozilla-release/browser/bas
DEFINES += \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \

14
firefox-3.6.3-appname.patch → firefox-6.0-appname.patch
View file

@ -4,26 +4,16 @@ Subject: Hardcode app starter for default check
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -127,17 +127,21 @@ nsGNOMEShellService::Init()
nsCOMPtr<nsILocalFile> appPath;
rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
getter_AddRefs(appPath));
NS_ENSURE_SUCCESS(rv, rv);
@@ -144,7 +144,11 @@
rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
NS_ENSURE_SUCCESS(rv, rv);
- return appPath->GetNativePath(mAppPath);
+ /* This path to firefox is hardcoded for the default path setting */
+ mAppPath.Assign ("/usr/bin/firefox");
+
+
+ //return appPath->GetNativePath(mAppPath);
+ return NS_OK;
}
NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
PRBool
nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
{

14
firefox-6.0-lang.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 02aa908..e6ff139 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -413,6 +413,9 @@
pref("general.warnOnAboutConfig", false);
#endif
+// Use system environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
// This is the pref to control the location bar, change this to true to
// force this - this makes the origin of popup windows more obvious to avoid
// spoofing. We would rather not do it by default because it affects UE for web

11
firefox-7.0-fix-str-fmt.patch Normal file
View file

@ -0,0 +1,11 @@
--- gfx/2d/Logging.h.str 2011-09-27 03:53:32.000000000 +0200
+++ gfx/2d/Logging.h 2011-09-27 03:53:43.000000000 +0200
@@ -87,7 +87,7 @@
}
#else
if (aLevel >= sGfxLogLevel) {
- printf(aString.c_str());
+ printf("%s",aString.c_str());
}
#endif
}

8
firefox-disable-check-default-browser.patch
View file

@ -1,7 +1,7 @@
diff -p -up mozilla-release/browser/app/profile/firefox.js.defaultbrowser mozilla-release/browser/app/profile/firefox.js
--- mozilla-release/browser/app/profile/firefox.js.defaultbrowser 2012-04-23 10:16:01.000000000 +0200
+++ mozilla-release/browser/app/profile/firefox.js 2012-04-23 10:18:28.965732670 +0200
@@ -250,7 +250,7 @@ pref("general.autoScroll", true);
diff -Naur mozilla/browser/app/profile/firefox.js mozilla.tpg/browser/app/profile/firefox.js
--- mozilla/browser/app/profile/firefox.js 2008-02-04 19:36:22.000000000 +0000
+++ mozilla.tpg/browser/app/profile/firefox.js 2008-02-29 21:26:08.000000000 +0000
@@ -247,7 +247,7 @@ pref("general.autoScroll", true);
#endif
// At startup, check if we're the default browser and prompt user if not.

360
firefox-kde.patch
View file

@ -2,62 +2,14 @@ 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,1116 @@
@@ -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"?>
@ -99,6 +51,7 @@ new file mode 100644
+ macanimationtype="document"
+ screenX="4" screenY="4"
+ browsingmode="normal"
+ fullscreenbutton="true"
+ persist="screenX screenY width height sizemode">
+
+# All JS files which are not content (only) dependent that browser.xul
@ -256,7 +209,6 @@ new file mode 100644
+ type="checkbox"
+ label="&viewTabsOnTop.label;"
+ accesskey="&viewTabsOnTop.accesskey;"/>
+ <menuseparator/>
+ <menuitem command="cmd_CustomizeToolbars"
+ label="&viewCustomizeToolbar.label;"
+ accesskey="&viewCustomizeToolbar.accesskey;"/>
@ -413,7 +365,7 @@ new file mode 100644
+ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+
+
+ <tooltip id="forward-button-tooltip">
+ <label class="tooltip-label" value="&forwardButton.tooltip;"/>
+#ifdef XP_MACOSX
@ -533,6 +485,7 @@ new file mode 100644
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events.
@ -545,9 +498,8 @@ new file mode 100644
+ <hbox id="identity-box-inner" align="center">
+ <hbox id="page-proxy-stack"
+ onclick="PageProxyClickHandler(event);">
+ <image id="page-proxy-favicon" validate="never"
+ pageproxystate="invalid"
+ onerror="this.removeAttribute('src');"/>
+ <image id="page-proxy-favicon"
+ pageproxystate="invalid"/>
+ </hbox>
+ <hbox id="identity-icon-labels">
+ <label id="identity-icon-label" class="plain" flex="1"/>
@ -858,6 +810,9 @@ new file mode 100644
+ label="&printButton.label;" command="cmd_print"
+ tooltiptext="&printButton.tooltip;"/>
+
+ <!-- This is a placeholder for the Downloads Indicator. It is visible
+ only during the customization of the toolbar or in the palette, and
+ is replaced when customization is done. -->
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ observes="Tools:Downloads"
+ ondrop="DownloadsButtonDNDObserver.onDrop(event)"
@ -990,9 +945,22 @@ new file mode 100644
+
+ <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>
+
@ -1003,17 +971,36 @@ new file mode 100644
+ 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"/>
+ <toolbarbutton id="inspector-treepanel-toolbutton"
+ class="devtools-toolbarbutton"
+ label="&htmlPanel.label;"
+ accesskey="&htmlPanel.accesskey;"
+ tooltiptext="&htmlPanel.tooltiptext;"
+ tabindex="0"
+ aria-label="&markupButton.arialabel;"
+ accesskey="&markupButton.accesskey;"
+ command="Inspector:HTMLPanel"/>
+ <arrowscrollbox id="inspector-breadcrumbs"
+ flex="1" orient="horizontal"
@ -1024,20 +1011,67 @@ new file mode 100644
+ hidden="true"
+ label="&inspect3DViewButton.label;"
+ accesskey="&inspect3DViewButton.accesskey;"
+ tabindex="0"
+ command="Inspector:Tilt"/>
+ <toolbarbutton id="inspector-style-button"
+ class="devtools-toolbarbutton"
+ label="&inspectStyleButton.label;"
+ accesskey="&inspectStyleButton.accesskey;"
+ tabindex="0"
+ command="Inspector:Sidebar"/>
+ <!-- registered tools go here -->
+ </hbox>
+#ifndef XP_MACOSX
+ <toolbarbutton id="highlighter-closebutton"
+ class="devtools-closebutton"
+ oncommand="InspectorUI.closeInspectorUI(false);"
+ tooltiptext="&inspectCloseButton.tooltiptext;"/>
+#endif
+ </toolbar>
+
+ <toolbar id="developer-toolbar"
+ class="devtools-toolbar"
+ hidden="true">
+#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">&#187;</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"
@ -1057,58 +1091,34 @@ new file mode 100644
+
+#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="13" 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
+
@ -1122,7 +1132,7 @@ new file mode 100644
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)
@ -1144,7 +1154,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
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"
@ -1158,12 +1168,12 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#endif
#if defined(XP_WIN) && !defined(__MINGW32__)
#include "nsIEProfileMigrator.h"
#elif defined(XP_MACOSX)
#include "nsSafariProfileMigrator.h"
#include "nsIEHistoryEnumerator.h"
#endif
@@ -67,18 +67,16 @@ using namespace mozilla::browser;
#include "rdf.h"
#include "nsFeedSniffer.h"
@@ -32,18 +32,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
@ -1177,12 +1187,12 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#endif
#if defined(XP_WIN) && !defined(__MINGW32__)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
#elif defined(XP_MACOSX)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
#endif
@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
#endif
NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
@ -1197,61 +1207,64 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
{ &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
#if defined(XP_WIN) && !defined(__MINGW32__)
{ &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
#elif defined(XP_MACOSX)
{ &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
{ &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor },
#endif
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
@ -1714,21 +1727,24 @@ 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
@@ -467,16 +467,17 @@
#endif
#endif
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/firefox.js
@BINPATH@/@PREF_DIR@/firefox-branding.js
@BINPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/@PREF_DIR@/kde.js
#ifdef MOZ_SERVICES_SYNC
@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
@BINPATH@/defaults/autoconfig/prefcalls.js
#ifndef LIBXUL_SDK
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
@BINPATH@/defaults/pref/channel-prefs.js
+@BINPATH@/defaults/pref/kde.js
#else
@BINPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/@PREF_DIR@/kde.js
#endif
@BINPATH@/defaults/profile/prefs.js
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@BINPATH@/res/EditorOverride.css
@BINPATH@/res/contenteditable.css
@BINPATH@/res/designmode.css

12
firefox-lang.patch
View file

@ -1,12 +0,0 @@
--- browser/app/profile/firefox.js 2012-06-01 12:03:47.000000000 +0000
+++ browser/app/profile/firefox.js.oden 2012-06-08 08:02:36.000000000 +0000
@@ -239,6 +239,9 @@
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
pref("general.smoothScroll", true);
#ifdef UNIX_BUT_NOT_MAC
pref("general.autoScroll", false);

11
firefox-searchengines-askcom.xml
View file

@ -1,11 +0,0 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>Ask.com</os:ShortName>
<os:Description>Get more with each search.</os:Description>
<os:InputEncoding>UTF-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAACMuAAAjLgAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8fH5/5+f1v9pab7/QkKr/0JCqv9dXbT/h4fI/8fH6P//////////////////////////////////////s7Pg/xgYpv8GBqP/Bgaj/wYGof8GBp//Bgac/wYGlv8GBoz/MTGZ/6+v2v//////////////////////x8ft/wkJrv+Dg93/JSXH/wYGwf8GBr//BQW+/wUFuf8FBbT/BQWp/wUFnP8FBYv/QkKh/+3t+P///////////1lZzP8FBbv/wMDx/9DQ9v8FBdP/wMD0/6Gh7f/AwPL/goLk/yQkyP8zM8H/BASm/wQEk/8nJ5T/4eHy//////81NcT/BAS9/0ND2f///////////+/v/f+wsPP/kJDt///////v7/z/0ND1/6Gh5v+wsOT/AwOV/0FBoP//////TU3L/wQEvP8EBMv/wMD1/8DA9//Q0Pj/cnLq/2Fh6f//////r6/z////////////YmLY/wMDrP8DA4//nZ3R/5qa4v8EBLv/BATJ/0ND4f//////4OD7/0JC4//v7/3/sLD1/zEx5f///////////2Ji4/8EBMD/AwOk/0tLsP/8/P7/ODjJ/wQExv8EBNT/wMD3//////9DQ+n/goLw//////+BgfD/7+/9/9/f+//v7/3/FBTT/wMDs/81NbD//////9jY9P8bG8j/BATP/0ND4///////Q0Pq/wQE4/8EBOP/BATj/8DA+P+RkfP/U1Pr/zMz3f8DA7z/XFzG////////////3t73/zIy0v8EBNH/wMD1/wQE2v8EBNz/BATd/wQE3v+RkfH/wMD2/wQE2v8EBM//Bga+/83N7///////////////////////oKDp/1FR2v8EBMz/BATP/wQE0P8EBNH/YmLi//////8EBMv/Dw/G/6ys5//////////////////////////////////8/P7/vr7v/4aG4f9QUNb/Q0PU/0ND1P9fX9j/l5fk/+vr+f//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//w==</os:Image>
<UpdateInterval>7</UpdateInterval>
<SearchForm>http://www.ask.com</SearchForm>
<os:Url type="text/html" method="GET" template="http://www.ask.com/web?q={searchTerms}&amp;o=@DISTRO_VALUE@&amp;l=dis"></os:Url>
<os:Url type="application/x-suggestions+json" method="GET" template="http://ss.ask.com/query?q={searchTerms}&amp;li=ff">
</os:Url>
</SearchPlugin>

9
firefox-searchengines-exalead.xml
View file

@ -1,9 +0,0 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>Exalead</os:ShortName>
<os:Description>Exalead search engine</os:Description>
<os:InputEncoding>UTF-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnp+gPklJSaMXFxfjAAAA+wAAAfxNSD/jZGNdpZucnj8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0dXcKbmxnliYkHfoAAAD/AAAA/ywpIf+qn37/2sif/7+sh/99clr7ZGNgmMDAwgsAAAAAAAAAAAAAAAC7vL4KW1pTu8vBmP/Ivpn/CQkH/0I+Mf/q3rD//vG///Hltf/s3a//48+k/6uZdv9PTUW/aGlrCwAAAAAAAAAAUVFOlMe/m///9cn//vTI/8rCn//p3rX///XF//ruvf/57bz/9em5//DktP/m06f/rpx5/1lZVZkAAAAAW1xdOI2Ic/3/+9T//PTQ/+Xdu//Bu5z/qqSI/5yWe/+dlnn/samG/9rPpP/8773/8eW1/+XRpf+Ge2H+cHFyO0hIRKTg2br///za/7axmf+ZlYH/w76k/93XuP/e17b/0Min/66nif+Be2P/aGNO/8O5k//77r3/n5Bx/yorK6dqaFzm8evO/5CNfP+xrZj//vja///52v/589P/+PHQ//ryzv//+M7/4tix/11ZR//c0aX/9uu6/zk1Kv8DAwXmYF1T/vbx1/+hnY3/7+rR//v12//48tj/9/LW//bw0v/278//9e3K//Pqwv/678H///LA/3t0XP8AAAD/AAAA/g8PD/7Nybj////s//v24P/59N7/+vTd//jz2f/48tb/9vDS//Xuzv/27sn/+O7D//Pouv/Mwpn/a2VR/w8OC/4MDQ7lsq+k////6//79uP/+/bk///96P/79d7/+PPZ//fy1f/48dL/6uPC/+HYtP/16r3/+Ou6//vtvf9eWUrmPj08o9rWyP///Ov//vrp/+nk1f99enH/+fPg//r03f/48tj///rb/7Oul/8+PDL/9+zB//bquv/bz6T/S0lDpWxsbDaSkIj8///+//767P/y7+H/Li0q/9nVxf//+uT/+PPZ//z22f/Y0rb/JSQf/+DXsP//+MX/jodr/mNkZjkAAAAAUlFQkc7Mxf////////zu/9LOwf/v6tn//ffi//n02//38dX/+fLS/9DKq//78cb/xryU/01MSJYAAAAAAAAAAK6urwlfXly4zczH//////////b///rn//z24f/9+N7///nc//z01f///9r/xr6a/1NSS7snJyoLAAAAAAAAAAAAAAAAgoKDCD08O5GOjYf43tzV//jz5P+ysKf/o6GY/8nErv/TzbH/ioZx+WFgXZSgoaMKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAm5ucO2JiX6FUU0/iERER/AoLDPwdHR3jW1tYo5+goTwAAAAAAAAAAAAAAAAAAAAA//8+CvgfCQngB250wANlcsADPC+AAXRlgAFyPoABCQmAAWtlgAFjb4ABYXDAA2UuwANpbuAHdGn4H2V0//9saQ==</os:Image>
<os:Url type="text/html" method="GET" template="http://www.exalead.fr/search?q={searchTerms}">
</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="http://www.exalead.fr/search/Suggestions?q={searchTerms}">
</os:Url>
</SearchPlugin>

12
firefox-searchengines-jamendo.xml
View file

@ -1,12 +0,0 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>Jamendo</os:ShortName>
<os:Description>Jamendo Search</os:Description>
<os:InputEncoding>ISO-8859-1</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QYPDS8GqqPMwQAAAclJREFUeNpj/P//f+L68wvOP2YgBJKN5OYEGDA/1PdfcOYBw///BNH5Zx+efP7JyFC+GpeRTIyMbqriRtICLExMn37+fvLx+603n1kY/vzBpSHOVNFERujX339ff/0R52JT4Od0VRbFpyFMT/b4g9erzj/8/vsvHwerND+XojAPC8Pv37g0fPr28+nbz7eevf3/n4GBgeEKAwMDAwMzg4EXw79/WBEnK7O5gujnrz8fvv4IF2Ri+P0bF9pw+vavX79N5YR4mRnggsyM2q6M//5hRb9//2ZiYHTXlWNnZLx4/yVEkJlR04nh31/s6O/fJ28+akgJaUgJ3nz8+t2nrwz//jIzqjlAHDcnw7M7zlGUm/3Wkzdfvn1n+PuP4d+/P7///Pn9R1dOjJ2J8dydZwz//iFC6dGrD6x6ChnuRuluRq8/fb3x5M2cneduPX2rJi4gwc/Fxw5VycyoaA2x4cjlBzcfvxbk4RQT5JEQ5FEUF2RjZlIQ49eSE7n3/O22kzdevPnI8O8fI6NzGWYMRDoZGKtKf/j649+//8/eftp15tazt58gUoxxzUsW7znHQBxIcDNmvrBv7b0nby7dfkIwtSZ4mM6rigIAJxY/knh2MaAAAAAASUVORK5CYII=</os:Image>
<UpdateInterval>7</UpdateInterval>
<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/jamendo.src</UpdateUrl>
<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/jamendo.png</IconUpdateUrl>
<SearchForm>http://www.jamendo.com/index.php</SearchForm>
<os:Url type="text/html" method="GET" template="http://www.jamendo.com/index.php?p=search&amp;search_string={searchTerms}&amp;sourceid=mozilla-search">
</os:Url>
</SearchPlugin>

2
firefox.desktop
View file

@ -149,5 +149,5 @@ Icon=firefox
Terminal=false
Type=Application
StartupWMClass=Firefox
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;
Categories=GTK;Network;WebBrowser;X-MandrivaLinux-Internet-WebBrowsers;X-MandrivaLinux-CrossDesktop;

473
firefox.spec
View file

@ -1,154 +1,218 @@
%define major 15
%define realver %{major}.0
#
# WARNING, READ FIRST:
#
# This is a special package that needs special treatment. Due to the amount of
# security updates it needs, it's common to ship new upstream versions instead of patching.
# That means this package MUST be BUILDABLE for stable official releases.
# This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again.
%define major 15.0
%define ff_epoch 0
# (tpg) set version HERE !!!
%define realver %{major}
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
# (tpg) MOZILLA_FIVE_HOME
%define mozillalibdir %{_libdir}/%{name}-%{realver}
%define mozillalibdir %{_libdir}/%{name}-%{major}
%define pluginsdir %{_libdir}/mozilla/plugins
%define firefox_channel release
%if %mandriva_branch == Cooker
# Cooker
%define release 1
%else
# Old distros
%define subrel 1
%define release %mkrel 0
%endif
# libxul.so is provided by libxulrunnner2.0.
%define _requires_exceptions libxul.so
# this seems fragile, so require the exact version or later (#58754)
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
# this one as well (#59759)
%define nss_libname %mklibname nss 3
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0)
Summary: Mozilla Firefox web browser
%define _use_syshunspell 1
%define release %mkrel 2
%define update_channel release
Summary: Next generation web browser
Name: firefox
Version: %{realver}
Version: %{major}
Epoch: %{ff_epoch}
Release: %{release}
License: MPLv1+
Group: Networking/WWW
Url: http://www.firefox.com/
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{realver}/source/firefox-%{realver}.source.tar.bz2
Source4: firefox.desktop
Source5: firefox-searchengines-jamendo.xml
Source6: firefox-searchengines-exalead.xml
Source8: firefox-searchengines-askcom.xml
Url: http://www.mozilla.com/firefox/
%if 0%{?prel}
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}%prel.source.tar.bz2
%else
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}.source.tar.bz2
%endif
Source4: %{name}.desktop
Source9: kde.js
Patch1: firefox-lang.patch
Patch2: firefox-vendor.patch
Patch3: firefox-disable-check-default-browser.patch
# NOTE: P4 and P41 stems from suse. you can also find updated ones here:
# http://svnweb.mageia.org/packages/cauldron/firefox/current/SOURCES/
Patch4: firefox-kde.patch
Patch41: mozilla-kde.patch
Patch1: firefox-6.0-lang.patch
Patch2: firefox-vendor.patch
Patch3: mozilla-firefox-1.5.0.6-systemproxy.patch
Patch4: firefox-10.0-nss-binary.patch
# (OpenSuse) add patch to make firefox always use /usr/bin/firefox when "make firefox
# the default web browser" is used fix mdv bug#58784
Patch5: firefox-3.6.3-appname.patch
Patch6: firefox-5.0-asciidel.patch
Patch7: firefox-10.0-no_optimizarion_override.diff
Patch10: firefox-13-fix-cairo-build.patch
Patch5: firefox-6.0-appname.patch
Patch6: firefox-7.0-fix-str-fmt.patch
Patch7: mozilla-firefox-run-mozilla.patch
Patch8: firefox-disable-check-default-browser.patch
Patch9: firefox-5.0-asciidel.patch
Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF
Patch11: firefox-kde.patch
Patch12: mozilla-kde.patch
Patch13: firefox-13-fix-nspr-include.patch
Patch14: firefox-13-fix-cairo-build.patch
Patch34: xulrunner_nojit.patch
# (cjw) make youtube show a green light for html5 h.264 support (?)
Patch35: iceape-2.11-gstreamer-h264-avc1.42001E.patch
# (cjw) use system virtualenv
Patch36: iceape-2.12-system-virtualenv.patch
# (cjw) from hg: fix segfault in gstreamer video playback code, see https://bugzilla.mozilla.org/show_bug.cgi?id=761030
Patch37: iceape-2.12-b8c6c7c773c3-gstreamer-video-segfault.patch
# (cjw) make system-nss and system-nspr options work again (...)
Patch38: firefox-15b2-native-nss-nspr.patch
BuildRequires: gtk+2-devel
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
Requires: %{nss_libname} >= 2:%{nss_version}
BuildRequires: autoconf2.1
BuildRequires: nspr-devel >= 2:4.9.0
BuildRequires: nss-devel >= 2:3.13.2
BuildRequires: nss-static-devel >= 2:3.13.2
BuildRequires: sqlite3-devel >= 3.7.10
BuildRequires: libproxy-devel >= 0.4.4
BuildRequires: libalsa-devel
BuildRequires: libiw-devel
BuildRequires: unzip
BuildRequires: zip
#(tpg) older versions doesn't support apng extension
%if %mdkversion >= 201101
BuildRequires: libpng-devel >= 1.4.8
%endif
BuildRequires: libxinerama-devel
BuildRequires: libxscrnsaver-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 2:1.4
BuildRequires: zlib-devel
BuildRequires: glib2-devel
BuildRequires: libIDL2-devel
BuildRequires: makedepend
BuildRequires: nss-devel >= 2:3.12.10
BuildRequires: nss-static-devel
BuildRequires: nspr-devel >= 2:4.8.9
BuildRequires: startup-notification-devel
BuildRequires: dbus-glib-devel
BuildRequires: python
BuildRequires: sqlite3-devel >= 3.7.7.1
%ifnarch %arm %mips
BuildRequires: valgrind
BuildRequires: rootcerts
BuildRequires: doxygen
%if %mdkversion >= 201200
BuildRequires: gnome-vfs2-devel
%else
BuildRequires: libgnome-vfs2-devel
%endif
BuildRequires: libgnome2-devel
BuildRequires: libgnomeui2-devel
BuildRequires: java-rpmbuild
BuildRequires: yasm >= 1.0.1
%endif
%ifarch %arm
BuildRequires: libffi-devel
%endif
BuildRequires: rootcerts >= 1:20110830.00
BuildRequires: libxt-devel
%if %_use_syshunspell
BuildRequires: hunspell-devel
%endif
BuildRequires: doxygen
# BuildRequires: xulrunner-devel >= %xulrunner_version%{?prel:-0.%prel}
BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(alsa)
BuildRequires: wget
BuildRequires: libnotify-devel
BuildRequires: libevent-devel >= 1.4.7
BuildRequires: libvpx-devel >= 0.9.7
%if %mdkversion >= 201100
BuildRequires: cairo-devel >= 1.10
%endif
BuildRequires: yasm >= 1.0.1
BuildRequires: mesagl-devel
BuildRequires: startup-notification-devel >= 0.8
Provides: webclient
#Requires: indexhtml
Requires: xdg-utils
%if %mdkversion >= 201200
# https://qa.mandriva.com/show_bug.cgi?id=65237
Requires: gtk2-modules
BuildRequires: libvpx-devel
BuildRequires: autoconf2.1
BuildRequires: libiw-devel
BuildRequires: python-virtualenv
BuildRequires: gstreamer0.10-devel
BuildRequires: libgstreamer0.10-plugins-base-devel
BuildRequires: pkgconfig(opus)
%if 0%{?prel}
Provides: %{name} = %{epoch}:%{realver}-0.%{prel}
%else
Provides: %{name} = %{epoch}:%{realver}
%endif
Suggests: ff_deps myspell-en_US nspluginwrapper
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Provides: mozilla-firefox = %{epoch}:%{version}-%{release}
Provides: webclient
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
Requires: %{mklibname nss 3} >= 2:%{nss_version}
Requires: %{mklibname nspr 4} >= 2:%{nspr_version}
Requires: indexhtml
Requires: xdg-utils
# fixes bug #42096
Requires: mailcap
Suggests: hunspell-en
Suggests: %{_lib}canberra0
Suggests: %{_lib}cups2
Obsoletes: firefox-ext-weave-sync
Obsoletes: firefox-beta < 11
%description
Mozilla Firefox is a web browser
The award-winning Web browser is now faster, more secure, and fully customizable
to your online life. With Firefox(R), we've added powerful new features that
make your online experience even better. It is an 'open source' product which is
freely available, and is acquiring a growing proportion of international web
browser usage.
Firefox claims to offer a more secure web browsing experience than other products,
with better protection against spyware and other Internet-based security threats.
It includes all the standard features of a modern web browser, like Internet
searching, tracking recently visited sites, setting up shortcuts to favourite
sites, customising the software behaviour and so on. Firefox also includes
features like 'tabbed browsing' (opening several web sites as sections within the
same window) and methods for controlling pop-up windows, cookies and downloaded
files.
%package devel
Summary: Development files for %{name}
Group: Development/Other
Obsoletes: firefox-beta-devel < 11
%description devel
Files and macros mainly for building Firefox extensions.
%prep
%setup -qn mozilla-%{firefox_channel}
# disabled for tests
%patch1 -p0 -b .lang
%setup -qn mozilla-%update_channel
%patch1 -p1 -b .lang
%patch2 -p1 -b .vendor
%patch3 -p1 -b .defaultbrowser
%patch6 -p1 -b .wintitle
%patch7 -p0 -b .no_optimizarion_override
%if %mdkversion < 201200
# the bundled libvpx is 0.9.2 + mozilla patches. this is fixed in 0.9.7
perl -pi -e "s|VPX_CODEC_USE_INPUT_FRAGMENTS|VPX_CODEC_USE_INPUT_PARTITION|g" configure*
perl -pi -e "s|vpx >= 1.0.0|vpx >= 0.9.7|g" configure*
%endif
%patch10 -p1
#patch3 -p1 -b .systemproxy
%patch4 -p0 -b .nss
%patch5 -p1 -b .appname
# It was disabled because firefox3 hangs when using soundwrapper
#patch7 -p1
%patch8 -p1 -b .disable-software-update
%patch9 -p1 -b .ascii
%patch10 -p1 -b .default-mail-handler
%patch14 -p1
## KDE INTEGRATION
# copy current files and patch them later to keep them in sync
# %%patch4 -p1 -b .kde
# %%patch41 -F 1 -p1 -b .kdemoz
# install kde.js
install -m 644 %{SOURCE9} browser/app/profile/kde.js
# Disable kde integration , need refactoring
%patch11 -p1 -b .kde
%patch12 -p1 -b .kdemoz
# disabled for now, lets see!
#%patch5 -p1 -b .appname
%ifarch %arm
%if "%{_target_cpu}" != "armv7l"
%patch34 -p1
%endif
%endif
%patch35 -p2 -b .h264-youtube-ok
%patch36 -p2 -b .system-virtualenv
%patch37 -p1 -b .gstreamer-crash
%patch38 -p1 -b .system-nss-nspr
# (tpg) remove ff bookmarks, use mdv ones
rm -rf browser/locales/en-US/profile/bookmarks.html
touch browser/locales/en-US/profile/bookmarks.html
pushd js/src
autoconf-2.13
popd
autoconf-2.13
# needed to regenerate certdata.c
pushd security/nss/lib/ckfw/builtins
perl ./certdata.perl < /etc/pki/tls/mozilla/certdata.txt
popd
%build
# (gmoro) please dont enable all options by hand
# we need to trust firefox defaults
export MOZCONFIG=`pwd`/mozconfig
cat << EOF > $MOZCONFIG
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
#mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
mk_add_options MOZ_OBJDIR=`pwd`/objdir
mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
ac_add_options --host=%{_host}
ac_add_options --target=%{_target_platform}
ac_add_options --enable-optimize="%{optflags}"
ac_add_options --prefix="%{_prefix}"
ac_add_options --libdir="%{_libdir}"
ac_add_options --sysconfdir="%{_sysconfdir}"
@ -157,122 +221,111 @@ ac_add_options --includedir="%{_includedir}"
ac_add_options --datadir="%{_datadir}"
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
%if %mdkversion >= 201101
ac_add_options --with-system-png
%else
ac_add_options --disable-system-png
%endif
ac_add_options --with-system-bz2
ac_add_options --enable-system-sqlite
ac_add_options --disable-installer
ac_add_options --enable-webm
ac_add_options --enable-gio
ac_add_options --disable-gnomevfs
ac_add_options --disable-updater
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --enable-strip
#ac_add_options --enable-chrome-format=jar
#ac_add_options --enable-update-channel=beta
ac_add_options --enable-official-branding
ac_add_options --enable-libproxy
%if %mdkversion >= 201100
ac_add_options --with-system-png
ac_add_options --with-system-jpeg
ac_add_options --enable-system-cairo
%else
ac_add_options --disable-system-cairo
%endif
ac_add_options --with-distribution-id=com.mandriva
ac_add_options --disable-crashreporter
ac_add_options --enable-optimize
ac_add_options --enable-gio
ac_add_options --enable-system-sqlite
ac_add_options --enable-startup-notification
ac_add_options --disable-cpp-exceptions
ac_add_options --enable-xinerama
ac_add_options --with-distribution-id=org.rosa
ac_add_options --disable-crashreporter
ac_add_options --enable-update-channel=%{update_channel}
ac_add_options --enable-gstreamer
%ifarch %arm
%if "%{_target_cpu}" != "armv7l"
ac_add_options --disable-methodjit
ac_add_options --disable-tracejit
%endif
ac_add_options --enable-system-ffi
%endif
%ifnarch %arm %mips
ac_add_options --with-valgrind
ac_add_options --with-java-include-path=%{java_home}/include
ac_add_options --with-java-bin-path=%{java_home}/bin
ac_add_options --enable-opus
%endif
EOF
# Mozilla builds with -Wall with exception of a few warnings which show up
# everywhere in the code; so, don't override that.
#
# Disable C++ exceptions since Mozilla code is not exception-safe
#
%ifarch i686
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -march=i686 -msse -msse2 -mfpmath=sse" | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g' -e 's/-O2/-O3/g')
%else
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
%endif
export CFLAGS="$MOZ_OPT_FLAGS"
export CXXFLAGS="$MOZ_OPT_FLAGS"
export PREFIX="%{_prefix}"
export LIBDIR="%{_libdir}"
%__perl -p -i -e 's|\-0|\-9|g' config/make-jars.pl
MOZ_SMP_FLAGS=-j1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
# however builds tend to fail on other arches when building in parallel.
%ifarch %{ix86} x86_64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
%endif
export LDFLAGS="%{ldflags}"
make -f client.mk clean
%ifarch i686
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_OPTIMIZE_FLAGS="-O3" MOZ_PKG_FATAL_WARNINGS=0
%else
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_PKG_FATAL_WARNINGS=0
%endif
export LDFLAGS="%ldflags"
make -f client.mk build
%install
%if %mdkversion <= 201020
%makeinstall_std -C objdir STRIP=/bin/strip MOZ_PKG_FATAL_WARNINGS=0
%else
%makeinstall_std -C objdir STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
%endif
rm -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_bindir}
ln -snf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox
make -C %{_builddir}/obj/browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
# don't package two identical binaries
pushd %{buildroot}%{mozillalibdir}
ln -snf firefox-bin firefox
# Copy files to buildroot
%{__mkdir_p} %{buildroot}%{mozillalibdir}
cp -rf %{_builddir}/obj/dist/firefox/* %{buildroot}%{mozillalibdir}
%{__mkdir_p} %{buildroot}%{_bindir}
ln -sf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox
pushd %{buildroot}%{_bindir}
ln -sf firefox mozilla-firefox
popd
mkdir -p %{buildroot}%{mozillalibdir}/defaults/preferences/
install -m 644 %{SOURCE9} %{buildroot}%{mozillalibdir}/defaults/preferences/kde.js
# Create an own %_libdir/mozilla/plugins
%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins
# Create and own %_libdir/mozilla/plugins & firefox extensions directories
%{__mkdir_p} %{buildroot}%{pluginsdir}
%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
%{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
# (tpg) desktop entry
%{__mkdir_p} %{buildroot}%{_datadir}/applications
install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/firefox.desktop
install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
# (gmoro) icons
# (tpg) icons
%{__cp} %{buildroot}%{mozillalibdir}/chrome/icons/default/default16.png %{buildroot}/%{mozillalibdir}/icons/
for i in 16 32 48 ; do
for i in 16 22 24 32 48 256; do
# (cg) Not all icon sizes are installed with make install, so just redo it here.
%{__install} -m 644 browser/branding/official/default$i.png %{buildroot}%{mozillalibdir}/chrome/icons/default/default$i.png
%{__mkdir_p} %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps
ln -sf %{mozillalibdir}/chrome/icons/default/default$i.png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps/firefox.png ;
ln -sf %{mozillalibdir}/chrome/icons/default/default$i.png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps/%{name}.png ;
done
%{__mkdir_p} %{buildroot}{%{_liconsdir},%{_iconsdir},%{_miconsdir}}
ln -sf %{mozillalibdir}/chrome/icons/default/default48.png %{buildroot}%{_liconsdir}/%{name}.png
ln -sf %{mozillalibdir}/chrome/icons/default/default32.png %{buildroot}%{_iconsdir}/%{name}.png
ln -sf %{mozillalibdir}/chrome/icons/default/default16.png %{buildroot}%{_miconsdir}/%{name}.png
# exclusions
rm -f %{buildroot}%{mozillalibdir}/README.txt
rm -f %{buildroot}%{mozillalibdir}/removed-files
rm -f %{buildroot}%{mozillalibdir}/precomplete
# this file is only used when creating a new user profile
install -D -m644 browser/app/profile/prefs.js %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
cat << EOF >> %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
user_pref("browser.search.selectedEngine","Ask.com");
user_pref("browser.search.order.1","Ask.com");
user_pref("browser.search.order.2","Exalead");
user_pref("browser.search.order.3","Google");
user_pref("browser.search.order.4","Yahoo");
user_pref("browser.EULA.override", true);
user_pref("browser.shell.checkDefaultBrowser", false);
user_pref("browser.ctrlTab.previews", true);
user_pref("browser.tabs.insertRelatedAfterCurrent", false);
user_pref("browser.startup.homepage", "file:///usr/share/indexhtml/index.html");
user_pref("app.update.auto", false);
user_pref("app.update.enabled", false);
user_pref("app.update.autoInstallEnabled", false);
user_pref("security.ssl.require_safe_negotiation", false);
user_pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
user_pref("browser.showQuitWarning", true);
EOF
# display icon for Firefox button
%{__mkdir_p} %{buildroot}%{mozillalibdir}/defaults/profile/chrome
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css
#appmenu-toolbar-button {
list-style-image: url("chrome://branding/content/icon16.png");
}
EOF
# files in this directory are read on every startup, and can change/add
@ -285,71 +338,61 @@ EOF
# documentation: http://kb.mozillazine.org/About:config_entries#Extensions.
# or in toolkit/mozapps/extensions/AddonManager.jsm
# we also need to disable the "disable addon selection dialog"
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/pref/mandriva.js
pref("app.update.auto", false);
pref("app.update.autoInstallEnabled", false);
pref("app.update.enabled", false);
pref("browser.backspace_action", 2);
pref("browser.ctrlTab.previews", true);
pref("browser.display.use_system_colors", true);
pref("browser.download.folderList", 1);
pref("browser.link.open_external", 3);
pref("browser.search.order.1","Ask.com");
pref("browser.search.order.2","Exalead");
pref("browser.search.order.3","Google");
pref("browser.search.order.4","Yahoo");
pref("browser.search.selectedEngine","Ask.com");
pref("browser.shell.checkDefaultBrowser", false);
pref("browser.tabs.insertRelatedAfterCurrent", false);
pref("dom.ipc.plugins.enabled.nswrapper*", false);
pref("extensions.autoDisableScope", 0);
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/pref/mga.js
pref("extensions.autoDisableScopes", 0);
pref("extensions.shownSelectionUI", true);
pref("network.manage-offline-status", true);
EOF
# search engines
cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/searchplugins/jamendo.xml
cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
# use the system myspell dictionaries
rm -fr %{buildroot}%{mozillalibdir}/dictionaries
ln -s %{_datadir}/hunspell %{buildroot}%{mozillalibdir}/dictionaries
# Correct distro values on search engines
sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
# (lm) touch and %ghost bookmarks.html to a proper uninstall
touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html
%find_lang %{name}
mkdir -p %{buildroot}%{_sys_macros_dir}
cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
# Macros from %{name} package
%%firefox_major %{major}
%%firefox_version %{realver}
%%firefox_epoch %{ff_epoch}
%%firefox_version %{major}%{?prel:-0.%prel}
%%firefox_mozillapath %{mozillalibdir}
%%firefox_pluginsdir %{pluginsdir}
%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi)
FIN
# the %%makeinstall_std macro also installs devel files that we don't need (yet?)
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_libdir}/firefox-devel*
rm -rf %{buildroot}%{_datadir}/idl
%pre
if [ -d %{mozillalibdir}/dictionaries ]; then
rm -fr %{mozillalibdir}/dictionaries
fi
%post
unset DISPLAY
if [ ! -r /etc/sysconfig/oem ]; then
case `grep META_CLASS /etc/sysconfig/system` in
*powerpack) bookmark="mozilla-powerpack.html" ;;
*desktop) bookmark="mozilla-one.html";;
*) bookmark="mozilla-download.html";;
esac
ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
ln -s -f ../../../../share/mga/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
fi
%files
%{_bindir}/firefox
%files -f %{name}.lang
%{_bindir}/%{name}
%{_bindir}/mozilla-firefox
%{_iconsdir}/hicolor/*/apps/*.png
%{_miconsdir}/%{name}.png
%{_iconsdir}/%{name}.png
%{_liconsdir}/%{name}.png
%{_datadir}/applications/*.desktop
%{_libdir}/%{name}-%{realver}*
%{_libdir}/%{name}-%{major}*
%ghost %{mozillalibdir}/defaults/profile/bookmarks.html
%dir %{_libdir}/mozilla
%dir %{pluginsdir}
%dir %{_libdir}/mozilla/extensions/%{firefox_appid}
%dir %{_datadir}/mozilla/extensions/%{firefox_appid}
%files devel
%{_sys_macros_dir}/%{name}.macros

398
firefox.spec~ Normal file
View file

@ -0,0 +1,398 @@
#
# WARNING, READ FIRST:
#
# This is a special package that needs special treatment. Due to the amount of
# security updates it needs, it's common to ship new upstream versions instead of patching.
# That means this package MUST be BUILDABLE for stable official releases.
# This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again.
%define major 15.0
%define ff_epoch 0
# (tpg) set version HERE !!!
%define realver %{major}
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
# (tpg) MOZILLA_FIVE_HOME
%define mozillalibdir %{_libdir}/%{name}-%{major}
%define pluginsdir %{_libdir}/mozilla/plugins
# libxul.so is provided by libxulrunnner2.0.
%define _requires_exceptions libxul.so
# this seems fragile, so require the exact version or later (#58754)
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0)
%define _use_syshunspell 1
%define release %mkrel 2
%define update_channel release
Summary: Next generation web browser
Name: firefox
Version: %{major}
Epoch: %{ff_epoch}
Release: %{release}
License: MPLv1+
Group: Networking/WWW
Url: http://www.mozilla.com/firefox/
%if 0%{?prel}
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}%prel.source.tar.bz2
%else
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}.source.tar.bz2
%endif
Source4: %{name}.desktop
Source9: kde.js
Patch1: firefox-6.0-lang.patch
Patch2: firefox-vendor.patch
Patch3: mozilla-firefox-1.5.0.6-systemproxy.patch
Patch4: firefox-10.0-nss-binary.patch
# (OpenSuse) add patch to make firefox always use /usr/bin/firefox when "make firefox
# the default web browser" is used fix mdv bug#58784
Patch5: firefox-6.0-appname.patch
Patch6: firefox-7.0-fix-str-fmt.patch
Patch7: mozilla-firefox-run-mozilla.patch
Patch8: firefox-disable-check-default-browser.patch
Patch9: firefox-5.0-asciidel.patch
Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF
Patch11: firefox-kde.patch
Patch12: mozilla-kde.patch
Patch13: firefox-13-fix-nspr-include.patch
Patch14: firefox-13-fix-cairo-build.patch
Patch34: xulrunner_nojit.patch
# (cjw) make youtube show a green light for html5 h.264 support (?)
Patch35: iceape-2.11-gstreamer-h264-avc1.42001E.patch
# (cjw) use system virtualenv
Patch36: iceape-2.12-system-virtualenv.patch
# (cjw) from hg: fix segfault in gstreamer video playback code, see https://bugzilla.mozilla.org/show_bug.cgi?id=761030
Patch37: iceape-2.12-b8c6c7c773c3-gstreamer-video-segfault.patch
# (cjw) make system-nss and system-nspr options work again (...)
Patch38: firefox-15b2-native-nss-nspr.patch
BuildRequires: gtk+2-devel
BuildRequires: unzip
BuildRequires: zip
BuildRequires: libxinerama-devel
BuildRequires: libxscrnsaver-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 2:1.4
BuildRequires: zlib-devel
BuildRequires: glib2-devel
BuildRequires: libIDL2-devel
BuildRequires: makedepend
BuildRequires: nss-devel >= 2:3.12.10
BuildRequires: nss-static-devel
BuildRequires: nspr-devel >= 2:4.8.9
BuildRequires: startup-notification-devel
BuildRequires: dbus-glib-devel
BuildRequires: python
BuildRequires: sqlite3-devel >= 3.7.7.1
%ifnarch %arm %mips
BuildRequires: valgrind
BuildRequires: java-rpmbuild
BuildRequires: yasm >= 1.0.1
%endif
%ifarch %arm
BuildRequires: libffi-devel
%endif
BuildRequires: rootcerts >= 1:20110830.00
BuildRequires: libxt-devel
%if %_use_syshunspell
BuildRequires: hunspell-devel
%endif
BuildRequires: doxygen
# BuildRequires: xulrunner-devel >= %xulrunner_version%{?prel:-0.%prel}
BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(alsa)
BuildRequires: wget
BuildRequires: libnotify-devel
BuildRequires: cairo-devel >= 1.10
BuildRequires: mesagl-devel
BuildRequires: libvpx-devel
BuildRequires: autoconf2.1
BuildRequires: libiw-devel
BuildRequires: python-virtualenv
BuildRequires: gstreamer0.10-devel
BuildRequires: libgstreamer0.10-plugins-base-devel
BuildRequires: pkgconfig(opus)
%if 0%{?prel}
Provides: %{name} = %{epoch}:%{realver}-0.%{prel}
%else
Provides: %{name} = %{epoch}:%{realver}
%endif
Provides: mozilla-firefox = %{epoch}:%{version}-%{release}
Provides: webclient
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
Requires: %{mklibname nss 3} >= 2:%{nss_version}
Requires: %{mklibname nspr 4} >= 2:%{nspr_version}
Requires: indexhtml
Requires: xdg-utils
# fixes bug #42096
Requires: mailcap
Suggests: hunspell-en
Suggests: %{_lib}canberra0
Suggests: %{_lib}cups2
Obsoletes: firefox-ext-weave-sync
Obsoletes: firefox-beta < 11
%description
The award-winning Web browser is now faster, more secure, and fully customizable
to your online life. With Firefox(R), we've added powerful new features that
make your online experience even better. It is an 'open source' product which is
freely available, and is acquiring a growing proportion of international web
browser usage.
Firefox claims to offer a more secure web browsing experience than other products,
with better protection against spyware and other Internet-based security threats.
It includes all the standard features of a modern web browser, like Internet
searching, tracking recently visited sites, setting up shortcuts to favourite
sites, customising the software behaviour and so on. Firefox also includes
features like 'tabbed browsing' (opening several web sites as sections within the
same window) and methods for controlling pop-up windows, cookies and downloaded
files.
%package devel
Summary: Development files for %{name}
Group: Development/Other
Obsoletes: firefox-beta-devel < 11
%description devel
Files and macros mainly for building Firefox extensions.
%prep
%setup -qn mozilla-%update_channel
%patch1 -p1 -b .lang
%patch2 -p1 -b .vendor
#patch3 -p1 -b .systemproxy
%patch4 -p0 -b .nss
%patch5 -p1 -b .appname
# It was disabled because firefox3 hangs when using soundwrapper
#patch7 -p1
%patch8 -p1 -b .disable-software-update
%patch9 -p1 -b .ascii
%patch10 -p1 -b .default-mail-handler
%patch14 -p1
## KDE INTEGRATION
# Disable kde integration , need refactoring
%patch11 -p1 -b .kde
%patch12 -p1 -b .kdemoz
%ifarch %arm
%if "%{_target_cpu}" != "armv7l"
%patch34 -p1
%endif
%endif
%patch35 -p2 -b .h264-youtube-ok
%patch36 -p2 -b .system-virtualenv
%patch37 -p1 -b .gstreamer-crash
%patch38 -p1 -b .system-nss-nspr
pushd js/src
autoconf-2.13
popd
autoconf-2.13
# needed to regenerate certdata.c
pushd security/nss/lib/ckfw/builtins
perl ./certdata.perl < /etc/pki/tls/mozilla/certdata.txt
popd
%build
export MOZCONFIG=`pwd`/mozconfig
cat << EOF > $MOZCONFIG
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
ac_add_options --host=%{_host}
ac_add_options --target=%{_target_platform}
ac_add_options --enable-optimize="%{optflags}"
ac_add_options --prefix="%{_prefix}"
ac_add_options --libdir="%{_libdir}"
ac_add_options --sysconfdir="%{_sysconfdir}"
ac_add_options --mandir="%{_mandir}"
ac_add_options --includedir="%{_includedir}"
ac_add_options --datadir="%{_datadir}"
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-zlib
ac_add_options --with-system-libvpx
ac_add_options --enable-webm
ac_add_options --enable-gio
ac_add_options --disable-gnomevfs
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-debug
#ac_add_options --enable-chrome-format=jar
#ac_add_options --enable-update-channel=beta
ac_add_options --enable-official-branding
ac_add_options --enable-libproxy
ac_add_options --with-system-png
ac_add_options --with-system-jpeg
ac_add_options --enable-system-cairo
ac_add_options --enable-system-sqlite
ac_add_options --enable-startup-notification
ac_add_options --enable-xinerama
ac_add_options --with-distribution-id=org.rosa
ac_add_options --disable-crashreporter
ac_add_options --enable-update-channel=%{update_channel}
ac_add_options --enable-gstreamer
%ifarch %arm
%if "%{_target_cpu}" != "armv7l"
ac_add_options --disable-methodjit
ac_add_options --disable-tracejit
%endif
ac_add_options --enable-system-ffi
%endif
%ifnarch %arm %mips
ac_add_options --with-valgrind
ac_add_options --with-java-include-path=%{java_home}/include
ac_add_options --with-java-bin-path=%{java_home}/bin
ac_add_options --enable-opus
%endif
EOF
%__perl -p -i -e 's|\-0|\-9|g' config/make-jars.pl
export LDFLAGS="%ldflags"
make -f client.mk build
%install
rm -rf %{buildroot}
make -C %{_builddir}/obj/browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
# Copy files to buildroot
%{__mkdir_p} %{buildroot}%{mozillalibdir}
cp -rf %{_builddir}/obj/dist/firefox/* %{buildroot}%{mozillalibdir}
%{__mkdir_p} %{buildroot}%{_bindir}
ln -sf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox
pushd %{buildroot}%{_bindir}
ln -sf firefox mozilla-firefox
popd
mkdir -p %{buildroot}%{mozillalibdir}/defaults/preferences/
install -m 644 %{SOURCE9} %{buildroot}%{mozillalibdir}/defaults/preferences/kde.js
# Create and own %_libdir/mozilla/plugins & firefox extensions directories
%{__mkdir_p} %{buildroot}%{pluginsdir}
%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
%{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
# (tpg) desktop entry
%{__mkdir_p} %{buildroot}%{_datadir}/applications
install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
# (tpg) icons
%{__cp} %{buildroot}%{mozillalibdir}/chrome/icons/default/default16.png %{buildroot}/%{mozillalibdir}/icons/
for i in 16 22 24 32 48 256; do
# (cg) Not all icon sizes are installed with make install, so just redo it here.
%{__install} -m 644 browser/branding/official/default$i.png %{buildroot}%{mozillalibdir}/chrome/icons/default/default$i.png
%{__mkdir_p} %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps
ln -sf %{mozillalibdir}/chrome/icons/default/default$i.png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps/%{name}.png ;
done
%{__mkdir_p} %{buildroot}{%{_liconsdir},%{_iconsdir},%{_miconsdir}}
ln -sf %{mozillalibdir}/chrome/icons/default/default48.png %{buildroot}%{_liconsdir}/%{name}.png
ln -sf %{mozillalibdir}/chrome/icons/default/default32.png %{buildroot}%{_iconsdir}/%{name}.png
ln -sf %{mozillalibdir}/chrome/icons/default/default16.png %{buildroot}%{_miconsdir}/%{name}.png
# exclusions
rm -f %{buildroot}%{mozillalibdir}/README.txt
rm -f %{buildroot}%{mozillalibdir}/removed-files
rm -f %{buildroot}%{mozillalibdir}/precomplete
# this file is only used when creating a new user profile
install -D -m644 browser/app/profile/prefs.js %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
cat << EOF >> %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
user_pref("browser.EULA.override", true);
user_pref("browser.shell.checkDefaultBrowser", false);
user_pref("browser.startup.homepage", "file:///usr/share/indexhtml/index.html");
user_pref("app.update.auto", false);
user_pref("app.update.enabled", false);
user_pref("app.update.autoInstallEnabled", false);
user_pref("browser.showQuitWarning", true);
EOF
# display icon for Firefox button
%{__mkdir_p} %{buildroot}%{mozillalibdir}/defaults/profile/chrome
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css
#appmenu-toolbar-button {
list-style-image: url("chrome://branding/content/icon16.png");
}
EOF
# files in this directory are read on every startup, and can change/add
# preferences for existing profiles
# extensions.autoDisableScopes is a new preference added in firefox 8
# it defines "scopes" where newly installed addons are disabled by default
# this is an additive bit field, and the value defaults to 15 (1+2+4+8)
# we need to remove system scope (8) from it so language packs and other addons
# which are installed systemwide won't get marked as 3rd party and disabled
# documentation: http://kb.mozillazine.org/About:config_entries#Extensions.
# or in toolkit/mozapps/extensions/AddonManager.jsm
# we also need to disable the "disable addon selection dialog"
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/pref/mga.js
pref("extensions.autoDisableScopes", 0);
pref("extensions.shownSelectionUI", true);
EOF
# use the system myspell dictionaries
rm -fr %{buildroot}%{mozillalibdir}/dictionaries
ln -s %{_datadir}/hunspell %{buildroot}%{mozillalibdir}/dictionaries
# (lm) touch and %ghost bookmarks.html to a proper uninstall
touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html
%find_lang %{name}
mkdir -p %{buildroot}%{_sys_macros_dir}
cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
# Macros from %{name} package
%%firefox_major %{major}
%%firefox_epoch %{ff_epoch}
%%firefox_version %{major}%{?prel:-0.%prel}
%%firefox_mozillapath %{mozillalibdir}
%%firefox_pluginsdir %{pluginsdir}
%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi)
FIN
%pre
if [ -d %{mozillalibdir}/dictionaries ]; then
rm -fr %{mozillalibdir}/dictionaries
fi
%post
if [ ! -r /etc/sysconfig/oem ]; then
case `grep META_CLASS /etc/sysconfig/system` in
*powerpack) bookmark="mozilla-powerpack.html" ;;
*desktop) bookmark="mozilla-one.html";;
*) bookmark="mozilla-download.html";;
esac
ln -s -f ../../../../share/mga/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
fi
%files -f %{name}.lang
%{_bindir}/%{name}
%{_bindir}/mozilla-firefox
%{_iconsdir}/hicolor/*/apps/*.png
%{_miconsdir}/%{name}.png
%{_iconsdir}/%{name}.png
%{_liconsdir}/%{name}.png
%{_datadir}/applications/*.desktop
%{_libdir}/%{name}-%{major}*
%ghost %{mozillalibdir}/defaults/profile/bookmarks.html
%dir %{_libdir}/mozilla
%dir %{pluginsdir}
%dir %{_libdir}/mozilla/extensions/%{firefox_appid}
%dir %{_datadir}/mozilla/extensions/%{firefox_appid}
%files devel
%{_sys_macros_dir}/%{name}.macros

25
iceape-2.11-gstreamer-h264-avc1.42001E.patch Normal file
View file

@ -0,0 +1,25 @@
diff -p -up comm-beta/mozilla/content/html/content/public/nsHTMLMediaElement.h.h.264-youtube comm-beta/mozilla/content/html/content/public/nsHTMLMediaElement.h
--- comm-beta/mozilla/content/html/content/public/nsHTMLMediaElement.h.h.264-youtube 2012-07-22 21:37:36.666532783 +0200
+++ comm-beta/mozilla/content/html/content/public/nsHTMLMediaElement.h 2012-07-22 21:38:35.283979047 +0200
@@ -298,7 +298,7 @@ public:
static bool IsH264Enabled();
static bool IsH264Type(const nsACString& aType);
static const char gH264Types[3][17];
- static char const *const gH264Codecs[6];
+ static char const *const gH264Codecs[7];
#endif
#ifdef MOZ_MEDIA_PLUGINS
diff -p -up comm-beta/mozilla/content/html/content/src/nsHTMLMediaElement.cpp.h.264-youtube comm-beta/mozilla/content/html/content/src/nsHTMLMediaElement.cpp
--- comm-beta/mozilla/content/html/content/src/nsHTMLMediaElement.cpp.h.264-youtube 2012-07-21 19:53:31.000000000 +0200
+++ comm-beta/mozilla/content/html/content/src/nsHTMLMediaElement.cpp 2012-07-22 21:16:21.149558191 +0200
@@ -2083,7 +2083,8 @@ const char nsHTMLMediaElement::gH264Type
"video/quicktime",
};
-char const *const nsHTMLMediaElement::gH264Codecs[6] = {
+char const *const nsHTMLMediaElement::gH264Codecs[7] = {
+ "avc1.42001E",
"avc1.42E01E",
"avc1.58A01E",
"avc1.4D401E",

31
iceape-2.12-b8c6c7c773c3-gstreamer-video-segfault.patch Normal file
View file

@ -0,0 +1,31 @@
# HG changeset patch
# User Stephen Moehle <stephen.moehle@gmail.com>
# Date 1338852673 -43200
# Node ID b8c6c7c773c3b58355c0c47873810feff21601d3
# Parent 22a1bfac13d6d1a7fb9dfd0733494daa43b1623e
Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
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(),

11
iceape-2.12-system-virtualenv.patch Normal file
View file

@ -0,0 +1,11 @@
--- comm-beta/mozilla/configure.in.system-python-virtualenv 2012-07-23 00:44:57.425071929 +0200
+++ comm-beta/mozilla/configure.in 2012-07-23 01:30:58.838726848 +0200
@@ -9069,7 +9069,7 @@
AC_MSG_RESULT([Creating Python virtualenv])
rm -rf _virtualenv
mkdir -p _virtualenv
-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= virtualenv --system-site-packages ./_virtualenv
case "$host_os" in
mingw*)
PYTHON=`pwd`/_virtualenv/Scripts/python.exe

12
mozilla-firefox-1.5.0.6-systemproxy.patch Normal file
View file

@ -0,0 +1,12 @@
--- mozilla/modules/libpref/src/init/all.js.proxy 2006-08-24 20:39:23.000000000 +0200
+++ mozilla/modules/libpref/src/init/all.js 2006-08-24 20:41:18.000000000 +0200
@@ -52,7 +52,8 @@
pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties");
-pref("general.config.obscure_value", 13); // for MCD .cfg files
+pref("general.config.obscure_value", 0); // for MCD .cfg files
+pref("general.config.filename", "firefox.cfg");
pref("browser.cache.disk.enable", true);
pref("browser.cache.disk.capacity", 51200);

16
mozilla-firefox-run-mozilla.patch Normal file
View file

@ -0,0 +1,16 @@
--- mozilla/build/unix/run-mozilla.sh.run-mozilla 2005-10-01 07:36:47.000000000 +0200
+++ mozilla/build/unix/run-mozilla.sh 2006-02-09 07:13:54.000000000 +0100
@@ -163,7 +163,12 @@
##
## Run the program
##
- "$prog" ${1+"$@"}
+ if [ -x /usr/bin/soundwrapper ]
+ then
+ /usr/bin/soundwrapper "$prog" ${1+"$@"}
+ else
+ "$prog" ${1+"$@"}
+ fi
exitcode=$?
if [ "$DEBUG_CORE_FILES" ]
then

251
mozilla-kde.patch
View file

@ -7,7 +7,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
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/Makefile.in b/modules/libpref/src/Makefile.in
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 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
@@ -937,16 +938,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 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
return NS_OK;
bool hasMore;
@@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList(
@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList(
nsCAutoString leaf;
path->GetNativeLeafName(leaf);
@ -99,7 +99,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);
@@ -1062,28 +1081,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)
@ -137,14 +137,13 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
NS_WARNING("Error parsing application default preferences.");
// Load jar:$app/omni.jar!/defaults/preferences/*.js
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
if (appJarReader) {
rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
// GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
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 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downl
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 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h"
#endif
@@ -2221,16 +2225,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 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
@@ -2254,19 +2267,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 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
}
+ }
#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/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
@@ -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 @@ 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,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 @@ new file mode 100644
+ 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 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
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 @@ new file mode 100644
+ <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 @@ new file mode 100644
+ <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 @@ new file mode 100644
+</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?
@ -2094,105 +2065,10 @@ new file mode 100644
+# PrefWindow II (???)
+# PrefWindow I (June 4, 1999)
+#
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 @@
#include "nsArrayUtils.h"
#include "prnetdb.h"
#include "prenv.h"
#include "nsPrintfCString.h"
#include "nsNetUtil.h"
#include "nsISupportsPrimitives.h"
#include "nsIGSettingsService.h"
#include "nsInterfaceHashtable.h"
+#include "nsVoidArray.h"
+#include "nsKDEUtils.h"
class nsUnixSystemProxySettings : public nsISystemProxySettings {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
nsUnixSystemProxySettings() {}
nsresult Init();
@@ -67,16 +69,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
bool IsProxyMode(const char* aMode);
nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
+ nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
};
NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
nsresult
nsUnixSystemProxySettings::Init()
{
// If this is a GNOME session, load gconf and try to use its preferences.
@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR
nsCAutoString host;
rv = aURI->GetHost(host);
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 port;
rv = aURI->GetPort(&port);
NS_ENSURE_SUCCESS(rv, rv);
+ if( nsKDEUtils::kdeSupport())
+ return GetProxyFromKDE(scheme, host, port, aResult);
+
if (mProxySettings) {
rv = GetProxyFromGSettings(scheme, host, port, aResult);
if (rv == NS_OK)
return rv;
}
if (mGConf)
return GetProxyFromGConf(scheme, host, port, aResult);
@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
kUnixProxyCIDs,
kUnixProxyContracts
};
NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
+
+nsresult
+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
+ const nsACString& aHost,
+ PRInt32 aPort,
+ nsACString& aResult)
+{
+ nsCAutoString url;
+ url = aScheme;
+ url += "://";
+ url += aHost;
+ if( aPort >= 0 )
+ {
+ url += ":";
+ url += nsPrintfCString("%d", aPort);
+ }
+ nsTArray<nsCString> command;
+ command.AppendElement( NS_LITERAL_CSTRING( "GETPROXY" ));
+ command.AppendElement( url );
+ nsTArray<nsCString> result;
+ if( !nsKDEUtils::command( command, &result ) || result.Length() != 1 )
+ return NS_ERROR_FAILURE;
+ aResult = result[0];
+ return NS_OK;
+}
+
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -96,17 +96,18 @@ else
@@ -69,17 +69,18 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsNativeAppSupportCocoa.mm
EXPORTS += MacQuirks.h
@ -2216,7 +2092,7 @@ diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644
--- /dev/null
+++ b/toolkit/xre/nsKDEUtils.cpp
@@ -0,0 +1,372 @@
@@ -0,0 +1,373 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -2266,6 +2142,7 @@ new file mode 100644
+#include <limits.h>
+#include <stdio.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+
@ -2678,7 +2555,7 @@ new file mode 100644
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 \
@ -3046,7 +2923,7 @@ new file mode 100644
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>
@ -3082,7 +2959,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
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;
}
@ -3107,7 +2984,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
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();
@ -3141,7 +3018,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
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)
@ -3163,7 +3040,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
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>
@ -3182,7 +3059,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#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())
@ -3214,7 +3091,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
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);
@ -3233,7 +3110,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
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()) {
@ -3255,7 +3132,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
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 \
@ -3273,11 +3150,11 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
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"
@ -3291,7 +3168,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
#include "nsIStringBundle.h"
#include "nsArrayEnumerator.h"
@@ -51,16 +52,17 @@
@@ -19,16 +20,17 @@
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
#include "mozcontainer.h"
@ -3309,7 +3186,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
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);
}
@ -3330,7 +3207,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
return NS_ERROR_FAILURE;
}
@ -3350,7 +3227,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
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;
}
@ -3588,7 +3465,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
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;
@ -3609,7 +3486,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
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
@ -3624,7 +3501,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
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"
@ -3642,7 +3519,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
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");
@ -3660,7 +3537,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
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);
@ -3707,7 +3584,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
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;
@ -3734,7 +3611,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
#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 ||
@ -3755,7 +3632,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi
@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi
DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux)
@ -3777,7 +3654,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
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"
@ -3795,7 +3672,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prmem.h"
#include "plbase64.h"
@@ -1796,44 +1797,51 @@ nsLocalFile::SetPersistentDescriptor(con
@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@ -3861,7 +3738,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
return rv;
}
return NS_ERROR_FAILURE;
@@ -1859,16 +1867,23 @@ nsLocalFile::Launch()
@@ -1826,16 +1834,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;

14
xulrunner_nojit.patch Normal file
View file

@ -0,0 +1,14 @@
Index: mozilla-central/js/src/Makefile.in
===================================================================
--- mozilla-central.orig/js/src/Makefile.in
+++ mozilla-central/js/src/Makefile.in
@@ -923,7 +923,8 @@ endif
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+#CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=0 -DENABLE_JIT=0 -DENABLE_YARR_JIT=0
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr