fixed patches for FF58
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 11 Jan 2018 16:29:08 +0100
changeset 1021 1307721d2345
parent 1020 d2c159cb9bf2
child 1022 03725f6ff207
fixed patches for FF58
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
firefox-kde.patch
mozilla-kde.patch
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Jan 11 10:37:42 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Jan 11 16:29:08 2018 +0100
@@ -373,7 +373,7 @@
 ac_add_options --disable-webrtc
 %endif
 EOF
-make -f client.mk build
+./mach build
 
 %install
 cd $RPM_BUILD_DIR/obj
--- a/MozillaFirefox/create-tar.sh	Thu Jan 11 10:37:42 2018 +0100
+++ b/MozillaFirefox/create-tar.sh	Thu Jan 11 16:29:08 2018 +0100
@@ -8,7 +8,7 @@
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
 RELEASE_TAG="FIREFOX_58_0b15_RELEASE"
-VERSION="57.99
+VERSION="57.99"
 
 # mozilla
 if [ -d mozilla ]; then
--- a/firefox-kde.patch	Thu Jan 11 10:37:42 2018 +0100
+++ b/firefox-kde.patch	Thu Jan 11 16:29:08 2018 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  671a03875b1bfe82edbebfde64654ea3ffc98e34
+# Parent  89cbe8c49d05965b87815143d1944ab6964f12c7
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1468,7 +1468,7 @@
 +        return NS_ERROR_FAILURE;
 +
 +    str->SetData( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +
 +    if( nsKDEUtils::command( command ))
 +        *aIsDefaultBrowser = true;
@@ -1489,10 +1489,10 @@
 +        return NS_ERROR_FAILURE;
 +
 +    cmdstr->SetData( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
-+    command->AppendElement( cmdstr, false );
++    command->AppendElement( cmdstr );
 +
 +    paramstr->SetData( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
-+    command->AppendElement( paramstr, false );
++    command->AppendElement( paramstr );
 +
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
@@ -1542,7 +1542,7 @@
 +    else
 +        return NS_ERROR_NOT_IMPLEMENTED;
 +
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
@@ -1560,14 +1560,14 @@
 +        return NS_ERROR_FAILURE;
 +
 +    cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" ));
-+    command->AppendElement( cmdstr, false );
++    command->AppendElement( cmdstr );
 +    nsAutoCString app;
 +    nsresult rv = aApplication->GetNativePath( app );
 +    NS_ENSURE_SUCCESS( rv, rv );
 +    appstr->SetData( app );
-+    command->AppendElement( appstr, false );
++    command->AppendElement( appstr );
 +    uristr->SetData( aURI );
-+    command->AppendElement( uristr, false );
++    command->AppendElement( uristr );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
@@ -1585,7 +1585,7 @@
 +        return NS_ERROR_FAILURE;
 +
 +    str->SetData( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +
 +    nsCOMPtr<nsIArray> output;
 +    if( !nsKDEUtils::command( command, getter_AddRefs( output ) ) )
--- a/mozilla-kde.patch	Thu Jan 11 10:37:42 2018 +0100
+++ b/mozilla-kde.patch	Thu Jan 11 16:29:08 2018 +0100
@@ -72,7 +72,7 @@
  
      // Do we care if a file provided by this process fails to load?
 -    pref_LoadPrefsInDir(path, nullptr, 0);
-+    pref_LoadPrefsInDir(path, specialFiles, nullptr, 0);
++    pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles));
    }
  
    return NS_OK;
@@ -2549,7 +2549,7 @@
 +        if ( !rstr ) return false;
 +
 +        rstr->SetData( out[i] );
-+        result->AppendElement( rstr, false );
++        result->AppendElement( rstr );
 +        }
 +
 +    NS_ADDREF( *output = result);