--- a/MozillaFirefox/MozillaFirefox.changes Sun Jan 23 11:00:33 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Wed Jan 26 16:43:00 2011 +0100
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 26 15:41:56 UTC 2011 - wr@rosenauer.org
+
+- set correct desktop file name within KDE for 11.4 and up
+
-------------------------------------------------------------------
Sat Jan 22 22:21:52 UTC 2011 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Sun Jan 23 11:00:33 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Jan 26 16:43:00 2011 +0100
@@ -57,12 +57,13 @@
Patch3: firefox-browser-css.patch
Patch4: firefox-cross-desktop.patch
Patch5: firefox-kde.patch
-Patch6: firefox-ui-lockdown.patch
-Patch7: firefox-no-sync-l10n.patch
-Patch8: firefox-libxulsdk-locales.patch
-Patch9: firefox-no-default-ualocale.patch
-Patch10: firefox-multilocale-chrome.patch
-Patch11: firefox-shellservice.patch
+Patch6: firefox-kde-114.patch
+Patch7: firefox-ui-lockdown.patch
+Patch8: firefox-no-sync-l10n.patch
+Patch9: firefox-libxulsdk-locales.patch
+Patch10: firefox-no-default-ualocale.patch
+Patch11: firefox-multilocale-chrome.patch
+Patch12: firefox-shellservice.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
@@ -165,12 +166,15 @@
# install kde.js
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif
-#%patch6 -p1
-%patch7 -p1
+%if %suse_version >= 1140
+%patch6 -p1
+%endif
+#%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-kde-114.patch Wed Jan 26 16:43:00 2011 +0100
@@ -0,0 +1,1 @@
+../firefox-kde-114.patch
\ No newline at end of file
--- a/firefox-cross-desktop.patch Sun Jan 23 11:00:33 2011 +0100
+++ b/firefox-cross-desktop.patch Wed Jan 26 16:43:00 2011 +0100
@@ -1,13 +1,15 @@
From: Wolfgang Rosenauer
-Subject: NonGnome/KDE integration
+NonGnome/KDE integration
+
References:
https://bugzilla.novell.com/show_bug.cgi?id=170055
-Caveats: desktop file name of Firefox is hardcoded to MozillaFirefox
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
-@@ -210,13 +210,15 @@ nsContextMenu.prototype = {
+@@ -237,17 +237,19 @@ nsContextMenu.prototype = {
+ this.showItem("context-sep-viewsource", shouldShow);
+
// Set as Desktop background depends on whether an image was clicked on,
// and only works if we have a shell service.
var haveSetDesktopBackground = false;
@@ -24,46 +26,5 @@
haveSetDesktopBackground && this.onLoadedImage);
if (haveSetDesktopBackground && this.onLoadedImage) {
-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
-@@ -594,20 +594,38 @@ var gAdvancedPane = {
- 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);
-+
-+ 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);
- }
+ document.getElementById("context-setDesktopBackground")
+ .disabled = this.disableSetDesktopBackground();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox-kde-114.patch Wed Jan 26 16:43:00 2011 +0100
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a
+With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
+
+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
+@@ -705,17 +705,17 @@ var gAdvancedPane = {
+ 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"];
++ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"];
+ process.run(false, args, args.length);
+ }
+ }
+ }
+ else {
+ promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
+ [brandShortName]);
+ psvc.alert(window, promptTitle, promptMessage);
--- a/firefox-kde.patch Sun Jan 23 11:00:33 2011 +0100
+++ b/firefox-kde.patch Wed Jan 26 16:43:00 2011 +0100
@@ -1168,6 +1168,53 @@
#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;
+ const IPS = Components.interfaces.nsIPromptService;
+ var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+ .getService(IPS);
++
++ 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);
+ }
+ }
+ #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
--- a/firefox-libxulsdk-locales.patch Sun Jan 23 11:00:33 2011 +0100
+++ b/firefox-libxulsdk-locales.patch Wed Jan 26 16:43:00 2011 +0100
@@ -1,5 +1,6 @@
# HG changeset patch
-# Parent bc45125446bfa168631a01c0b4b9b830c39d109a
+# Parent 2f2f266d47e42bf9ff421deeeeea2dd1985b19b0
+We need to package toolkit locales explicitely into firefox langpacks even in xulrunner based builds
diff --git a/browser/makefiles.sh b/browser/makefiles.sh
--- a/browser/makefiles.sh
--- a/firefox-shellservice.patch Sun Jan 23 11:00:33 2011 +0100
+++ b/firefox-shellservice.patch Wed Jan 26 16:43:00 2011 +0100
@@ -1,5 +1,6 @@
# HG changeset patch
-# Parent 7530e890ad6ed214783244371ec1ef816d24083e
+# Parent e46704258210bc68bc65773f60a0d32cb2ce767d
+Bug 611953 - GNOME 3.0 readiness (based on patch 3)
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
--- a/series Sun Jan 23 11:00:33 2011 +0100
+++ b/series Wed Jan 26 16:43:00 2011 +0100
@@ -19,6 +19,7 @@
firefox-browser-css.patch
firefox-cross-desktop.patch
firefox-kde.patch
+firefox-kde-114.patch
#firefox-ui-lockdown.patch
firefox-no-sync-l10n.patch
firefox-libxulsdk-locales.patch