Linux: Build .deb packages with Ayatana application indicator support (Ubuntu >= 18.04, Debian >= 10)
This commit is contained in:
parent
efe1c59461
commit
adc21bd1ab
|
@ -254,7 +254,7 @@ if ( ( PLATFORM STREQUAL "Debian" ) OR ( PLATFORM STREQUAL "Ubuntu" ) )
|
||||||
if ( ( ( PLATFORM STREQUAL "Debian" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "10" ) )
|
if ( ( ( PLATFORM STREQUAL "Debian" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "10" ) )
|
||||||
OR ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "18.04" ) ) )
|
OR ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "18.04" ) ) )
|
||||||
|
|
||||||
set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.0-gtk3-0v5, libfuse2, dmsetup, sudo" )
|
set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.0-gtk3-0v5, libayatana-appindicator3-1, libfuse2, dmsetup, sudo" )
|
||||||
|
|
||||||
else ()
|
else ()
|
||||||
# Link against statically built wxWidgets on Ubuntu 14.04 and older, and Debian 8 and older
|
# Link against statically built wxWidgets on Ubuntu 14.04 and older, and Debian 8 and older
|
||||||
|
|
|
@ -41,11 +41,22 @@ else
|
||||||
|
|
||||||
echo "Building GUI version of VeraCrypt for DEB using system wxWidgets"
|
echo "Building GUI version of VeraCrypt for DEB using system wxWidgets"
|
||||||
make clean || exit 1
|
make clean || exit 1
|
||||||
make || exit 1
|
|
||||||
|
if [ "$#" = "1" ] && [ "$1" = "INDICATOR" ]
|
||||||
|
then
|
||||||
|
|
||||||
|
make INDICATOR=1 || exit 1
|
||||||
|
make INDICATOR=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
make || exit 1
|
||||||
make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Building console version of VeraCrypt for DEB using wxWidgets static libraries"
|
echo "Building console version of VeraCrypt for DEB using wxWidgets static libraries"
|
||||||
|
|
||||||
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
|
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
|
||||||
|
|
Loading…
Reference in New Issue