Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4736d10233f79fa8453528137920f0f17e6d6e9c
commit 4736d10233f79fa8453528137920f0f17e6d6e9c
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Feb 11 16:06:45 2008 +0100
truecrypt-5.0-1-x86_64
added -64bit.patch to fix up build()
diff --git a/source/apps-extra/truecrypt/FrugalBuild
b/source/apps-extra/truecrypt/FrugalBuild
index df602e6..c2b2399 100644
--- a/source/apps-extra/truecrypt/FrugalBuild
+++ b/source/apps-extra/truecrypt/FrugalBuild
@@ -11,13 +11,16 @@ depends=('fuse' 'wxgtk-u8')
groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.truecrypt.org/downloads.php|grep Stable|sed
's/.* - //;s/$pkgextraver//'"
-source=("http://www.truecrypt.org/downloads/transient/987a415c42/TrueCrypt
$pkgver$pkgextraver Source.tar.gz")
-sha1sums=('f6e71f757425cedc76f023a91b78a073e279cdac')
+source=("http://www.truecrypt.org/downloads/transient/987a415c42/TrueCrypt
$pkgver$pkgextraver Source.tar.gz" \
+ truecrypt-5.0-64bit.patch)
+sha1sums=('f6e71f757425cedc76f023a91b78a073e279cdac' \
+ '9dc34ff69dad98c8b84c5f8a99a232bfc6b01d06')
build()
{
tar xf "TrueCrypt $pkgver$pkgextraver Source.tar.gz"
Fcd truecrypt-$pkgver$pkgextraver-source
+ Fpatchall
Fsed '--static' '' Main/Main.make
rm -rf wxrelease
mkdir wxrelease
diff --git a/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch
b/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch
new file mode 100644
index 0000000..69d1383
--- /dev/null
+++ b/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch
@@ -0,0 +1,95 @@
+diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.cpp
truecrypt-5.0-source/Platform/StringConverter.cpp
+--- truecrypt-5.0-source.org/Platform/StringConverter.cpp 2008-02-04
13:14:18.000000000 +0200
++++ truecrypt-5.0-source/Platform/StringConverter.cpp 2008-02-09
21:38:23.000000000 +0200
+@@ -32,12 +32,14 @@
+ return s.str();
+ }
+
++#if __WORDSIZE == 32
+ wstring StringConverter::FromNumber (int64 number)
+ {
+ wstringstream s;
+ s << number;
+ return s.str();
+ }
++#endif
+
+ wstring StringConverter::FromNumber (int number)
+ {
+@@ -60,12 +62,14 @@
+ return s.str();
+ }
+
++#if __WORDSIZE == 32
+ wstring StringConverter::FromNumber (uint64 number)
+ {
+ wstringstream s;
+ s << number;
+ return s.str();
+ }
++#endif
+
+ string StringConverter::GetTrailingNumber (const string &str)
+ {
+diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.h
truecrypt-5.0-source/Platform/StringConverter.h
+--- truecrypt-5.0-source.org/Platform/StringConverter.h 2008-02-04
13:14:16.000000000 +0200
++++ truecrypt-5.0-source/Platform/StringConverter.h 2008-02-09
21:38:03.000000000 +0200
+@@ -19,11 +19,15 @@
+ public:
+ static wstring FromNumber (double number);
+ static wstring FromNumber (int number);
++#if __WORDSIZE == 32
+ static wstring FromNumber (int64 number);
++#endif
+ static wstring FromNumber (long number);
+ static wstring FromNumber (unsigned int number);
+ static wstring FromNumber (unsigned long number);
++#if __WORDSIZE == 32
+ static wstring FromNumber (uint64 number);
++#endif
+ static string GetTrailingNumber (const string &str);
+ static string GetTypeName (const type_info &typeInfo);
+ static wstring QuoteSpaces (const wstring &str);
+--- truecrypt-5.0-source.org/Platform/PlatformTest.cpp 2008-02-04
13:14:16.000000000 +0200
++++ truecrypt-5.0-source/Platform/PlatformTest.cpp 2008-02-09
21:49:15.000000000 +0200
+@@ -270,7 +270,11 @@ namespace TrueCrypt
+ // shared_ptr, make_shared, StringConverter, foreach
+ list <shared_ptr <uint64> > numList;
+
++#if __WORDSIZE == 32
+ numList.push_front (make_shared <uint64>
(StringConverter::ToUInt64 (StringConverter::FromNumber
(0xFFFFffffFFFFfffeULL))));
++#else
++ numList.push_front (make_shared <uint64>
(StringConverter::ToUInt64 (StringConverter::FromNumber
(0xFFFFffffFFFFfffeUL))));
++#endif
+ numList.push_front (make_shared <uint64>
(StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
+ numList.push_front (make_shared <uint64> (3));
+
+--- truecrypt-5.0-source.org/Main/StringFormatter.h 2008-02-04
13:14:14.000000000 +0200
++++ truecrypt-5.0-source/Main/StringFormatter.h 2008-02-09
22:15:04.000000000 +0200
+@@ -27,11 +27,15 @@ namespace TrueCrypt
+ StringFormatterArg (const wstring &str) : Empty (false),
Referenced (false), StringArg (str) { }
+ StringFormatterArg (const wxString &str) : Empty (false),
Referenced (false), StringArg (str) { }
+ StringFormatterArg (int number) : Empty
(false), Referenced (false), StringArg (StringConverter::FromNumber (number)) {
}
++#if __WORDSIZE == 32
+ StringFormatterArg (int64 number) : Empty
(false), Referenced (false), StringArg (StringConverter::FromNumber (number)) {
}
++#endif
+ StringFormatterArg (long number) : Empty
(false), Referenced (false), StringArg (StringConverter::FromNumber (number)) {
}
+ StringFormatterArg (unsigned int number) : Empty (false),
Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
+ StringFormatterArg (unsigned long number) : Empty (false),
Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#if __WORDSIZE == 32
+ StringFormatterArg (uint64 number) : Empty (false),
Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#endif
+
+ operator wxString () { Referenced = true; return StringArg; }
+
+--- truecrypt-5.0-source.org/Main/Forms/VolumeSizeWizardPage.cpp
2008-02-04 13:14:46.000000000 +0200
++++ truecrypt-5.0-source/Main/Forms/VolumeSizeWizardPage.cpp 2008-02-09
22:27:35.000000000 +0200
+@@ -55,7 +55,7 @@ namespace TrueCrypt
+ {
+ uint64 prefixMult = 1;
+ if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND)
+- prefixMult = reinterpret_cast <int>
(VolumeSizePrefixChoice->GetClientData
(VolumeSizePrefixChoice->GetSelection()));
++ prefixMult = reinterpret_cast <uint64>
(VolumeSizePrefixChoice->GetClientData
(VolumeSizePrefixChoice->GetSelection()));
+
+ uint64 val = StringConverter::ToUInt64 (wstring
(VolumeSizeTextCtrl->GetValue()));
+ if (val <= 0x7fffFFFFffffFFFFull / prefixMult)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
