zulucrypt-gui: libcryptsetup always present

Fix: #37633
This commit is contained in:
Đoàn Trần Công Danh 2022-06-25 10:59:47 +07:00
parent 18754d713d
commit 7c9895c8b2
4 changed files with 27 additions and 7 deletions

View File

@ -2,7 +2,7 @@
--- a/zuluCrypt-gui/zulucrypt.ui
+++ b/zuluCrypt-gui/zulucrypt.ui
@@ -493,6 +493,9 @@
@@ -501,6 +501,9 @@
</property>
</action>
<action name="actionCheck_For_Update">
@ -10,5 +10,5 @@
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Check For Update</string>
<string>C&amp;heck For Update</string>
</property>

View File

@ -1,5 +1,3 @@
Index: external_libraries/tcplay/CMakeLists.txt
===================================================================
--- a/external_libraries/tcplay/CMakeLists.txt
+++ b/external_libraries/tcplay/CMakeLists.txt
@@ -13,7 +13,7 @@ set (SRCS_LINUX crypto-gcrypt.c)
@ -11,8 +9,6 @@ Index: external_libraries/tcplay/CMakeLists.txt
set (CFLAGS_VER "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}")
set (CFLAGS_COMMON "-std=c99 -fPIC ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}")
if ($ENV{DEBUG})
Index: external_libraries/tcplay/Makefile.classic
===================================================================
--- a/external_libraries/tcplay/Makefile.classic
+++ b/external_libraries/tcplay/Makefile.classic
@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_

View File

@ -0,0 +1,24 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ else( NOT CRYPTSETUP_FOUND )
get_filename_component(libcrypsetupFullPath ${cryptsetup_lib} REALPATH)
MESSAGE( STATUS "commiting to cryptsetup library path of: ${libcrypsetupFullPath}" )
- file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n#define CRYPTSETUP_LIBRARY_PATH \"${libcrypsetupFullPath}\"" )
+ file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n" )
endif( NOT CRYPTSETUP_FOUND )
--- a/zuluCrypt-gui/utility.cpp
+++ b/zuluCrypt-gui/utility.cpp
@@ -3174,5 +3174,9 @@ bool utility::canShowKeySlotProperties()
bool utility::libCryptSetupLibraryNotFound()
{
- return !utility::pathExists( CRYPTSETUP_LIBRARY_PATH ) ;
+ /*
+ * always present in Void Linux because
+ * zulucrypt-gui depends on zulucrypt which depends on libcryptsetup
+ */
+ return false;
}

View File

@ -1,7 +1,7 @@
# Template file for 'zulucrypt'
pkgname=zulucrypt
version=6.0.0
revision=1
revision=2
wrksrc="zuluCrypt-${version}"
build_style=cmake
configure_args="-DINTERNAL_ZULUPLAY=true -DQT5=true