From c7476f6bcb62c9f57d13d547afc5a3bec7f9640b Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 4 Apr 2010 14:48:38 +0000
Subject: Initial revision

---
 truecrypt/build/truecrypt-6.3a_diropen.patch | 47 ++++++++++++++++++++++++++++
 truecrypt/build/truecrypt-6.3a_umount.patch  | 27 ++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 truecrypt/build/truecrypt-6.3a_diropen.patch
 create mode 100644 truecrypt/build/truecrypt-6.3a_umount.patch

(limited to 'truecrypt')

diff --git a/truecrypt/build/truecrypt-6.3a_diropen.patch b/truecrypt/build/truecrypt-6.3a_diropen.patch
new file mode 100644
index 00000000..730b560f
--- /dev/null
+++ b/truecrypt/build/truecrypt-6.3a_diropen.patch
@@ -0,0 +1,47 @@
+diff -uar truecrypt-6.3a-source.orig/Main/UserInterface.cpp truecrypt-6.3a-source/Main/UserInterface.cpp
+--- truecrypt-6.3a-source.orig/Main/UserInterface.cpp	2009-11-22 16:10:08.000000000 +0100
++++ truecrypt-6.3a-source/Main/UserInterface.cpp	2010-04-04 16:36:49.000000000 +0200
+@@ -812,7 +812,7 @@
+ 		// MIME handler for directory seems to be unavailable through wxWidgets
+ 		wxString desktop = GetTraits()->GetDesktopEnvironment();
+ 
+-		if (desktop == L"GNOME" || desktop.empty())
++		if (desktop == L"GNOME")
+ 		{
+ 			args.push_back ("--no-default-window");
+ 			args.push_back ("--no-desktop");
+@@ -845,6 +845,34 @@
+ 				catch (exception &e) { ShowError (e); }
+ 			}
+ 		}
++		else if (desktop == L"XFCE")
++		{
++			args.push_back (string (path));
++			try
++			{
++				Process::Execute ("thunar", args, 2000);
++			}
++			catch (TimeOut&) { }
++			catch (exception&)
++			{
++				try
++				{
++					Process::Execute ("xdg-open", args, 2000);
++				}
++				catch (TimeOut&) { }
++				catch (exception &e) { ShowError (e); }
++			}
++		}
++		else
++		{
++			args.push_back (string (path));
++			try
++			{
++				Process::Execute ("xdg-open", args, 2000);
++			}
++			catch (TimeOut&) { }
++			catch (exception &e) { ShowError (e); }
++		}
+ #endif
+ 	}
+ 
diff --git a/truecrypt/build/truecrypt-6.3a_umount.patch b/truecrypt/build/truecrypt-6.3a_umount.patch
new file mode 100644
index 00000000..7de2b346
--- /dev/null
+++ b/truecrypt/build/truecrypt-6.3a_umount.patch
@@ -0,0 +1,27 @@
+diff -uar truecrypt-6.3a-source.orig/Core/Unix/Linux/CoreLinux.cpp truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp
+--- truecrypt-6.3a-source.orig/Core/Unix/Linux/CoreLinux.cpp	2009-11-22 16:09:54.000000000 +0100
++++ truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp	2010-04-04 16:47:42.000000000 +0200
+@@ -90,13 +90,23 @@
+ 	void CoreLinux::DetachLoopDevice (const DevicePath &devicePath) const
+ 	{
+ 		list <string> args;
++		list <string> args2;
+ 		args.push_back ("-d");
+ 		args.push_back (devicePath);
++		/* args2 needed to umount loop device before detaching it
++		 * by Enrico Lo Tauro (neongen)
++		 */
++		args2.push_back (devicePath);
+ 
+ 		for (int t = 0; true; t++)
+ 		{
+ 			try
+ 			{
++				try
++				{
++					Process::Execute ("umount", args2);
++				}
++				catch (ExecutedProcessFailed&) { }
+ 				Process::Execute ("losetup", args);
+ 				break;
+ 			}
-- 
cgit v1.2.3