Hello community,
here is the log from the commit of package mozilla-xulrunner20 for openSUSE:11.4
checked in at Fri Feb 18 14:08:39 CET 2011.
--------
--- old-versions/11.4/all/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-04 10:18:18.000000000 +0100
+++ /mounts/work_src_done/11.4/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-17 20:13:51.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Feb 17 16:50:53 UTC 2011 - wr@rosenauer.org
+
+- fix GIO helper app launch (bnc#672903)
+ (mozilla-gio-launch-uri.patch)
+- call to the ntlm_auth helper fails (bmo#634334)
+ (mozilla-ntlm-full-path.patch from Petr Cerny)
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
New:
----
mozilla-gio-launch-uri.patch
mozilla-ntlm-full-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner20.spec ++++++
--- /var/tmp/diff_new_pack.AaW2bx/_old 2011-02-18 14:08:26.000000000 +0100
+++ /var/tmp/diff_new_pack.AaW2bx/_new 2011-02-18 14:08:26.000000000 +0100
@@ -31,7 +31,7 @@
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Version: 2.0b11
-Release: 1
+Release: 4.<RELEASE2>
%define releasedate 2011020300
%define version_internal 2.0b11
%define apiversion 2.0
@@ -73,6 +73,8 @@
Patch12: mozilla-language.patch
Patch13: mozilla-gio.patch
Patch14: mozilla-cairo-return.patch
+Patch15: mozilla-gio-launch-uri.patch
+Patch16: mozilla-ntlm-full-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js20 = %{version}
Requires(post): update-alternatives coreutils
@@ -216,6 +218,8 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
+%patch16 -p1
%build
kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
++++++ mozilla-gio-launch-uri.patch ++++++
# HG changeset patch
# Parent f81b405b9adebc56c3af5cfbf2f74cf01c22956b
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -51,16 +51,18 @@
#include
#include "nsContentHandlerApp.h"
#endif
#include "nsMIMEInfoUnix.h"
#include "nsCommonRegistry.h"
#include "nsIGIOService.h"
#include "nsIGnomeVFSService.h"
+#include "nsNetCID.h"
+#include "nsIIOService.h"
#include "nsAutoPtr.h"
#ifdef MOZ_ENABLE_DBUS
#include "nsDBusHandlerApp.h"
#endif
#if defined(XP_UNIX) && !defined(XP_MACOSX)
#include "nsKDEUtils.h"
#endif
@@ -170,38 +172,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
}
if (!mDefaultApplication)
return NS_ERROR_FILE_NOT_FOUND;
return LaunchWithIProcess(mDefaultApplication, nativePath);
}
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+ nsCAutoString uriSpec;
+ if (giovfs) {
+ // nsGIOMimeApp->Launch wants a URI string instead of local file
+ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID);
+ nsCOMPtr<nsIURI> uri;
+ ioservice->NewFileURI(aFile, getter_AddRefs(uri));
+ uri->GetSpec(uriSpec);
+ }
+
nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (giovfs) {
nsCOMPtr<nsIGIOMimeApp> app;
if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
- return app->Launch(nativePath);
+ return app->Launch(uriSpec);
} else if (gnomevfs) {
/* Fallback to GnomeVFS */
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
}
// If we haven't got an app we try to get a valid one by searching for the
// extension mapped type
nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
if (mimeInfo) {
nsCAutoString type;
mimeInfo->GetType(type);
if (giovfs) {
nsCOMPtr<nsIGIOMimeApp> app;
if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
- return app->Launch(nativePath);
+ return app->Launch(uriSpec);
} else if (gnomevfs) {
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
}
}
if (!mDefaultApplication)
++++++ mozilla-ntlm-full-path.patch ++++++
# HG changeset patch
# User Petr Cerny
# Parent 971259052418fda3b7fc81da75be4557ea5d82bc
Bug 634334 - call to the ntlm_auth helper fails
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
--- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
@@ -200,17 +200,17 @@ static PRUint8* ExtractMessage(const nsA
nsresult
nsAuthSambaNTLM::SpawnNTLMAuthHelper()
{
const char* username = PR_GetEnv("USER");
if (!username)
return NS_ERROR_FAILURE;
char* args[] = {
- "ntlm_auth",
+ "/usr/bin/ntlm_auth",
"--helper-protocol", "ntlmssp-client-1",
"--use-cached-creds",
"--username", const_cast(username),
nsnull
};
PRBool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD);
if (!isOK)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org