snapshot update (20120807)
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 07 Aug 2012 23:34:17 +0200
changeset 522 fdca14856f37
parent 517 fa93154734b8
child 523 63035f012f7d
snapshot update (20120807)
MozillaFirefox/MozillaFirefox.spec
firefox-kde.patch
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Jul 29 11:18:32 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Aug 07 23:34:17 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012072300
+%define         releasedate 2012080700
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -273,8 +273,8 @@
 ac_add_options --sysconfdir=%{_sysconfdir}
 ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
 ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
 #ac_add_options --with-system-jpeg    # libjpeg-turbo is used internally
 #ac_add_options --with-system-png     # doesn't work because of missing APNG support
@@ -551,6 +551,8 @@
 %{progdir}/omni.ja
 %{progdir}/platform.ini
 %{progdir}/plugin-container
+%{progdir}/webapprt-stub
+%{progdir}/webapprt/
 %if %crashreporter
 %{progdir}/crashreporter-override.ini
 %{progdir}/crashreporter
--- a/firefox-kde.patch	Sun Jul 29 11:18:32 2012 +0200
+++ b/firefox-kde.patch	Tue Aug 07 23:34:17 2012 +0200
@@ -1298,7 +1298,7 @@
 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
-@@ -22,16 +22,22 @@ var gAdvancedPane = {
+@@ -23,16 +23,22 @@ var gAdvancedPane = {
      if (extraArgs && extraArgs["advancedTab"]){
        advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
      } else {
@@ -1321,14 +1321,14 @@
  #endif
      this.updateOfflineApps();
  #ifdef MOZ_CRASHREPORTER
-@@ -705,12 +711,23 @@ var gAdvancedPane = {
-   /**
+@@ -715,12 +721,23 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
    {
-     var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
-                              .getService(Components.interfaces.nsIShellService);
+     let shellSvc = getShellService();
+     if (!shellSvc)
+       return;
      shellSvc.setDefaultBrowser(true, false);
 +    if (kde_session == 1) {
 +      var shellObj = Components.classes["@mozilla.org/file/local;1"]