[pkg-boinc-commits] r416 - in trunk/boinc/debian: . patches
Frank S. Thomas
fst-guest at costa.debian.org
Sat May 6 14:41:55 UTC 2006
Author: fst-guest
Date: 2006-05-06 14:41:54 +0000 (Sat, 06 May 2006)
New Revision: 416
Modified:
trunk/boinc/debian/changelog
trunk/boinc/debian/patches/07_use-sensible-browser.dpatch
Log:
Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog 2006-05-06 09:35:43 UTC (rev 415)
+++ trunk/boinc/debian/changelog 2006-05-06 14:41:54 UTC (rev 416)
@@ -11,8 +11,10 @@
* debian/patches/:
- Removed 02_wx2.6-configure.ac.dpatch and 03_wx2.6-with-unicode.dpatch,
both were included upstream.
+ - Updated 07_use-sensible-browser.dpatch to use sensible-browser only,
+ because upstream's attempt to start a browser fails miserably.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 6 May 2006 10:54:19 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 6 May 2006 16:41:01 +0200
boinc (5.4.3-1) unstable; urgency=low
Modified: trunk/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- trunk/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-05-06 09:35:43 UTC (rev 415)
+++ trunk/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-05-06 14:41:54 UTC (rev 416)
@@ -8,13 +8,43 @@
## DP: we don't loose functionality here.
@DPATCH@
-diff -urNad boinc-5.4.1~/clientgui/hyperlink.cpp boinc-5.4.1/clientgui/hyperlink.cpp
---- boinc-5.4.1~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
-+++ boinc-5.4.1/clientgui/hyperlink.cpp 2006-04-13 08:12:19.000000000 +0200
-@@ -196,45 +196,9 @@
+diff -urNad boinc-5.4.9~/clientgui/hyperlink.cpp boinc-5.4.9/clientgui/hyperlink.cpp
+--- boinc-5.4.9~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
++++ boinc-5.4.9/clientgui/hyperlink.cpp 2006-05-06 16:10:25.000000000 +0200
+@@ -166,77 +166,9 @@
+ // private functions
- #if defined(__WXGTK__) || defined(__WXMOTIF__)
- if (!mime_type_found) {
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+- wxString cmd;
+- wxString strMimeType = wxEmptyString;
+- bool mime_type_found = false;
+-
+- if (strLink.StartsWith(wxT("http://")))
+- strMimeType = wxT("text/html");
+- else if (strLink.StartsWith(wxT("ftp://")))
+- strMimeType = wxT("text/html");
+- else if (strLink.StartsWith(wxT("mailto:")))
+- strMimeType = wxT("message/rfc822");
+- else
+- return;
+-
+- wxFileType* ft = wxTheMimeTypesManager->GetFileTypeFromMimeType(strMimeType);
+- if (ft) {
+- if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) {
+-#ifdef __WXMAC__
+- cmd.Replace(wxT("<"), wxEmptyString);
+- cmd.Prepend(wxT("open "));
+-#else
+- cmd.Replace(wxT("file://"), wxEmptyString);
+-#endif
+- mime_type_found = true;
+- ::wxExecute(cmd);
+- }
+- delete ft;
+- }
+-
+-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+- if (!mime_type_found) {
- cmd = ::wxGetenv(wxT("BROWSER"));
- if(cmd.IsEmpty()) {
- wxString strDialogTitle = wxEmptyString;
@@ -54,9 +84,11 @@
- cmd += wxT(" ") + strLink;
- ::wxExecute(cmd,wxEXEC_ASYNC);
- }
-+ cmd = wxT("sensible-browser");
-+ cmd += wxT(" ") + strLink;
-+ ::wxExecute(cmd,wxEXEC_ASYNC);
- }
- #endif
+- }
+-#endif
++ wxString cmd = wxT("sensible-browser");
++ cmd += wxT(" ") + strLink;
++ ::wxExecute(cmd,wxEXEC_ASYNC);
}
+
+ const char *BOINC_RCSID_d587835b7e="$Id: hyperlink.cpp,v 1.11 2006/03/09 10:21:07 rwalton Exp $";
More information about the pkg-boinc-commits
mailing list