From 9547dd1d42341dc56bfdb0557dea77253835df16 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Fri, 3 Feb 2012 16:39:16 +0100 Subject: Fixed rhbz#786983 --- firefox.spec | 8 +++++++- mozilla-703633.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 mozilla-703633.patch diff --git a/firefox.spec b/firefox.spec index 51f0a3c..d1180fc 100644 --- a/firefox.spec +++ b/firefox.spec @@ -45,7 +45,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 10.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -69,6 +69,8 @@ Patch14: firefox-5.0-asciidel.patch Patch15: firefox-8.0-enable-addons.patch # Upstream patches +# fixes non functional web development tools, obsolete by version 11 +Patch100: mozilla-703633.patch %if %{official_branding} # Required by Mozilla Corporation @@ -115,6 +117,7 @@ cd %{tarballdir} %patch15 -p2 -b .addons # Upstream patches +%patch100 -p1 -b .703633 %if %{official_branding} # Required by Mozilla Corporation @@ -344,6 +347,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Feb 3 2012 Jan Horak - 10.0-2 +- Fixed rhbz#786983 + * Tue Jan 31 2012 Jan Horak - 10.0-1 - Update to 10.0 diff --git a/mozilla-703633.patch b/mozilla-703633.patch new file mode 100644 index 0000000..b2a9451 --- /dev/null +++ b/mozilla-703633.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# User Mike Hommey +# Date 1321637776 -3600 +# Node ID a5c78674f5edf4c1cea091ae900e187f4f8ce6a9 +# Parent 4a16dc96aab3c56b1dda84e197e1e6c0db8fab6d +Bug 703633 - TreePanel.jsm uses a resource:/// url that ought to be resource://gre/ + +diff --git a/browser/devtools/highlighter/TreePanel.jsm b/browser/devtools/highlighter/TreePanel.jsm +--- a/browser/devtools/highlighter/TreePanel.jsm ++++ b/browser/devtools/highlighter/TreePanel.jsm +@@ -40,17 +40,17 @@ + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + + const Cu = Components.utils; + + Cu.import("resource:///modules/domplate.jsm"); + Cu.import("resource:///modules/InsideOutBox.jsm"); +-Cu.import("resource:///modules/Services.jsm"); ++Cu.import("resource://gre/modules/Services.jsm"); + + var EXPORTED_SYMBOLS = ["TreePanel", "DOMHelpers"]; + + const INSPECTOR_URI = "chrome://browser/content/inspector.html"; + + /** + * TreePanel + * A container for the Inspector's HTML Tree Panel widget constructor function. -- cgit