forked from pool/MozillaFirefox
Accepting request 38784 from mozilla:Factory
checked in (request 38784) OBS-URL: https://build.opensuse.org/request/show/38784 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=151
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
c6030257cf
commit
a56c5f380e
@ -1,11 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 18 09:42:40 CEST 2010 - wr@rosenauer.org
|
||||
|
||||
- security update to 3.6.4 (Lorentz)
|
||||
* enable crashreporter also for x86-64
|
||||
* Flash runs in a separate process to avoid crashing Firefox
|
||||
(ix86 only; x86-64 still uses nspluginwrapper)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 1 11:15:38 UTC 2010 - wr@rosenauer.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package MozillaFirefox (Version 3.6.4)
|
||||
# spec file for package MozillaFirefox (Version 3.6.3)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# 2006-2010 Wolfgang Rosenauer
|
||||
@ -22,7 +22,7 @@
|
||||
Name: MozillaFirefox
|
||||
%define xulrunner mozilla-xulrunner192
|
||||
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
|
||||
BuildRequires: %{xulrunner}-devel = 1.9.2.4
|
||||
BuildRequires: %{xulrunner}-devel = 1.9.2.3
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
@ -34,9 +34,9 @@ BuildRequires: wireless-tools
|
||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||
Provides: web_browser
|
||||
Provides: firefox
|
||||
Version: 3.6.4
|
||||
Version: 3.6.3
|
||||
Release: 1
|
||||
%define releasedate 2010041700
|
||||
%define releasedate 2010040100
|
||||
Summary: Mozilla Firefox Web Browser
|
||||
Url: http://www.mozilla.org/
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
@ -63,7 +63,6 @@ Patch8: firefox-appname.patch
|
||||
Patch9: firefox-kde.patch
|
||||
Patch10: firefox-ui-lockdown.patch
|
||||
Patch11: firefox-crashreporter.patch
|
||||
Patch12: mozilla-crashreporter-x86_64.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(post): coreutils shared-mime-info desktop-file-utils
|
||||
Requires(postun): shared-mime-info desktop-file-utils
|
||||
@ -167,7 +166,6 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js
|
||||
%endif
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
%build
|
||||
export MOZ_BUILD_DATE=%{releasedate}
|
||||
@ -361,7 +359,9 @@ fi
|
||||
%{progdir}/%{progname}
|
||||
%{progdir}/application.ini
|
||||
%{progdir}/blocklist.xml
|
||||
%ifarch %ix86
|
||||
%{progdir}/crashreporter-override.ini
|
||||
%endif
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/mime/packages/%{progname}.xml
|
||||
%{_datadir}/pixmaps/firefox*
|
||||
|
||||
3
firefox-3.6.3-source.tar.bz2
Normal file
3
firefox-3.6.3-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e7211b6f12ea8a582f3a483cac0d97283436e5099b7c2a629a2d0093fa822b2c
|
||||
size 48515639
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ebca276020201c7e2ca4293496cb333ad5c4bfcb48927a9f19532f7929cfba1e
|
||||
size 50963084
|
||||
@ -17,8 +17,8 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
||||
# hardcode en-US for the moment
|
||||
AB_CD = en-US
|
||||
|
||||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
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
|
||||
@ -1149,7 +1149,7 @@ new file mode 100644
|
||||
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
||||
--- a/browser/installer/package-manifest.in
|
||||
+++ b/browser/installer/package-manifest.in
|
||||
@@ -400,16 +400,17 @@
|
||||
@@ -395,16 +395,17 @@
|
||||
@BINPATH@/icons/*.png
|
||||
#endif
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ Subject: Firefox chrome lockdown hooks
|
||||
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
--- a/browser/base/content/browser.js
|
||||
+++ b/browser/base/content/browser.js
|
||||
@@ -1180,32 +1180,186 @@ function prepareForStartup() {
|
||||
@@ -1174,32 +1174,186 @@ function prepareForStartup() {
|
||||
// setup our MozApplicationManifest listener
|
||||
gBrowser.addEventListener("MozApplicationManifest",
|
||||
OfflineApps, false);
|
||||
@ -192,14 +192,14 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
PlacesStarButton.init();
|
||||
|
||||
// called when we go into full screen, even if it is
|
||||
@@ -1406,16 +1560,18 @@ function BrowserShutdown()
|
||||
@@ -1399,16 +1553,18 @@ function BrowserShutdown()
|
||||
Components.utils.reportError(ex);
|
||||
}
|
||||
|
||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
|
||||
os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
|
||||
os.removeObserver(gMissingPluginInstaller, "plugin-crashed");
|
||||
|
||||
+ gPrefService.removeObserver("config.lockdown.", lockdownObserver);
|
||||
+
|
||||
@ -211,7 +211,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
|
||||
PlacesStarButton.uninit();
|
||||
|
||||
@@ -3216,16 +3372,23 @@ function FillHistoryMenu(aParent) {
|
||||
@@ -3208,16 +3364,23 @@ function FillHistoryMenu(aParent) {
|
||||
|
||||
// Remove old entries if any
|
||||
var children = aParent.childNodes;
|
||||
@ -235,7 +235,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
return false;
|
||||
|
||||
const MAX_HISTORY_MENU_ITEMS = 15;
|
||||
@@ -3365,16 +3528,17 @@ function BrowserCustomizeToolbar()
|
||||
@@ -3357,16 +3520,17 @@ function BrowserCustomizeToolbar()
|
||||
{
|
||||
// Disable the toolbar context menu items
|
||||
var menubar = document.getElementById("main-menubar");
|
||||
@ -253,7 +253,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
var customizeURL = "chrome://global/content/customizeToolbar.xul";
|
||||
gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false);
|
||||
|
||||
@@ -3402,16 +3566,31 @@ function BrowserCustomizeToolbar()
|
||||
@@ -3394,16 +3558,31 @@ function BrowserCustomizeToolbar()
|
||||
} else {
|
||||
return window.openDialog(customizeURL,
|
||||
"CustomizeToolbar",
|
||||
@ -285,7 +285,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
|
||||
// Update global UI elements that may have been added or removed
|
||||
if (aToolboxChanged) {
|
||||
@@ -3419,16 +3598,27 @@ function BrowserToolboxCustomizeDone(aTo
|
||||
@@ -3411,16 +3590,27 @@ function BrowserToolboxCustomizeDone(aTo
|
||||
if (gURLBar)
|
||||
gURLBar.emptyText = gURLBarEmptyText.value;
|
||||
|
||||
@ -313,7 +313,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
|
||||
// support downgrading to Firefox 2.0
|
||||
var navBar = document.getElementById("nav-bar");
|
||||
@@ -3453,18 +3643,17 @@ function BrowserToolboxCustomizeDone(aTo
|
||||
@@ -3445,18 +3635,17 @@ function BrowserToolboxCustomizeDone(aTo
|
||||
XULBrowserWindow.asyncUpdateUI();
|
||||
PlacesStarButton.updateState();
|
||||
}
|
||||
@ -333,7 +333,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
#endif
|
||||
|
||||
// XXX Shouldn't have to do this, but I do
|
||||
@@ -4552,16 +4741,19 @@ function onViewToolbarsPopupShowing(aEve
|
||||
@@ -4544,16 +4733,19 @@ function onViewToolbarsPopupShowing(aEve
|
||||
var toolbarName = toolbar.getAttribute("toolbarname");
|
||||
if (toolbarName) {
|
||||
let menuItem = document.createElement("menuitem");
|
||||
@ -353,7 +353,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||
}
|
||||
toolbar = toolbar.nextSibling;
|
||||
}
|
||||
@@ -6737,17 +6929,23 @@ BookmarkAllTabsHandler.prototype = {
|
||||
@@ -6421,17 +6613,23 @@ BookmarkAllTabsHandler.prototype = {
|
||||
|
||||
_updateCommandState: function BATH__updateCommandState(aTabClose) {
|
||||
var numTabs = gBrowser.tabContainer.childNodes.length;
|
||||
|
||||
3
l10n-3.6.3.tar.bz2
Normal file
3
l10n-3.6.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4de534dc1c5ad51a267042a409f0cf1be339b4b512a38e810fb9c84e229f23d6
|
||||
size 36338527
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2d7f313a0c4bdf630f3efd5791e05b5b6474a0d961fe8f0a8c151a9930ac4987
|
||||
size 36861440
|
||||
@ -1,38 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Ted Mielczarek <ted.mielczarek@gmail.com>
|
||||
# Date 1269522979 14400
|
||||
# Node ID a00284a2b2f0063b0f053938c1775cf207fe25bb
|
||||
# Parent 33d05f60932bac3d66231a54840cbdd173297fff
|
||||
bug 554021 - enable compiling Breakpad on Linux/x86-64 by default
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -5858,13 +5858,20 @@
|
||||
dnl = Breakpad crash reporting (on by default on supported platforms)
|
||||
dnl ========================================================
|
||||
|
||||
-if (test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
|
||||
- || test "$OS_ARCH" = "Darwin" \
|
||||
- || test "$OS_ARCH" = "Linux" -a "$CPU_ARCH" = "x86" \
|
||||
- || test "$OS_ARCH" = "SunOS") \
|
||||
- && test -z "$HAVE_64BIT_OS"; then
|
||||
- MOZ_CRASHREPORTER=1
|
||||
-fi
|
||||
+case $target in
|
||||
+i?86-*-mingw*)
|
||||
+ MOZ_CRASHREPORTER=1
|
||||
+ ;;
|
||||
+i?86-apple-darwin*|powerpc-apple-darwin*)
|
||||
+ MOZ_CRASHREPORTER=1
|
||||
+ ;;
|
||||
+i?86-*-linux*|x86_64-*-linux*)
|
||||
+ MOZ_CRASHREPORTER=1
|
||||
+ ;;
|
||||
+*solaris*)
|
||||
+ MOZ_CRASHREPORTER=1
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(crashreporter,
|
||||
[ --disable-crashreporter Disable breakpad crash reporting],
|
||||
Loading…
Reference in New Issue
Block a user