Djam/firefox-esr78
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr78.git synced 2025-02-25 02:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 9.0.1

Browse source
This commit is contained in:
Rosa 2012-02-01 18:04:47 +04:00
parent 91202fbcdf
commit 53d8625627
7 changed files with 434 additions and 775 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,3 +1,3 @@
---
sources:
firefox-5.0.1.source.tar.bz2: c93b3513e160d87535a9d61c5e06a6a701e9cd3e
firefox-9.0.1.source.tar.bz2: e0748d86753eead5c0929d74158c601bf33b5db0

7
firefox-5.0.1.source.tar.bz2.asc
View file

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
iEYEABECAAYFAk4WvpQACgkQtXtUhBd4X+hPXACfcpm9QhgI7NnSEaQ3/ndVUx4k
xHwAn2/1gNJw/ZBQajKTwv17L2Z8nrGx
=1mKA
-----END PGP SIGNATURE-----

55
firefox-9.0-libpng15x.diff Normal file
View file

@ -0,0 +1,55 @@
https://hg.mozilla.org/mozilla-central/rev/aff1bd412058
diff -Naurp mozilla-release/modules/libpr0n/decoders/nsICODecoder.cpp mozilla-release.oden/modules/libpr0n/decoders/nsICODecoder.cpp
--- mozilla-release/modules/libpr0n/decoders/nsICODecoder.cpp 2011-12-16 21:29:37.000000000 +0100
+++ mozilla-release.oden/modules/libpr0n/decoders/nsICODecoder.cpp 2011-12-21 11:14:51.059478943 +0100
@@ -385,8 +385,7 @@ nsICODecoder::WriteInternal(const char*
// Raymond Chen says that 32bpp only are valid PNG ICOs
// http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() &&
- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
PostDataError();
}
return;
diff -Naurp mozilla-release/modules/libpr0n/decoders/nsPNGDecoder.h mozilla-release.oden/modules/libpr0n/decoders/nsPNGDecoder.h
--- mozilla-release/modules/libpr0n/decoders/nsPNGDecoder.h 2011-12-16 21:29:37.000000000 +0100
+++ mozilla-release.oden/modules/libpr0n/decoders/nsPNGDecoder.h 2011-12-21 11:15:04.692567378 +0100
@@ -73,19 +73,25 @@ public:
void EndImageFrame();
- // Checks if the info header contains valid information
- bool HasValidInfo() const
+ // Check if PNG is valid ICO (32bpp RGBA)
+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
+ bool IsValidICO() const
{
- return mInfo && mInfo->valid;
- }
+ png_uint_32
+ png_width, // Unused
+ png_height; // Unused
- // Obtain the pixel depth if available or 0 otherwise
- PRInt32 GetPixelDepth() const
- {
- if (!mInfo) {
- return 0;
+ int png_bit_depth,
+ png_color_type;
+
+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
+ &png_color_type, NULL, NULL, NULL)) {
+
+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+ png_bit_depth == 8);
+ } else {
+ return false;
}
- return mInfo->pixel_depth;
}
public:

299
firefox-kde.patch
View file

