diff options
author | B. Stack <bgstack15@gmail.com> | 2023-10-08 18:22:26 -0400 |
---|---|---|
committer | B. Stack <bgstack15@gmail.com> | 2023-10-08 18:22:26 -0400 |
commit | 42758f7937eef95a22debc32b8f7a3c4221d1ecf (patch) | |
tree | df42ce743c3b8ed6da818a629a5a93f8f0197919 /veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch | |
parent | Merge branch 'scite-bump' (diff) | |
parent | vc: add dep libpcsclite-dev (diff) | |
download | stackrpms-42758f7937eef95a22debc32b8f7a3c4221d1ecf.tar.gz stackrpms-42758f7937eef95a22debc32b8f7a3c4221d1ecf.tar.bz2 stackrpms-42758f7937eef95a22debc32b8f7a3c4221d1ecf.zip |
Merge branch 'veracrypt-bump'
Diffstat (limited to 'veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch')
-rw-r--r-- | veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch new file mode 100644 index 0000000..9cd566f --- /dev/null +++ b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch @@ -0,0 +1,33 @@ +From bd843ffa05147aab80e38ee668b0556302d2bfc9 Mon Sep 17 00:00:00 2001 +From: Mounir IDRASSI <mounir.idrassi@idrix.fr> +Date: Mon, 2 Oct 2023 18:02:33 +0200 +Subject: [PATCH] Linux: Fix compilation error on some 32-bit machines. + +--- + src/Common/PCSCException.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/Common/PCSCException.cpp b/src/Common/PCSCException.cpp +index 93fff18187..dc5eead323 100644 +--- a/src/Common/PCSCException.cpp ++++ b/src/Common/PCSCException.cpp +@@ -140,14 +140,17 @@ namespace VeraCrypt + { + Exception::Deserialize(stream); + Serializer sr(stream); +- sr.Deserialize("ErrorCode", ErrorCode); ++ int64 v; ++ sr.Deserialize("ErrorCode", v); ++ ErrorCode = (LONG_PCSC)v; + } + + void PCSCException::Serialize(shared_ptr <Stream> stream) const + { + Exception::Serialize(stream); + Serializer sr(stream); +- sr.Serialize("ErrorCode", ErrorCode); ++ int64 v = (int64)ErrorCode; ++ sr.Serialize("ErrorCode", v); + } + + # define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE) |