mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed macFUSE support for macOS 11 (Big Sur) (#699)

This commit is contained in:
Thierry Lelegard 2020-11-28 17:10:51 +01:00 committed by GitHub
parent 719f32fa77
commit 66e550d11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,6 +11,9 @@
*.txt.h *.txt.h
*.h.gch *.h.gch
src/Main/veracrypt src/Main/veracrypt
*.oo
*.o.32
*.o.64
# wxWidgets Linux build artifacts # wxWidgets Linux build artifacts
src/wxrelease src/wxrelease

8
src/Core/Unix/MacOSX/CoreMacOSX.cpp
View File

@ -123,13 +123,17 @@ namespace VeraCrypt
fuseVersionStringLength = MAXHOSTNAMELEN; fuseVersionStringLength = MAXHOSTNAMELEN;
if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0) if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
{ {
throw HigherFuseVersionRequired (SRC_POS); fuseVersionStringLength = MAXHOSTNAMELEN;
if ((status = sysctlbyname ("vfs.generic.macfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
{
throw HigherFuseVersionRequired (SRC_POS);
}
} }
} }
// look for OSXFuse dynamic library // look for OSXFuse dynamic library
struct stat sb; struct stat sb;
if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb)) if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb) && 0 != stat("/usr/local/lib/libfuse.dylib", &sb))
{ {
throw HigherFuseVersionRequired (SRC_POS); throw HigherFuseVersionRequired (SRC_POS);
} }

2
src/Main/Forms/MainFrame.h
View File

@ -170,7 +170,7 @@ namespace VeraCrypt
void EnsureVisible(bool bOnlyHeadingBar = false) void EnsureVisible(bool bOnlyHeadingBar = false)
{ {
wxDisplay display (this); wxDisplay display;
wxRect displayRect = display.GetClientArea(); wxRect displayRect = display.GetClientArea();
bool bMove = false; bool bMove = false;

2
src/Main/Main.make
View File

@ -103,7 +103,7 @@ endif
#------ FUSE configuration ------ #------ FUSE configuration ------
ifeq "$(PLATFORM)" "MacOSX" ifeq "$(PLATFORM)" "MacOSX"
FUSE_LIBS = $(shell pkg-config osxfuse --libs) FUSE_LIBS = $(shell pkg-config $(if $(patsubst 10.%,,$(VC_OSX_TARGET)),fuse,osxfuse) --libs)
else else
FUSE_LIBS = $(shell pkg-config fuse --libs) FUSE_LIBS = $(shell pkg-config fuse --libs)
endif endif