@ -1,29 +1,7 @@
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -44,16 +44,17 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = profile/extensions
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
$(srcdir)/profile/channel-prefs.js \
+ $(srcdir)/profile/kde.js \
$(NULL)
# hardcode en-US for the moment
AB_CD = en-US
DEFINES += -DAB_CD=$(AB_CD)
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1078 @@
diff -Naurp mozilla-release/browser/base/content/browser-kde.xul mozilla-release.oden/browser/base/content/browser-kde.xul
--- mozilla-release/browser/base/content/browser-kde.xul 1970-01-01 00:00:00.000000000 +0000
+++ mozilla-release.oden/browser/base/content/browser-kde.xul 2011-12-21 07:45:01.000000000 +0000
@@ -0,0 +1,1055 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@ -133,7 +111,9 @@ new file mode 100644
+
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
+# browser-sets.inc file for sharing with hiddenWindow.xul.
+#define FULL_BROWSER_WINDOW
+#include browser-sets.inc
+#undef FULL_BROWSER_WINDOW
+
+ <popupset id="mainPopupSet">
+ <menupopup id="tabContextMenu"
@ -163,7 +143,7 @@ new file mode 100644
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
+ <menuseparator/>
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
+ tbattr="tabbrowser-multiple"
+ tbattr="tabbrowser-multiple-visible"
+ oncommand="gBrowser.reloadAllTabs();"/>
+ <menuitem id="context_bookmarkAllTabs"
+ label="&bookmarkAllTabs.label;"
@ -201,6 +181,7 @@ new file mode 100644
+
+ <panel id="editBookmarkPanel"
+ type="arrow"
+ footertype="promobox"
+ orient="vertical"
+ ignorekeys="true"
+ hidden="true"
@ -247,15 +228,6 @@ new file mode 100644
+ </hbox>
+ </panel>
+
+ <panel id="highlighter-panel"
+ hidden="true"
+ ignorekeys="true"
+ noautofocus="true"
+ noautohide="true"
+ onclick="InspectorUI.stopInspecting();"
+ onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
+ onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
+
+ <panel id="inspector-tree-panel"
+ orient="vertical"
+ hidden="true"
@ -264,57 +236,14 @@ new file mode 100644
+ noautohide="true"
+ titlebar="normal"
+ close="true"
+ onpopuphiding="InspectorUI.closeInspectorUI(true);"
+ onpopuphiding="InspectorUI.closeInspectorUI();"
+ label="&inspectPanelTitle.label;">
+ <toolbar id="inspector-toolbar"
+ nowindowdrag="true">
+ <toolbarbutton id="inspector-inspect-toolbutton"
+ label="&inspectButton.label;"
+ accesskey="&inspectButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Inspect"/>
+ <toolbarbutton id="inspector-previous-toolbutton"
+ label="&inspectPreviousButton.label;"
+ accesskey="&inspectPreviousButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Previous"/>
+ <toolbarbutton id="inspector-next-toolbutton"
+ label="&inspectNextButton.label;"
+ accesskey="&inspectNextButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Next"/>
+ <toolbarbutton id="inspector-style-toolbutton"
+ label="&inspectStyleButton.label;"
+ accesskey="&inspectStyleButton.accesskey;"
+ class="toolbarbutton-text"
+ oncommand="InspectorUI.toggleStylePanel();"/>
+ <toolbarbutton id="inspector-dom-toolbutton"
+ label="&inspectObjectButton.label;"
+ accesskey="&inspectObjectButton.accesskey;"
+ class="toolbarbutton-text"
+ oncommand="InspectorUI.toggleDOMPanel();"/>
+ </toolbar>
+ <hbox id="tree-panel-resizer-box" align="end">
+ <spacer flex="1" />
+ <resizer dir="bottomend" />
+ </hbox>
+ </panel>
+
+ <panel id="inspector-style-panel"
+ hidden="true"
+ orient="vertical"
+ ignorekeys="true"
+ noautofocus="true"
+ noautohide="true"
+ titlebar="normal"
+ label="&inspectStylePanelTitle.label;">
+ <listbox id="inspector-style-listbox" flex="1"/>
+ <hbox align="end">
+ <spacer flex="1" />
+ <resizer dir="bottomend"/>
+ </hbox>
+ </panel>
+
+ <menupopup id="toolbar-context-menu"
+ onpopupshowing="onViewToolbarsPopupShowing(event);">
+ <menuseparator/>
@ -348,10 +277,10 @@ new file mode 100644
+ oncommand="BrowserFullScreen();"/>
+ </menupopup>
+
+ <menupopup id="contentAreaContextMenu"
+ <menupopup id="contentAreaContextMenu" pagemenu="start"
+ onpopupshowing="if (event.target != this)
+ return true;
+ gContextMenu = new nsContextMenu(this, gBrowser);
+ gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey);
+ if (gContextMenu.shouldDisplay)
+ updateEditUIVisibility();
+ return gContextMenu.shouldDisplay;"
@ -361,8 +290,13 @@ new file mode 100644
+
+ <menupopup id="placesContext"/>
+
+ <panel id="notification-popup" type="arrow" position="after_start"
+ hidden="true" orient="vertical"/>
+ <panel id="notification-popup"
+ type="arrow"
+ footertype="promobox"
+ position="after_start"
+ hidden="true"
+ orient="vertical"
+ role="alert"/>
+
+ <!-- Popup for site identity information -->
+ <panel id="identity-popup"
@ -461,6 +395,24 @@ new file mode 100644
+ </panel>
+
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
+
+ <tooltip id="back-button-tooltip">
+ <label value="&backButton.tooltip;"/>
+#ifdef XP_MACOSX
+ <label value="&backForwardButtonMenuMac.tooltip;"/>
+#else
+ <label value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+
+ <tooltip id="forward-button-tooltip">
+ <label value="&forwardButton.tooltip;"/>
+#ifdef XP_MACOSX
+ <label value="&backForwardButtonMenuMac.tooltip;"/>
+#else
+ <label value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+ </popupset>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
@ -487,15 +439,11 @@ new file mode 100644
+#endif
+
+<deck flex="1" id="tab-view-deck">
+<vbox flex="1">
+<vbox flex="1" id="browser-panel">
+
+ <toolbox id="navigator-toolbox"
+ defaultmode="icons" mode="icons"
+#ifdef WINCE
+ defaulticonsize="small" iconsize="small"
+#else
+ iconsize="large"
+#endif
+ tabsontop="true"
+ persist="tabsontop">
+ <!-- Menu -->
@ -523,13 +471,8 @@ new file mode 100644
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+ fullscreentoolbar="true" mode="icons" customizable="true"
+#ifdef WINCE
+ iconsize="small" defaulticonsize="small"
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
+#else
+ iconsize="large"
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
+#endif
+ context="toolbar-context-menu">
+
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
@ -539,12 +482,12 @@ new file mode 100644
+ label="&backCmd.label;"
+ command="Browser:BackOrBackDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&backButton.tooltip;"/>
+ tooltip="back-button-tooltip"/>
+ <toolbarbutton id="forward-button" class="toolbarbutton-1"
+ label="&forwardCmd.label;"
+ command="Browser:ForwardOrForwardDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&forwardButton.tooltip;"/>
+ tooltip="forward-button-tooltip"/>
+ </toolbaritem>
+
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
@ -877,9 +820,8 @@ new file mode 100644
+ key="key_tabview"
+ label="&viewTabGroups.label;"
+ command="Browser:ToggleTabView"
+ observes="tabviewGroupsNumber"
+ keepme="true"/>
+ <menuseparator id="alltabs-popup-separator" keepme="true"/>
+ observes="tabviewGroupsNumber"/>
+ <menuseparator id="alltabs-popup-separator"/>
+ </menupopup>
+ </toolbarbutton>
+
@ -1025,6 +967,19 @@ new file mode 100644
+ </hbox>
+
+ <vbox id="browser-bottombox" layer="true">
+ <toolbar id="inspector-toolbar"
+ nowindowdrag="true"
+ hidden="true">
+ <toolbarbutton id="inspector-inspect-toolbutton"
+ label="&inspectButton.label;"
+ accesskey="&inspectButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Inspect"/>
+ <toolbarseparator />
+ <hbox id="inspector-tools">
+ <!-- registered tools go here -->
+ </hbox>
+ </toolbar>
+ <toolbar id="addon-bar"
+ toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
+ collapsed="true"
@ -1058,7 +1013,7 @@ new file mode 100644
+ <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.46" cy="0.48" r="0.65"/>
+ <svg:circle cx="-0.41" cy="0.5" r="0.65"/>
+ </svg:mask>
+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
+ <svg:circle cx="9" cy="3" r="3" fill="white"/>
@ -1102,37 +1057,22 @@ new file mode 100644
+</deck>
+
+</window>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -22,16 +22,18 @@ browser.jar:
* content/browser/aboutHome.css (content/aboutHome.css)
content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png)
content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
diff -Naurp mozilla-release/browser/base/jar.mn mozilla-release.oden/browser/base/jar.mn
--- mozilla-release/browser/base/jar.mn 2011-12-16 20:29:12.000000000 +0000
+++ mozilla-release.oden/browser/base/jar.mn 2011-12-21 07:47:08.000000000 +0000
@@ -28,6 +28,8 @@ browser.jar:
* content/browser/browser.css (content/browser.css)
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/content.js (content/content.js)
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
* content/browser/inspector.html (content/inspector.html)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
* content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css)
* content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml)
* content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js)
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 @@
#include "nsBrowserCompsCID.h"
#include "DirectoryProvider.h"
#if defined(XP_WIN)
#include "nsWindowsShellService.h"
diff -Naurp mozilla-release/browser/components/build/nsModule.cpp mozilla-release.oden/browser/components/build/nsModule.cpp
--- mozilla-release/browser/components/build/nsModule.cpp 2011-12-16 20:29:12.000000000 +0000
+++ mozilla-release.oden/browser/components/build/nsModule.cpp 2011-12-21 07:45:01.000000000 +0000
@@ -46,7 +46,7 @@
#elif defined(XP_MACOSX)
#include "nsMacShellService.h"
#elif defined(MOZ_WIDGET_GTK2)
@ -1140,18 +1080,8 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
+#include "nsUnixShellService.h"
#endif
#ifndef WINCE
#include "nsProfileMigrator.h"
#include "nsDogbertProfileMigrator.h"
#if !defined(XP_OS2)
#include "nsOperaProfileMigrator.h"
@@ -82,18 +82,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
#if defined(XP_WIN)
@@ -76,8 +76,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(Directory
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
#elif defined(XP_MACOSX)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
@ -1159,18 +1089,8 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
#endif
#ifndef WINCE
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
#if !defined(XP_OS2)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
#endif
@@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM
#endif /* WINCE */
NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
{ &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
@@ -119,7 +117,7 @@ static const mozilla::Module::CIDEntry k
#if defined(XP_WIN)
{ &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
#elif defined(MOZ_WIDGET_GTK2)
@ -1179,20 +1099,10 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#endif
{ &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
#ifndef WINCE
{ &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
#if defined(XP_WIN) && !defined(__MINGW32__)
{ &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
#elif defined(XP_MACOSX)
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
@@ -683,24 +683,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;
diff -Naurp mozilla-release/browser/components/preferences/advanced.js mozilla-release.oden/browser/components/preferences/advanced.js
--- mozilla-release/browser/components/preferences/advanced.js 2011-12-16 20:29:12.000000000 +0000
+++ mozilla-release.oden/browser/components/preferences/advanced.js 2011-12-21 07:45:01.000000000 +0000
@@ -688,14 +688,32 @@ var gAdvancedPane = {
const IPS = Components.interfaces.nsIPromptService;
var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(IPS);
@ -1226,20 +1136,10 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
}
else {
promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
[brandShortName]);
psvc.alert(window, promptTitle, promptMessage);
}
}
#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
@@ -52,17 +52,18 @@ endif
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
CPPSRCS = nsWindowsShellService.cpp
else
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff -Naurp mozilla-release/browser/components/shell/src/Makefile.in mozilla-release.oden/browser/components/shell/src/Makefile.in
--- mozilla-release/browser/components/shell/src/Makefile.in 2011-12-16 20:29:12.000000000 +0000
+++ mozilla-release.oden/browser/components/shell/src/Makefile.in 2011-12-21 07:45:01.000000000 +0000
@@ -57,7 +57,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS = nsMacShellService.cpp
else
ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
@ -1249,15 +1149,9 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell
endif
endif
endif
ifdef CPPSRCS
LIBRARY_NAME = shellservice_s
endif
diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.cpp
diff -Naurp mozilla-release/browser/components/shell/src/nsKDEShellService.cpp mozilla-release.oden/browser/components/shell/src/nsKDEShellService.cpp
--- mozilla-release/browser/components/shell/src/nsKDEShellService.cpp 1970-01-01 00:00:00.000000000 +0000
+++ mozilla-release.oden/browser/components/shell/src/nsKDEShellService.cpp 2011-12-21 07:45:01.000000000 +0000
@@ -0,0 +1,193 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -1452,10 +1346,9 @@ new file mode 100644
+ NS_ADDREF(*_retval = defaultReader);
+ return NS_OK;
+ }
diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.h
diff -Naurp mozilla-release/browser/components/shell/src/nsKDEShellService.h mozilla-release.oden/browser/components/shell/src/nsKDEShellService.h
--- mozilla-release/browser/components/shell/src/nsKDEShellService.h 1970-01-01 00:00:00.000000000 +0000
+++ mozilla-release.oden/browser/components/shell/src/nsKDEShellService.h 2011-12-21 07:45:01.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -1516,10 +1409,9 @@ new file mode 100644
+};
+
+#endif // nskdeshellservice_h____
diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.cpp
diff -Naurp mozilla-release/browser/components/shell/src/nsUnixShellService.cpp mozilla-release.oden/browser/components/shell/src/nsUnixShellService.cpp
--- mozilla-release/browser/components/shell/src/nsUnixShellService.cpp 1970-01-01 00:00:00.000000000 +0000
+++ mozilla-release.oden/browser/components/shell/src/nsUnixShellService.cpp 2011-12-21 07:45:01.000000000 +0000
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -1573,10 +1465,9 @@ new file mode 100644
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.h
diff -Naurp mozilla-release/browser/components/shell/src/nsUnixShellService.h mozilla-release.oden/browser/components/shell/src/nsUnixShellService.h
--- mozilla-release/browser/components/shell/src/nsUnixShellService.h 1970-01-01 00:00:00.000000000 +0000
+++ mozilla-release.oden/browser/components/shell/src/nsUnixShellService.h 2011-12-21 07:45:01.000000000 +0000
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -1623,15 +1514,10 @@ new file mode 100644
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
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
@@ -442,16 +442,17 @@
#endif
#endif
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
diff -Naurp mozilla-release/browser/installer/package-manifest.in mozilla-release.oden/browser/installer/package-manifest.in
--- mozilla-release/browser/installer/package-manifest.in 2011-12-16 20:29:13.000000000 +0000
+++ mozilla-release.oden/browser/installer/package-manifest.in 2011-12-21 07:45:01.000000000 +0000
@@ -429,6 +429,7 @@
@BINPATH@/@PREF_DIR@/firefox.js
@BINPATH@/@PREF_DIR@/firefox-branding.js
@BINPATH@/@PREF_DIR@/channel-prefs.js
@ -1639,8 +1525,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/@PREF_DIR@/services-sync.js
#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/defaults/profile/prefs.js

19
firefox-lang.patch
View file

@ -1,12 +1,13 @@
--- ./browser/app/profile/firefox.js.lang 2011-06-28 16:49:38.657881620 -0300
+++ ./browser/app/profile/firefox.js 2011-06-28 16:52:35.979709761 -0300
@@ -430,6 +430,9 @@ pref("general.warnOnAboutConfig",
pref("dom.max_script_run_time", 20);
#endif
--- mozilla-beta/browser/app/profile/firefox.js.lang 2011-07-21 19:18:31.000000000 -0300
+++ mozilla-beta/browser/app/profile/firefox.js 2011-07-30 20:57:54.707580609 -0300
@@ -220,6 +220,10 @@ pref("keyword.URL", "");
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
+// Use system environment variable to choose locale
+// Use LANG 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
+
pref("general.smoothScroll", false);
#ifdef UNIX_BUT_NOT_MAC
pref("general.autoScroll", false);

147
firefox.spec
View file

@ -1,4 +1,4 @@
%define major 5
%define major 9
%define realver %{major}.0.1
# (tpg) MOZILLA_FIVE_HOME
@ -15,6 +15,12 @@
%define release %mkrel 0
%endif
# 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)
Summary: Mozilla Firefox web browser
Name: firefox
Version: %{realver}
@ -23,7 +29,6 @@ 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
Source1: %{SOURCE0}.asc
Source4: firefox.desktop
Source5: firefox-searchengines-jamendo.xml
Source6: firefox-searchengines-exalead.xml
@ -32,32 +37,40 @@ 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
# (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-9.0-libpng15x.diff
BuildRequires: gtk+2-devel
BuildRequires: libnspr-devel >= 4.8.7
BuildRequires: nss-devel
BuildRequires: nss-static-devel
BuildRequires: sqlite3-devel
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
BuildRequires: sqlite3-devel >= 3.7.1
Requires: %{nss_libname} >= 2:%{nss_version}
BuildRequires: nspr-devel >= 2:4.8.8
BuildRequires: nss-devel >= 2:3.13.1
BuildRequires: nss-static-devel >= 2:3.13.1
BuildRequires: sqlite3-devel >= 3.7.7.1
BuildRequires: libproxy-devel
BuildRequires: libalsa-devel
BuildRequires: libiw-devel
BuildRequires: libevent-devel >= 1.4.7
BuildRequires: libvpx-devel >= 0.9.5
BuildRequires: unzip
BuildRequires: zip
#(tpg) older versions doesn't support apng extension
%if %mdkversion > 201200
BuildRequires: libpng-devel >= 1.4.1
%if %mdkversion >= 201101
BuildRequires: libpng-devel >= 1.4.8
%endif
BuildRequires: makedepend
BuildRequires: python
BuildRequires: valgrind
BuildRequires: rootcerts
BuildRequires: doxygen
BuildRequires: libgnome-vfs2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnome2-devel
BuildRequires: libgnomeui2-devel
BuildRequires: java-rpmbuild
@ -74,14 +87,6 @@ Requires: xdg-utils
%define ff_deps myspell-en_US nspluginwrapper
Suggests: %{ff_deps}
#Requires: mailcap
#Conflicts with stable firefox
#Conflicts: firefox
#Obsoletes: firefox
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description
Mozilla Firefox is a web browser
@ -100,10 +105,11 @@ Files and macros mainly for building Firefox extensions.
%patch2 -p1 -b .vendor
%patch3 -p1 -b .defaultbrowser
%patch6 -p1 -b .wintitle
%patch7 -p1 -b .libpng15x
## KDE INTEGRATION
# copy current files and patch them later to keep them in sync
%patch4 -p1 -b .kde
%patch41 -p1 -b .kdemoz
%patch41 -F 1 -p1 -b .kdemoz
# install kde.js
install -m 644 %{SOURCE9} browser/app/profile/kde.js
@ -114,17 +120,10 @@ install -m 644 %{SOURCE9} browser/app/profile/kde.js
rm -rf browser/locales/en-US/profile/bookmarks.html
touch browser/locales/en-US/profile/bookmarks.html
# 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=./mozconfig
export MOZCONFIG=`pwd`/mozconfig
cat << EOF > $MOZCONFIG
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
@ -138,28 +137,30 @@ 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 --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-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 > 201200
ac_add_options --with-system-png
%else
ac_add_options --without-system-png
%endif
ac_add_options --with-system-jpeg
%if %mdkversion >= 201100
ac_add_options --enable-system-cairo
ac_add_options --enable-system-sqlite
%else
ac_add_options --disable-system-cairo
ac_add_options --disable-system-sqlite
%endif
ac_add_options --with-distribution-id=com.mandriva
ac_add_options --disable-crashreporter
@ -216,6 +217,21 @@ user_pref("security.ssl.require_safe_negotiation", false);
user_pref("browser.startup.homepage","file:///usr/share/doc/HTML/index.html");
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/mandriva.js
pref("extensions.autoDisableScopes", 0);
pref("extensions.shownSelectionUI", true);
EOF
# search engines
cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/searchplugins/jamendo.xml
cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
@ -225,8 +241,6 @@ cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
%find_lang %{name}
mkdir -p %{buildroot}%{_sys_macros_dir}
cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
# Macros from %{name} package
@ -249,11 +263,11 @@ if [ ! -r /etc/sysconfig/oem ]; then
ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
fi
%files -f %{name}.lang
%files
%{_bindir}/firefox
%{_iconsdir}/hicolor/*/apps/*.png
%{_datadir}/applications/*.desktop
%{_libdir}/%{name}-%{realver}*
%{_libdir}/%{name}-%{realver}/
%dir %{_libdir}/mozilla
%dir %{pluginsdir}
@ -262,9 +276,60 @@ fi
%changelog
* Wed Aug 03 2011 Funda Wang <fwang@mandriva.org> 5.0.1-0.1mdv2011.0
+ Revision: 692943
* Fri Jan 13 2012 Oden Eriksson <oeriksson@mandriva.com> 9.0.1-1
+ Revision: 760609
- sync with MDVA-2011:096
* Wed Dec 21 2011 Oden Eriksson <oeriksson@mandriva.com> 9.0-1
+ Revision: 744085
- fix build
- 9.0
- rediffed the kde patches (P4,P41)
- use --with-system-libevent
- use --with-system-libvpx
* Tue Dec 20 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 8.0.1-2
+ Revision: 744016
- rebuild to get proper %%_sys_macros_dir
+ Zé <ze@mandriva.org>
- clean BR
- firefox install dir needs to be owned to be uninstalled
* Mon Nov 28 2011 Oden Eriksson <oeriksson@mandriva.com> 8.0.1-1
+ Revision: 734973
- stupid rpm5
- duh!
- 8.0.1
* Wed Nov 09 2011 Oden Eriksson <oeriksson@mandriva.com> 8.0-1
+ Revision: 729370
- sync with what's soon shows up with MDVSA-2011:169
* Sat Oct 01 2011 Oden Eriksson <oeriksson@mandriva.com> 7.0.1-1
+ Revision: 702204
- stole the kde patches from mageia, which in turn stems from suse (thanks neoclust)
- 7.0.1
- fix build
- rediff some patches
* Wed Sep 07 2011 Oden Eriksson <oeriksson@mandriva.com> 6.0.2-1
+ Revision: 698626
- 6.0.2
* Thu Sep 01 2011 Guilherme Moro <guilherme@mandriva.com> 6.0.1-0
+ Revision: 697733
- updated to version 6.0.1
* Fri Aug 19 2011 Guilherme Moro <guilherme@mandriva.com> 6.0-0
+ Revision: 695828
- Updated to version 6.0
* Mon Jul 25 2011 Funda Wang <fwang@mandriva.org> 5.0.1-1
+ Revision: 691499
- disable system png for now
- new version 5.0.1
fix garbage character in window title (patch from fedora)
* Tue Jun 28 2011 Götz Waschk <waschk@mandriva.org> 5.0-2
+ Revision: 687985

674
mozilla-kde.patch
View file

File diff suppressed because it is too large Load diff