diff --git a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch index f02fa84bb02..b944c889860 100644 --- a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch +++ b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch @@ -2,7 +2,7 @@ --- a/zuluCrypt-gui/zulucrypt.ui +++ b/zuluCrypt-gui/zulucrypt.ui -@@ -493,6 +493,9 @@ +@@ -501,6 +501,9 @@ @@ -10,5 +10,5 @@ + false + - Check For Update + C&heck For Update diff --git a/srcpkgs/zulucrypt/patches/fix-cflags.patch b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch similarity index 76% rename from srcpkgs/zulucrypt/patches/fix-cflags.patch rename to srcpkgs/zulucrypt/patches/30-fix-cflags.patch index 665bdf62d55..4629bf4417d 100644 --- a/srcpkgs/zulucrypt/patches/fix-cflags.patch +++ b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch @@ -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_ diff --git a/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch new file mode 100644 index 00000000000..5f7412d921d --- /dev/null +++ b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch @@ -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; + } diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template index cc596dc63dc..a314ddd38e4 100644 --- a/srcpkgs/zulucrypt/template +++ b/srcpkgs/zulucrypt/template @@ -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